Attachment 52138 Details for Bug 41608 – restore cursor settings after we restore mode

[patch] restore cursor settings after we restore mode

patch.diff (text/plain), 1.60 KB, created by maximlevitsky on 2011-10-09 06:17:35 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: maximlevitsky

Created: 2011-10-09 06:17:35 UTC

Size: 1.60 KB

patch

obsolete

>commit 1983cfccdf507c54cd9b1dc0bd39d6d09eb90385
>Author: Maxim Levitsky <maximlevitsky@gmail.com>
>Date:   Sun Oct 9 13:29:57 2011 +0200
>
>    nouveau: hide cursor before suspending.
>    
>    Otherwise PDISPLAY might try to access the unmapped and filled with garbage
>    cursor on resume. Fixes external output not comping to life after resume.
>
>diff --git a/drivers/gpu/drm/nouveau/nouveau_drv.c b/drivers/gpu/drm/nouveau/nouveau_drv.c
>index 4e08c22..12ce793 100644
>--- a/drivers/gpu/drm/nouveau/nouveau_drv.c
>+++ b/drivers/gpu/drm/nouveau/nouveau_drv.c
>@@ -367,15 +367,6 @@ nouveau_pci_resume(struct pci_dev *pdev)
> 
> 	engine->display.init(dev);
> 
>-	list_for_each_entry(crtc, &dev->mode_config.crtc_list, head) {
>-		struct nouveau_crtc *nv_crtc = nouveau_crtc(crtc);
>-		u32 offset = nv_crtc->cursor.nvbo->bo.offset;
>-
>-		nv_crtc->cursor.set_offset(nv_crtc, offset);
>-		nv_crtc->cursor.set_pos(nv_crtc, nv_crtc->cursor_saved_x,
>-						 nv_crtc->cursor_saved_y);
>-	}
>-
> 	/* Force CLUT to get re-loaded during modeset */
> 	list_for_each_entry(crtc, &dev->mode_config.crtc_list, head) {
> 		struct nouveau_crtc *nv_crtc = nouveau_crtc(crtc);
>@@ -391,6 +382,15 @@ nouveau_pci_resume(struct pci_dev *pdev)
> 
> 	drm_helper_resume_force_mode(dev);
> 
>+	list_for_each_entry(crtc, &dev->mode_config.crtc_list, head) {
>+		struct nouveau_crtc *nv_crtc = nouveau_crtc(crtc);
>+		u32 offset = nv_crtc->cursor.nvbo->bo.offset;
>+
>+		nv_crtc->cursor.set_offset(nv_crtc, offset);
>+		nv_crtc->cursor.set_pos(nv_crtc, nv_crtc->cursor_saved_x,
>+						 nv_crtc->cursor_saved_y);
>+	}
>+
> 	nouveau_fbcon_restore_accel(dev);
> 	drm_kms_helper_poll_enable(dev);
> 	return 0;

Actions: View | Splinter Review

Attachments on bug 41608: 52138

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.