[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <20140919153121.GC15734@phenom.ffwll.local>
Date: Fri, 19 Sep 2014 17:31:21 +0200
From: Daniel Vetter <daniel@...ll.ch>
To: Andrzej Hajda <a.hajda@...sung.com>
Cc: Inki Dae <inki.dae@...sung.com>,
Joonyoung Shim <jy0922.shim@...sung.com>,
Seung-Woo Kim <sw0312.kim@...sung.com>,
Kyungmin Park <kyungmin.park@...sung.com>,
David Airlie <airlied@...ux.ie>,
Kukjin Kim <kgene.kim@...sung.com>,
"open list:DRM DRIVERS FOR E..." <dri-devel@...ts.freedesktop.org>,
"moderated list:ARM/S5P EXYNOS AR..."
<linux-samsung-soc@...r.kernel.org>,
open list <linux-kernel@...r.kernel.org>, drake@...lessm.com,
daniel@...ll.ch, m.szyprowski@...sung.com
Subject: Re: [PATCH] drm/exynos: init vblank with real number of crtcs
On Fri, Sep 19, 2014 at 02:57:20PM +0200, Andrzej Hajda wrote:
> Initialization of vblank with MAX_CRTC caused attempts
> to disabling vblanks for non-existing crtcs in case
> drm used fewer crtcs. The patch fixes it.
>
> Signed-off-by: Andrzej Hajda <a.hajda@...sung.com>
> ---
> drivers/gpu/drm/exynos/exynos_drm_drv.c | 18 +++++++++---------
> 1 file changed, 9 insertions(+), 9 deletions(-)
>
> diff --git a/drivers/gpu/drm/exynos/exynos_drm_drv.c b/drivers/gpu/drm/exynos/exynos_drm_drv.c
> index 9b00e4e..dc4affd 100644
> --- a/drivers/gpu/drm/exynos/exynos_drm_drv.c
> +++ b/drivers/gpu/drm/exynos/exynos_drm_drv.c
> @@ -94,10 +94,6 @@ static int exynos_drm_load(struct drm_device *dev, unsigned long flags)
> /* init kms poll for handling hpd */
> drm_kms_helper_poll_init(dev);
>
> - ret = drm_vblank_init(dev, MAX_CRTC);
> - if (ret)
> - goto err_mode_config_cleanup;
> -
> /* setup possible_clones. */
> exynos_drm_encoder_setup(dev);
>
> @@ -106,22 +102,26 @@ static int exynos_drm_load(struct drm_device *dev, unsigned long flags)
> /* Try to bind all sub drivers. */
> ret = component_bind_all(dev->dev, dev);
> if (ret)
> - goto err_cleanup_vblank;
> + goto err_mode_config_cleanup;
> +
> + ret = drm_vblank_init(dev, dev->mode_config.num_crtc);
Hm, I wonder whether we should have a drm_mode_vblank_init which dtrt here
for kms drivers? Suggestions for a better name welcome ;-)
-Daniel
> + if (ret)
> + goto err_unbind_all;
>
> /* Probe non kms sub drivers and virtual display driver. */
> ret = exynos_drm_device_subdrv_probe(dev);
> if (ret)
> - goto err_unbind_all;
> + goto err_cleanup_vblank;
>
> /* force connectors detection */
> drm_helper_hpd_irq_event(dev);
>
> return 0;
>
> -err_unbind_all:
> - component_unbind_all(dev->dev, dev);
> err_cleanup_vblank:
> drm_vblank_cleanup(dev);
> +err_unbind_all:
> + component_unbind_all(dev->dev, dev);
> err_mode_config_cleanup:
> drm_mode_config_cleanup(dev);
> drm_release_iommu_mapping(dev);
> @@ -138,8 +138,8 @@ static int exynos_drm_unload(struct drm_device *dev)
> exynos_drm_fbdev_fini(dev);
> drm_kms_helper_poll_fini(dev);
>
> - component_unbind_all(dev->dev, dev);
> drm_vblank_cleanup(dev);
> + component_unbind_all(dev->dev, dev);
> drm_mode_config_cleanup(dev);
> drm_release_iommu_mapping(dev);
>
> --
> 1.9.1
>
--
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists