aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/i915/intel_hdmi.c
diff options
context:
space:
mode:
authorPaulo Zanoni <paulo.r.zanoni@intel.com>2012-10-26 17:05:51 -0400
committerDaniel Vetter <daniel.vetter@ffwll.ch>2012-11-11 17:51:08 -0500
commitbcbc889bc44a781577479939490f6b7452d5b808 (patch)
treedac2e6c1913448e347426555a7092c3ddf02bd97 /drivers/gpu/drm/i915/intel_hdmi.c
parent174edf1f867dc573439675f9b4c2211012d4b563 (diff)
drm/i915: add intel_ddi_connector_get_hw_state
We need this since now on DDI we will have 2 connectors on each encoder. Signed-off-by: Paulo Zanoni <paulo.r.zanoni@intel.com> Reviewed-by: Damien Lespiau <damien.lespiau@intel.com> 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.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/intel_hdmi.c b/drivers/gpu/drm/i915/intel_hdmi.c
index 3c42caab8d23..79d15b35a021 100644
--- a/drivers/gpu/drm/i915/intel_hdmi.c
+++ b/drivers/gpu/drm/i915/intel_hdmi.c
@@ -1017,7 +1017,10 @@ static void intel_hdmi_init_connector(struct intel_digital_port *intel_dig_port,
1017 intel_hdmi->set_infoframes = cpt_set_infoframes; 1017 intel_hdmi->set_infoframes = cpt_set_infoframes;
1018 } 1018 }
1019 1019
1020 intel_connector->get_hw_state = intel_connector_get_hw_state; 1020 if (IS_HASWELL(dev))
1021 intel_connector->get_hw_state = intel_ddi_connector_get_hw_state;
1022 else
1023 intel_connector->get_hw_state = intel_connector_get_hw_state;
1021 1024
1022 intel_hdmi_add_properties(intel_hdmi, connector); 1025 intel_hdmi_add_properties(intel_hdmi, connector);
1023 1026