diff options
| author | Jesse Barnes <jbarnes@virtuousgeek.org> | 2011-10-20 14:57:35 -0700 |
|---|---|---|
| committer | Jesse Barnes <jbarnes@virtuousgeek.org> | 2011-10-20 14:59:42 -0700 |
| commit | f09bfd311284e33502577e26392d8f636ddc7a96 (patch) | |
| tree | 5502d8d1400d96925a12483494b7b246a554d763 | |
| parent | b8d1d48a40d2791e094e56427c702943a71941ad (diff) | |
drm/i915: only set the intel_crtc DPMS mode to on if the mode set succeededHEADmisc-fixes
If it failed, leave it in the "off" state.
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
| -rw-r--r-- | drivers/gpu/drm/i915/intel_display.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index ee6b36e49597..e7e146e44d5a 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -5812,10 +5812,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; } |