diff options
| author | Ben Skeggs <bskeggs@redhat.com> | 2014-06-30 03:18:48 (GMT) |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2014-08-09 19:11:09 (GMT) |
| commit | 04384435fbcd2c5cb70b2e58c8b643822d7e337f (patch) | |
| tree | 67eefb99d61b70c72e10d56902762f456297d25f /drivers | |
| parent | 4b5098f3597195e9faf17e5a0cfca905d9a04d9f (diff) | |
| download | linux-04384435fbcd2c5cb70b2e58c8b643822d7e337f.tar.xz | |
drm/nouveau/kms: restore acceleration before fb_set_suspend() resumes
This *should* be safe these days.
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nouveau_fbcon.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_fbcon.c b/drivers/gpu/drm/nouveau/nouveau_fbcon.c index ba00493..9364ad4 100644 --- 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(); } } |