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

…ceeded If it failed, leave it in the "off" state. Signed-off-by: Jesse Barnes <[email protected]> Signed-off-by: Keith Packard <[email protected]>
icpda · Jan 3, 2012 · d8e70a2 · d8e70a2
1 parent 7a41986
commit d8e70a2
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
@@ -5984,10 +5984,12 @@ static int intel_crtc_mode_set(struct drm_crtc *crtc,
 
 	ret = dev_priv->display.crtc_mode_set(crtc, mode, adjusted_mode,
 					      x, y, old_fb);
-
 	drm_vblank_post_modeset(dev, pipe);
 
-	intel_crtc->dpms_mode = DRM_MODE_DPMS_ON;
+	if (ret)
+		intel_crtc->dpms_mode = DRM_MODE_DPMS_OFF;
+	else
+		intel_crtc->dpms_mode = DRM_MODE_DPMS_ON;
 
 	return ret;
 }