Attachment 41218 Details for Bug 32066 – possible fix

[patch] possible fix

0001-drm-radeon-kms-reorder-display-resume-to-avoid-probl.patch (text/plain), 2.22 KB, created by Alex Deucher on 2010-12-17 08:39:21 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Alex Deucher

Created: 2010-12-17 08:39:21 UTC

Size: 2.22 KB

patch

obsolete

>From 65684458ef52319b88fb1ccb6dde166a9db16e7d Mon Sep 17 00:00:00 2001
>From: Alex Deucher <alexdeucher@gmail.com>
>Date: Fri, 17 Dec 2010 11:32:23 -0500
>Subject: [PATCH] drm/radeon/kms: reorder display resume to avoid problems
>
>On resume, we were attemping to unblank the displays before the
>timing and plls had be reprogrammed which led to atom timeouts
>waiting for things that are not yet programmed.  Re-program
>the mode first, then reset the dpms state.
>
>Signed-off-by: Alex Deucher <alexdeucher@gmail.com>
>Cc: stable@kernel.org
>---
> drivers/gpu/drm/radeon/atombios_crtc.c |    3 ++-
> drivers/gpu/drm/radeon/radeon_device.c |    9 ++++-----
> 2 files changed, 6 insertions(+), 6 deletions(-)
>
>diff --git a/drivers/gpu/drm/radeon/atombios_crtc.c b/drivers/gpu/drm/radeon/atombios_crtc.c
>index 6a4f090..b0ab185 100644
>--- a/drivers/gpu/drm/radeon/atombios_crtc.c
>+++ b/drivers/gpu/drm/radeon/atombios_crtc.c
>@@ -253,7 +253,8 @@ void atombios_crtc_dpms(struct drm_crtc *crtc, int mode)
> 	case DRM_MODE_DPMS_SUSPEND:
> 	case DRM_MODE_DPMS_OFF:
> 		drm_vblank_pre_modeset(dev, radeon_crtc->crtc_id);
>-		atombios_blank_crtc(crtc, ATOM_ENABLE);
>+		if (radeon_crtc->enabled)
>+			atombios_blank_crtc(crtc, ATOM_ENABLE);
> 		if (ASIC_IS_DCE3(rdev))
> 			atombios_enable_crtc_memreq(crtc, ATOM_DISABLE);
> 		atombios_enable_crtc(crtc, ATOM_DISABLE);
>diff --git a/drivers/gpu/drm/radeon/radeon_device.c b/drivers/gpu/drm/radeon/radeon_device.c
>index 5da80d5..fcf0acb 100644
>--- a/drivers/gpu/drm/radeon/radeon_device.c
>+++ b/drivers/gpu/drm/radeon/radeon_device.c
>@@ -925,11 +925,6 @@ int radeon_resume_kms(struct drm_device *dev)
> 	radeon_pm_resume(rdev);
> 	radeon_restore_bios_scratch_regs(rdev);
> 
>-	/* turn on display hw */
>-	list_for_each_entry(connector, &dev->mode_config.connector_list, head) {
>-		drm_helper_connector_dpms(connector, DRM_MODE_DPMS_ON);
>-	}
>-
> 	radeon_fbdev_set_suspend(rdev, 0);
> 	release_console_sem();
> 
>@@ -937,6 +932,10 @@ int radeon_resume_kms(struct drm_device *dev)
> 	radeon_hpd_init(rdev);
> 	/* blat the mode back in */
> 	drm_helper_resume_force_mode(dev);
>+	/* turn on display hw */
>+	list_for_each_entry(connector, &dev->mode_config.connector_list, head) {
>+		drm_helper_connector_dpms(connector, DRM_MODE_DPMS_ON);
>+	}
> 	return 0;
> }
> 
>-- 
>1.7.1.1
>

Actions: View | Splinter Review

Attachments on bug 32066: 40753 | 40754 | 40755 | 41218 | 41343

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.