---

yaml --- r: 168447 b: refs/heads/master c: 5f9a0eb h: refs/heads/master i: 168445: aee0932 168443: 05d6f81 168439: 1b97b2b 168431: e2d704f 168415: abdec71 168383: ee0f55a 168319: 5dd06f3 168191: 1665b0c 167935: ae7cd49 v: v3
git-mirror · Oct 12, 2009 · 9d33d6f · 9d33d6f
1 parent cdf95c7
commit 9d33d6f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2ffb842948ba64b03986f4064140a74c1780c44b
+refs/heads/master: 5f9a0eb5af16906cd31fc3e02746aa3d61fd3aa9
diff --git a/trunk/drivers/gpu/drm/radeon/atombios_crtc.c b/trunk/drivers/gpu/drm/radeon/atombios_crtc.c
@@ -248,18 +248,18 @@ void atombios_crtc_dpms(struct drm_crtc *crtc, int mode)
 
 	switch (mode) {
 	case DRM_MODE_DPMS_ON:
+		atombios_enable_crtc(crtc, 1);
 		if (ASIC_IS_DCE3(rdev))
 			atombios_enable_crtc_memreq(crtc, 1);
-		atombios_enable_crtc(crtc, 1);
 		atombios_blank_crtc(crtc, 0);
 		break;
 	case DRM_MODE_DPMS_STANDBY:
 	case DRM_MODE_DPMS_SUSPEND:
 	case DRM_MODE_DPMS_OFF:
 		atombios_blank_crtc(crtc, 1);
-		atombios_enable_crtc(crtc, 0);
 		if (ASIC_IS_DCE3(rdev))
 			atombios_enable_crtc_memreq(crtc, 0);
+		atombios_enable_crtc(crtc, 0);
 		break;
 	}