drm/i915: modeset: always set intel_crtc->dpms_mode by moving the assignment up.

Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch> Signed-off-by: Eric Anholt <eric@anholt.net>
16 years ago · 65655d4ab7
parent c05422d52e
commit 65655d4ab7
1 changed files with 2 additions and 2 deletions
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@ -1640,6 +1640,8 @@ static void intel_crtc_dpms(struct drm_crtc *crtc, int mode)
 	else
 		i9xx_crtc_dpms(crtc, mode);

+	intel_crtc->dpms_mode = mode;
+
 	if (!dev->primary->master)
 		return;

@ -1662,8 +1664,6 @@ static void intel_crtc_dpms(struct drm_crtc *crtc, int mode)
 		DRM_ERROR("Can't update pipe %d in SAREA\n", pipe);
 		break;
 	}
-
-	intel_crtc->dpms_mode = mode;
 }

 static void intel_crtc_prepare (struct drm_crtc *crtc)