summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/i915/intel_display.c
diff options
context:
space:
mode:
authorDaniel Vetter2014-04-24 23:54:47 +0200
committerDaniel Vetter2014-05-16 11:57:44 +0200
commit6897b4b5d3336a0a02d94225de971985c7ad42fe (patch)
treed9873e0d2456b48e525b6343b1003aea73a5620e /drivers/gpu/drm/i915/intel_display.c
parentdrm/i915/hdmi: Enable hdmi mode on g4x, too (diff)
downloadkernel-qcow2-linux-6897b4b5d3336a0a02d94225de971985c7ad42fe.tar.gz
kernel-qcow2-linux-6897b4b5d3336a0a02d94225de971985c7ad42fe.tar.xz
kernel-qcow2-linux-6897b4b5d3336a0a02d94225de971985c7ad42fe.zip
drm/i915: Track hdmi mode in the pipe config
Also add state readout and cross-check support. The only invasive change is wiring up the new flag to the ->set_infoframes callbacks. Reviewed-by: Naresh Kumar Kachhi <naresh.kumar.kachhi@intel.com> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_display.c')
-rw-r--r--drivers/gpu/drm/i915/intel_display.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index 9914ab235b7b..6240f1f543b9 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -9883,6 +9883,7 @@ intel_pipe_config_compare(struct drm_device *dev,
PIPE_CONF_CHECK_I(adjusted_mode.crtc_vsync_end);
PIPE_CONF_CHECK_I(pixel_multiplier);
+ PIPE_CONF_CHECK_I(has_hdmi_sink);
PIPE_CONF_CHECK_FLAGS(adjusted_mode.flags,
DRM_MODE_FLAG_INTERLACE);