drm/hisilicon: Remove custom FB helper deferred setup

The FB helper core now supports deferred setup, so the driver's custom
implementation can be removed.

v2: Dont' resurrect drm_vblank_cleanup.

Cc: Xinliang Liu <z.liuxinliang@hisilicon.com>
Cc: Rongrong Zou <zourongrong@gmail.com>
Cc: Xinwei Kong <kong.kongxinwei@hisilicon.com>
Cc: Chen Feng <puck.chen@hisilicon.com>
Signed-off-by: Thierry Reding <treding@nvidia.com> (v1)
Reviewed-by: Sean Paul <seanpaul@chromium.org>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Link: https://patchwork.freedesktop.org/patch/msgid/20170706130023.28417-5-daniel.vetter@ffwll.ch
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>

diff --git a/drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.c b/drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.c
index 8065d6cb1d7fca3796370a6fd7491d1e02e5826d..1178341c38580e439fcb8664ad9bb636c2d394e4 100644 (file)
--- a/drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.c
+++ b/drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.c
@@ -54,14 +54,7 @@ static void kirin_fbdev_output_poll_changed(struct drm_device *dev)
 {
        struct kirin_drm_private *priv = dev->dev_private;
 
-       if (priv->fbdev) {
-               drm_fbdev_cma_hotplug_event(priv->fbdev);
-       } else {
-               priv->fbdev = drm_fbdev_cma_init(dev, 32,
-                                                dev->mode_config.num_connector);
-               if (IS_ERR(priv->fbdev))
-                       priv->fbdev = NULL;
-       }
+       drm_fbdev_cma_hotplug_event(priv->fbdev);
 }
 #endif
 
@@ -128,11 +121,18 @@ static int kirin_drm_kms_init(struct drm_device *dev)
        /* init kms poll for handling hpd */
        drm_kms_helper_poll_init(dev);
 
-       /* force detection after connectors init */
-       (void)drm_helper_hpd_irq_event(dev);
+       priv->fbdev = drm_fbdev_cma_init(dev, 32,
+                                        dev->mode_config.num_connector);
+       if (IS_ERR(priv->fbdev)) {
+               DRM_ERROR("failed to initialize fbdev.\n");
+               ret = PTR_ERR(priv->fbdev);
+               goto err_cleanup_poll;
+       }
 
        return 0;
 
+err_cleanup_poll:
+       drm_kms_helper_poll_fini(dev);
 err_unbind_all:
        component_unbind_all(dev->dev, dev);
 err_dc_cleanup: