5ef5f72febfea420ce58f670bad83830a5e5e3de broke VGA console restore because it makes drm_framebuffer_cleanup() turn off every CRTC with an associated framebuffer: do it by ourselves before the original hardware state is written out.
Signed-off-by: Francisco Jerez <[email protected]> --- drivers/gpu/drm/nouveau/nv04_display.c | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/drivers/gpu/drm/nouveau/nv04_display.c b/drivers/gpu/drm/nouveau/nv04_display.c index 32f504d..7b4d5c0 100644 --- a/drivers/gpu/drm/nouveau/nv04_display.c +++ b/drivers/gpu/drm/nouveau/nv04_display.c @@ -228,6 +228,15 @@ nv04_display_destroy(struct drm_device *dev) NV_DEBUG(dev, "\n"); + /* Turn every CRTC off. */ + list_for_each_entry(crtc, &dev->mode_config.crtc_list, head) { + struct drm_mode_set modeset = { + .crtc = crtc, + }; + + crtc->funcs->set_config(&modeset); + } + /* Restore state */ NVLockVgaCrtcs(dev, false); -- 1.6.3.3 _______________________________________________ Nouveau mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/nouveau
