summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/i915/intel_sdvo.c
diff options
context:
space:
mode:
authorChris Wilson <chris@chris-wilson.co.uk>2012-12-19 16:08:43 +0000
committerDaniel Vetter <daniel.vetter@ffwll.ch>2012-12-20 21:09:55 +0100
commitc0c36b941b6f0be6ac74f340040cbb29d6a0b06c (patch)
tree68e8846f56be510e48f91d3896c768011248608d /drivers/gpu/drm/i915/intel_sdvo.c
parent1c45140d3da0c98fa7eda2cd10f9805232a5e9ac (diff)
downloadlinux-stable-c0c36b941b6f0be6ac74f340040cbb29d6a0b06c.tar.gz
linux-stable-c0c36b941b6f0be6ac74f340040cbb29d6a0b06c.tar.bz2
linux-stable-c0c36b941b6f0be6ac74f340040cbb29d6a0b06c.zip
drm/i915: Return the real error code from intel_set_mode()
Note: This patch also adds a little helper intel_crtc_restore_mode for the common case where we do a full modeset but with the same parameters, e.g. to undo bios damage or update a property. Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> Reviewed-by: Rodrigo Vivi <rodrigo.vivi@gmail.com> [danvet: Added note.] Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_sdvo.c')
-rw-r--r--drivers/gpu/drm/i915/intel_sdvo.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/drivers/gpu/drm/i915/intel_sdvo.c b/drivers/gpu/drm/i915/intel_sdvo.c
index 0e03985b0fe4..ea2e79f63d2b 100644
--- a/drivers/gpu/drm/i915/intel_sdvo.c
+++ b/drivers/gpu/drm/i915/intel_sdvo.c
@@ -1997,11 +1997,8 @@ set_value:
done:
- if (intel_sdvo->base.base.crtc) {
- struct drm_crtc *crtc = intel_sdvo->base.base.crtc;
- intel_set_mode(crtc, &crtc->mode,
- crtc->x, crtc->y, crtc->fb);
- }
+ if (intel_sdvo->base.base.crtc)
+ intel_crtc_restore_mode(intel_sdvo->base.base.crtc);
return 0;
#undef CHECK_PROPERTY