diff options
| author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2009-08-11 16:05:31 +0200 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2009-09-04 13:05:43 -0700 |
| commit | 65655d4ab72456c4c3e503fead55fabf8211a79d (patch) | |
| tree | 5bed9d75dc58b8e79a5d0c5398fc91a48e886a87 /drivers | |
| parent | c05422d52ee6b4cff8b63eab1a7351780518fc5e (diff) | |
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>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_display.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index f0f38f5e752..867a969980e 100644 --- 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) |