3.16.7-ckt2 -stable review patch. If anyone has any objections, please let me
know.
------------------
From: Ben Skeggs <bske...@redhat.com>
commit 04384435fbcd2c5cb70b2e58c8b643822d7e337f upstream.
This *should* be safe these days.
Signed-off-by: Ben Skeggs <bske...@redhat.com>
Cc: Sven Joachim <svenj...@gmx.de>
Signed-off-by: Luis Henriques <luis.henriq...@canonical.com>
---
drivers/gpu/drm/nouveau/nouveau_fbcon.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/gpu/drm/nouveau/nouveau_fbcon.c
b/drivers/gpu/drm/nouveau/nouveau_fbcon.c
index 02dc2a1e1d28..2ef2842aacbf 100644
--- a/drivers/gpu/drm/nouveau/nouveau_fbcon.c
+++ b/drivers/gpu/drm/nouveau/nouveau_fbcon.c
@@ -550,13 +550,13 @@ nouveau_fbcon_set_suspend(struct drm_device *dev, int
state)
struct nouveau_drm *drm = nouveau_drm(dev);
if (drm->fbcon) {
console_lock();
- if (state == 1)
- nouveau_fbcon_accel_save_disable(dev);
- fb_set_suspend(drm->fbcon->helper.fbdev, state);
if (state == 0) {
nouveau_fbcon_accel_restore(dev);
nouveau_fbcon_zfill(dev, drm->fbcon);
}
+ fb_set_suspend(drm->fbcon->helper.fbdev, state);
+ if (state == 1)
+ nouveau_fbcon_accel_save_disable(dev);
console_unlock();
}
}
--
2.1.0
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
