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>
This commit is contained in:
parent
c05422d52e
commit
65655d4ab7
|
@ -1640,6 +1640,8 @@ static void intel_crtc_dpms(struct drm_crtc *crtc, int mode)
|
||||||
else
|
else
|
||||||
i9xx_crtc_dpms(crtc, mode);
|
i9xx_crtc_dpms(crtc, mode);
|
||||||
|
|
||||||
|
intel_crtc->dpms_mode = mode;
|
||||||
|
|
||||||
if (!dev->primary->master)
|
if (!dev->primary->master)
|
||||||
return;
|
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);
|
DRM_ERROR("Can't update pipe %d in SAREA\n", pipe);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
intel_crtc->dpms_mode = mode;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static void intel_crtc_prepare (struct drm_crtc *crtc)
|
static void intel_crtc_prepare (struct drm_crtc *crtc)
|
||||||
|
|
Loading…
Reference in New Issue