[PATCH 2/3] drm/vc4: Don't try to initialize FBDEV if we're only bound to V3D.

[Daniel Vetter]

On Tue, Apr 18, 2017 at 9:11 PM, Eric Anholt <eric at anholt.net> wrote:
> The FBDEV initialization would throw an error in dmesg, when we just
> want to silently not initialize fbdev on a V3D-only VC4 instance.
>
> Signed-off-by: Eric Anholt <eric at anholt.net>

Hm, this shouldn't be an error really, you might want to hotplug more
connectors later on. What exactly complains?
-Daniel

> ---
>  drivers/gpu/drm/vc4/vc4_kms.c | 10 ++++++----
>  1 file changed, 6 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/gpu/drm/vc4/vc4_kms.c b/drivers/gpu/drm/vc4/vc4_kms.c
> index ad7925a9e0ea..237a504f11f0 100644
> --- a/drivers/gpu/drm/vc4/vc4_kms.c
> +++ b/drivers/gpu/drm/vc4/vc4_kms.c
> @@ -230,10 +230,12 @@ int vc4_kms_load(struct drm_device *dev)
>
>         drm_mode_config_reset(dev);
>
> -       vc4->fbdev = drm_fbdev_cma_init(dev, 32,
> -                                       dev->mode_config.num_connector);
> -       if (IS_ERR(vc4->fbdev))
> -               vc4->fbdev = NULL;
> +       if (dev->mode_config.num_connector) {
> +               vc4->fbdev = drm_fbdev_cma_init(dev, 32,
> +                                               dev->mode_config.num_connector);
> +               if (IS_ERR(vc4->fbdev))
> +                       vc4->fbdev = NULL;
> +       }
>
>         drm_kms_helper_poll_init(dev);
>
> --
> 2.11.0
>
> _______________________________________________
> dri-devel mailing list
> dri-devel at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/dri-devel



-- 
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch