| Message ID | 20170329144401.1804-9-thierry.reding@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Wed, Mar 29, 2017 at 04:43:58PM +0200, Thierry Reding wrote: > From: Thierry Reding <treding@nvidia.com> > > The FB helper core now supports deferred setup, so the driver's custom > implementation can be removed. > > Signed-off-by: Thierry Reding <treding@nvidia.com> > --- > drivers/gpu/drm/exynos/exynos_drm_drv.c | 6 ++++-- > drivers/gpu/drm/exynos/exynos_drm_fbdev.c | 23 ----------------------- > 2 files changed, 4 insertions(+), 25 deletions(-) > > diff --git a/drivers/gpu/drm/exynos/exynos_drm_drv.c b/drivers/gpu/drm/exynos/exynos_drm_drv.c > index 09d3c4c3c858..08f9533ddbe8 100644 > --- a/drivers/gpu/drm/exynos/exynos_drm_drv.c > +++ b/drivers/gpu/drm/exynos/exynos_drm_drv.c > @@ -399,8 +399,9 @@ static int exynos_drm_bind(struct device *dev) > /* init kms poll for handling hpd */ > drm_kms_helper_poll_init(drm); > > - /* force connectors detection */ > - drm_helper_hpd_irq_event(drm); > + ret = exynos_drm_fbdev_init(drm); > + if (ret) > + goto err_cleanup_poll; > > /* register the DRM device */ > ret = drm_dev_register(drm, 0); > @@ -411,6 +412,7 @@ static int exynos_drm_bind(struct device *dev) > > err_cleanup_fbdev: > exynos_drm_fbdev_fini(drm); > +err_cleanup_poll: > drm_kms_helper_poll_fini(drm); > exynos_drm_device_subdrv_remove(drm); > err_cleanup_vblank: > diff --git a/drivers/gpu/drm/exynos/exynos_drm_fbdev.c b/drivers/gpu/drm/exynos/exynos_drm_fbdev.c > index 641531243e04..e64a1041dd29 100644 > --- a/drivers/gpu/drm/exynos/exynos_drm_fbdev.c > +++ b/drivers/gpu/drm/exynos/exynos_drm_fbdev.c > @@ -183,24 +183,6 @@ static const struct drm_fb_helper_funcs exynos_drm_fb_helper_funcs = { > .fb_probe = exynos_drm_fbdev_create, > }; > > -static bool exynos_drm_fbdev_is_anything_connected(struct drm_device *dev) > -{ > - struct drm_connector *connector; > - bool ret = false; > - > - mutex_lock(&dev->mode_config.mutex); > - list_for_each_entry(connector, &dev->mode_config.connector_list, head) { > - if (connector->status != connector_status_connected) > - continue; > - > - ret = true; > - break; > - } > - mutex_unlock(&dev->mode_config.mutex); > - > - return ret; > -} > - > int exynos_drm_fbdev_init(struct drm_device *dev) > { > struct exynos_drm_fbdev *fbdev; > @@ -211,9 +193,6 @@ int exynos_drm_fbdev_init(struct drm_device *dev) > if (!dev->mode_config.num_crtc || !dev->mode_config.num_connector) > return 0; > > - if (!exynos_drm_fbdev_is_anything_connected(dev)) > - return 0; > - > fbdev = kzalloc(sizeof(*fbdev), GFP_KERNEL); > if (!fbdev) > return -ENOMEM; > @@ -306,6 +285,4 @@ void exynos_drm_output_poll_changed(struct drm_device *dev) > > if (fb_helper) > drm_fb_helper_hotplug_event(fb_helper); Tiny nit: I think you can remove the above NULL check too. With that: Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch> > - else > - exynos_drm_fbdev_init(dev); > } > -- > 2.12.0 > > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/intel-gfx
diff --git a/drivers/gpu/drm/exynos/exynos_drm_drv.c b/drivers/gpu/drm/exynos/exynos_drm_drv.c index 09d3c4c3c858..08f9533ddbe8 100644 --- a/drivers/gpu/drm/exynos/exynos_drm_drv.c +++ b/drivers/gpu/drm/exynos/exynos_drm_drv.c @@ -399,8 +399,9 @@ static int exynos_drm_bind(struct device *dev) /* init kms poll for handling hpd */ drm_kms_helper_poll_init(drm); - /* force connectors detection */ - drm_helper_hpd_irq_event(drm); + ret = exynos_drm_fbdev_init(drm); + if (ret) + goto err_cleanup_poll; /* register the DRM device */ ret = drm_dev_register(drm, 0); @@ -411,6 +412,7 @@ static int exynos_drm_bind(struct device *dev) err_cleanup_fbdev: exynos_drm_fbdev_fini(drm); +err_cleanup_poll: drm_kms_helper_poll_fini(drm); exynos_drm_device_subdrv_remove(drm); err_cleanup_vblank: diff --git a/drivers/gpu/drm/exynos/exynos_drm_fbdev.c b/drivers/gpu/drm/exynos/exynos_drm_fbdev.c index 641531243e04..e64a1041dd29 100644 --- a/drivers/gpu/drm/exynos/exynos_drm_fbdev.c +++ b/drivers/gpu/drm/exynos/exynos_drm_fbdev.c @@ -183,24 +183,6 @@ static const struct drm_fb_helper_funcs exynos_drm_fb_helper_funcs = { .fb_probe = exynos_drm_fbdev_create, }; -static bool exynos_drm_fbdev_is_anything_connected(struct drm_device *dev) -{ - struct drm_connector *connector; - bool ret = false; - - mutex_lock(&dev->mode_config.mutex); - list_for_each_entry(connector, &dev->mode_config.connector_list, head) { - if (connector->status != connector_status_connected) - continue; - - ret = true; - break; - } - mutex_unlock(&dev->mode_config.mutex); - - return ret; -} - int exynos_drm_fbdev_init(struct drm_device *dev) { struct exynos_drm_fbdev *fbdev; @@ -211,9 +193,6 @@ int exynos_drm_fbdev_init(struct drm_device *dev) if (!dev->mode_config.num_crtc || !dev->mode_config.num_connector) return 0; - if (!exynos_drm_fbdev_is_anything_connected(dev)) - return 0; - fbdev = kzalloc(sizeof(*fbdev), GFP_KERNEL); if (!fbdev) return -ENOMEM; @@ -306,6 +285,4 @@ void exynos_drm_output_poll_changed(struct drm_device *dev) if (fb_helper) drm_fb_helper_hotplug_event(fb_helper); - else - exynos_drm_fbdev_init(dev); }