Commit d8e70a25 authored by Jesse Barnes's avatar Jesse Barnes Committed by Keith Packard

drm/i915: only set the intel_crtc DPMS mode to on if the mode set succeeded

If it failed, leave it in the "off" state.
Signed-off-by: default avatarJesse Barnes <jbarnes@virtuousgeek.org>
Signed-off-by: default avatarKeith Packard <keithp@keithp.com>
parent 7a419866
...@@ -5984,9 +5984,11 @@ static int intel_crtc_mode_set(struct drm_crtc *crtc, ...@@ -5984,9 +5984,11 @@ static int intel_crtc_mode_set(struct drm_crtc *crtc,
ret = dev_priv->display.crtc_mode_set(crtc, mode, adjusted_mode, ret = dev_priv->display.crtc_mode_set(crtc, mode, adjusted_mode,
x, y, old_fb); x, y, old_fb);
drm_vblank_post_modeset(dev, pipe); drm_vblank_post_modeset(dev, pipe);
if (ret)
intel_crtc->dpms_mode = DRM_MODE_DPMS_OFF;
else
intel_crtc->dpms_mode = DRM_MODE_DPMS_ON; intel_crtc->dpms_mode = DRM_MODE_DPMS_ON;
return ret; return ret;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment