Commit 04384435 authored by Ben Skeggs's avatar Ben Skeggs

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

This *should* be safe these days.
Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
parent 4b5098f3
...@@ -551,13 +551,13 @@ nouveau_fbcon_set_suspend(struct drm_device *dev, int state) ...@@ -551,13 +551,13 @@ nouveau_fbcon_set_suspend(struct drm_device *dev, int state)
struct nouveau_drm *drm = nouveau_drm(dev); struct nouveau_drm *drm = nouveau_drm(dev);
if (drm->fbcon) { if (drm->fbcon) {
console_lock(); console_lock();
if (state == 1)
nouveau_fbcon_accel_save_disable(dev);
fb_set_suspend(drm->fbcon->helper.fbdev, state);
if (state == 0) { if (state == 0) {
nouveau_fbcon_accel_restore(dev); nouveau_fbcon_accel_restore(dev);
nouveau_fbcon_zfill(dev, drm->fbcon); 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(); console_unlock();
} }
} }
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment