[Intel-gfx] [PATCH 5/5] drm/hisilicon: Remove custom FB helper deferred setup

[Sean Paul]

On Thu, Jul 6, 2017 at 9:00 AM, Daniel Vetter <daniel.vetter at ffwll.ch> wrote:
> From: Thierry Reding <treding at nvidia.com>
>
> 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 at hisilicon.com>
> Cc: Rongrong Zou <zourongrong at gmail.com>
> Cc: Xinwei Kong <kong.kongxinwei at hisilicon.com>
> Cc: Chen Feng <puck.chen at hisilicon.com>
> Signed-off-by: Thierry Reding <treding at nvidia.com> (v1)
> Signed-off-by: Daniel Vetter <daniel.vetter at ffwll.ch>

Reviewed-by: Sean Paul <seanpaul at chromium.org>

> ---
>  drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.c | 20 ++++++++++----------
>  1 file changed, 10 insertions(+), 10 deletions(-)
>
> diff --git a/drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.c b/drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.c
> index 8065d6cb1d7f..1178341c3858 100644
> --- 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:
> --
> 2.13.2
>
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx