Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 48137663 authored by Pavel Roskin's avatar Pavel Roskin Committed by Ben Skeggs
Browse files

drm/nouveau/fbcon: fix oops without fbdev emulation 



This is similar to an earlier commit 52dfcc5c ("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.

Signed-off-by: default avatarPavel Roskin <plroskin@gmail.com>
Reviewed-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
parent 227f66d2

drivers/gpu/drm/nouveau/nouveau_fbcon.c

+4 −3
Original line number Diff line number Diff line
@@ -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,7 +233,7 @@ 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;

	}

}
@@ -245,6 +245,7 @@ nouveau_fbcon_accel_fini(struct drm_device *dev) 
	struct nouveau_fbdev *fbcon = drm->fbcon;

	if (fbcon && drm->channel) {

		console_lock();

		if (fbcon->helper.fbdev)

			fbcon->helper.fbdev->flags |= FBINFO_HWACCEL_DISABLED;

		console_unlock();

		nouveau_channel_idle(drm->channel);