From 9d33d6f7bfdc8580afaccc29bdbbab6aed4168a1 Mon Sep 17 00:00:00 2001
From: Alex Deucher <alexdeucher@gmail.com>
Date: Thu, 8 Oct 2009 13:08:29 -0400
Subject: [PATCH] --- yaml --- r: 168447 b: refs/heads/master c:
 5f9a0eb5af16906cd31fc3e02746aa3d61fd3aa9 h: refs/heads/master i:   168445:
 aee09324aa86616d7f798274d4b319579fc8d8ad   168443:
 05d6f81b00c52bcbc30c6eedf2f12f5a06550ef3   168439:
 1b97b2b16561fe4a92b45f39da8d549ea31aa422   168431:
 e2d704f061a078f8ca6ed5d4eb59314b033f26c8   168415:
 abdec71e97e04dd875f918fe7db5af716ea8dc6d   168383:
 ee0f55adc161087d0eb27dc91912578fb891f74c   168319:
 5dd06f3e796c15dcb1b436bbbcbc01e78097fe61   168191:
 1665b0c9e74e6e9018d98f1261420e5417aca662   167935:
 ae7cd49d750547632377570b6e14c79bc9d09918 v: v3

---
 [refs]                                       | 2 +-
 trunk/drivers/gpu/drm/radeon/atombios_crtc.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 64623470fdf5..dc222e70762d 100644
--- 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
index 38a87cc6eb12..0a5082af3cd3 100644
--- 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;
 	}