[PATCH] drm/nouveau/fbcon: fix oops without fbdev emulation

[Daniel Vetter]

On Sat, Sep 23, 2017 at 01:10:33PM -0700, Pavel Roskin wrote:
> This is similar to an earlier commit 52dfcc5ccfbb ("drm/nouveau: fix for
> disabled fbdev emulation"), but protects all occurrences of helper.fbdev
> in the source.
> 
> I see oops in nouveau_fbcon_accel_save_disable() called from
> nouveau_fbcon_set_suspend_work() on Linux 3.13 when
> CONFIG_DRM_FBDEV_EMULATION option is disabled.

3.13 is _very_ old. Can you pls retest this with 4.14-rc kernels first? I
think we've fixed these all, but not sure.

Thanks, Daneil

> 
> Signed-off-by: Pavel Roskin <plroskin at gmail.com>
> ---
>  drivers/gpu/drm/nouveau/nouveau_fbcon.c | 8 ++++----
>  1 file changed, 4 insertions(+), 4 deletions(-)
> 
> diff --git a/drivers/gpu/drm/nouveau/nouveau_fbcon.c
> b/drivers/gpu/drm/nouveau/nouveau_fbcon.c
> index f7707849bb53..698b8b10b646 100644
> --- a/drivers/gpu/drm/nouveau/nouveau_fbcon.c
> +++ b/drivers/gpu/drm/nouveau/nouveau_fbcon.c
> @@ -223,7 +223,7 @@ void
>  nouveau_fbcon_accel_save_disable(struct drm_device *dev)
>  {
>      struct nouveau_drm *drm = nouveau_drm(dev);
> -    if (drm->fbcon) {
> +    if (drm->fbcon && drm->fbcon->helper.fbdev) {
>          drm->fbcon->saved_flags = drm->fbcon->helper.fbdev->flags;
>          drm->fbcon->helper.fbdev->flags |= FBINFO_HWACCEL_DISABLED;
>      }
> @@ -233,9 +233,8 @@ void
>  nouveau_fbcon_accel_restore(struct drm_device *dev)
>  {
>      struct nouveau_drm *drm = nouveau_drm(dev);
> -    if (drm->fbcon) {
> +    if (drm->fbcon && drm->fbcon->helper.fbdev)
>          drm->fbcon->helper.fbdev->flags = drm->fbcon->saved_flags;
> -    }
>  }
> 
>  static void
> @@ -245,7 +244,8 @@ nouveau_fbcon_accel_fini(struct drm_device *dev)
>      struct nouveau_fbdev *fbcon = drm->fbcon;
>      if (fbcon && drm->channel) {
>          console_lock();
> -        fbcon->helper.fbdev->flags |= FBINFO_HWACCEL_DISABLED;
> +        if (drm->fbcon->helper.fbdev)
> +            fbcon->helper.fbdev->flags |= FBINFO_HWACCEL_DISABLED;
>          console_unlock();
>          nouveau_channel_idle(drm->channel);
>          nvif_object_fini(&fbcon->twod);
> -- 
> 2.14.1
> _______________________________________________
> dri-devel mailing list
> dri-devel at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/dri-devel

-- 
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch