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

This *should* be safe these days.

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
This commit is contained in:
Ben Skeggs 2014-06-30 13:18:48 +10:00
Родитель 4b5098f359
Коммит 04384435fb
1 изменённых файлов: 3 добавлений и 3 удалений

Просмотреть файл

@ -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();
}
}