Patchwork [Fwd:,[PATCH] stable - drm/radeon/kms: fix crtc vblank update for r600]

login
register
mail settings
Submitter Tim Gardner
Date Dec. 21, 2009, 3:10 p.m.
Message ID <4B2F8FD3.6030102@canonical.com>
Download mbox | patch
Permalink /patch/41553/
State Accepted
Delegated to: Andy Whitcroft
Headers show

Comments

Tim Gardner - Dec. 21, 2009, 3:10 p.m.
FYI before jumping on 2.6.32.2. Looks like it could be a bit of a 
regression.
Andy Whitcroft - Dec. 21, 2009, 4:35 p.m.
On Mon, Dec 21, 2009 at 08:10:11AM -0700, Tim Gardner wrote:
> FYI before jumping on 2.6.32.2. Looks like it could be a bit of a
> regression.

Thanks.  I will pull that one in with the update before testing it :)

-apw

Patch

diff --git a/drivers/gpu/drm/radeon/atombios_crtc.c b/drivers/gpu/drm/radeon/atombios_crtc.c
index c6777cb..19f93f2 100644
--- a/drivers/gpu/drm/radeon/atombios_crtc.c
+++ b/drivers/gpu/drm/radeon/atombios_crtc.c
@@ -249,13 +249,15 @@  void atombios_crtc_dpms(struct drm_crtc *crtc, int mode)
 		if (ASIC_IS_DCE3(rdev))
 			atombios_enable_crtc_memreq(crtc, 1);
 		atombios_blank_crtc(crtc, 0);
-		drm_vblank_post_modeset(dev, radeon_crtc->crtc_id);
+		if (rdev->family < CHIP_R600)
+			drm_vblank_post_modeset(dev, radeon_crtc->crtc_id);
 		radeon_crtc_load_lut(crtc);
 		break;
 	case DRM_MODE_DPMS_STANDBY:
 	case DRM_MODE_DPMS_SUSPEND:
 	case DRM_MODE_DPMS_OFF:
-		drm_vblank_pre_modeset(dev, radeon_crtc->crtc_id);
+		if (rdev->family < CHIP_R600)
+			drm_vblank_pre_modeset(dev, radeon_crtc->crtc_id);
 		atombios_blank_crtc(crtc, 1);
 		if (ASIC_IS_DCE3(rdev))
 			atombios_enable_crtc_memreq(crtc, 0);