Commit ecf24de0 authored by Ben Skeggs's avatar Ben Skeggs

drm/nouveau: fix fbcon not being accelerated after suspend

This does *not* (and is not intended to) fix the issue reported by
Christoph Rudorff on the nouveau mailinglist.

The patch proposed (which is similar to this one, but also reorders
whether we disable accel or call fb_set_suspend first), papers over
another problem entirely by avoiding touching the framebuffer.
Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
parent 88e98d49
...@@ -528,10 +528,10 @@ nouveau_fbcon_set_suspend(struct drm_device *dev, int state) ...@@ -528,10 +528,10 @@ 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 == 0) if (state == 1)
nouveau_fbcon_save_disable_accel(dev); nouveau_fbcon_save_disable_accel(dev);
fb_set_suspend(drm->fbcon->helper.fbdev, state); fb_set_suspend(drm->fbcon->helper.fbdev, state);
if (state == 1) if (state == 0)
nouveau_fbcon_restore_accel(dev); nouveau_fbcon_restore_accel(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