aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/i915/intel_hdmi.c
diff options
context:
space:
mode:
authorChris Wilson <chris@chris-wilson.co.uk>2012-12-19 11:08:43 -0500
committerDaniel Vetter <daniel.vetter@ffwll.ch>2012-12-20 15:09:55 -0500
commitc0c36b941b6f0be6ac74f340040cbb29d6a0b06c (patch)
tree68e8846f56be510e48f91d3896c768011248608d /drivers/gpu/drm/i915/intel_hdmi.c
parent1c45140d3da0c98fa7eda2cd10f9805232a5e9ac (diff)
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_hdmi.c')
-rw-r--r--drivers/gpu/drm/i915/intel_hdmi.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/drivers/gpu/drm/i915/intel_hdmi.c b/drivers/gpu/drm/i915/intel_hdmi.c
index 9f834d324cfd..6387f9b0df99 100644
--- a/drivers/gpu/drm/i915/intel_hdmi.c
+++ b/drivers/gpu/drm/i915/intel_hdmi.c
@@ -917,11 +917,8 @@ intel_hdmi_set_property(struct drm_connector *connector,
917 return -EINVAL; 917 return -EINVAL;
918 918
919done: 919done:
920 if (intel_dig_port->base.base.crtc) { 920 if (intel_dig_port->base.base.crtc)
921 struct drm_crtc *crtc = intel_dig_port->base.base.crtc; 921 intel_crtc_restore_mode(intel_dig_port->base.base.crtc);
922 intel_set_mode(crtc, &crtc->mode,
923 crtc->x, crtc->y, crtc->fb);
924 }
925 922
926 return 0; 923 return 0;
927} 924}