drm/nouveau/kms: restore acceleration before fb_set_suspend() resumes

This *should* be safe these days.

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>

diff --git a/drivers/gpu/drm/nouveau/nouveau_fbcon.c b/drivers/gpu/drm/nouveau/nouveau_fbcon.c
index ba004932435a905c0226a8083b2703b870c6a07c..9364ad4fcc1d03d7c6226c2ac212fa8fe972ef78 100644 (file)
--- a/drivers/gpu/drm/nouveau/nouveau_fbcon.c
+++ b/drivers/gpu/drm/nouveau/nouveau_fbcon.c
@@ -551,13 +551,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();
        }
 }