diff options
| author | Jesse Barnes <jbarnes@virtuousgeek.org> | 2011-11-15 10:28:54 -0800 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2012-01-03 14:55:52 -0800 |
| commit | d8e70a254d8f2da141006e496a51502b79115e80 (patch) | |
| tree | 24e917c5070da0ad8e04899c29f2d4618a49752d /drivers/gpu | |
| parent | 7a4198664d46b87025a64530f1530ab2bea54c19 (diff) | |
| download | linux-3.10-d8e70a254d8f2da141006e496a51502b79115e80.tar.gz linux-3.10-d8e70a254d8f2da141006e496a51502b79115e80.tar.bz2 linux-3.10-d8e70a254d8f2da141006e496a51502b79115e80.zip | |
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: Jesse Barnes <jbarnes@virtuousgeek.org>
Signed-off-by: Keith Packard <keithp@keithp.com>
Diffstat (limited to 'drivers/gpu')
| -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 bdab82b999e..29743dee54c 100644 --- 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; } |