diff options
| author | Paulo Zanoni | 2012-10-26 23:05:51 +0200 |
|---|---|---|
| committer | Daniel Vetter | 2012-11-11 23:51:08 +0100 |
| commit | bcbc889bc44a781577479939490f6b7452d5b808 (patch) | |
| tree | dac2e6c1913448e347426555a7092c3ddf02bd97 /drivers/gpu/drm/i915/intel_hdmi.c | |
| parent | drm/i915: add port field to intel_digital_port (diff) | |
| download | kernel-qcow2-linux-bcbc889bc44a781577479939490f6b7452d5b808.tar.gz kernel-qcow2-linux-bcbc889bc44a781577479939490f6b7452d5b808.tar.xz kernel-qcow2-linux-bcbc889bc44a781577479939490f6b7452d5b808.zip | |
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.c | 5 |
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, intel_hdmi->set_infoframes = cpt_set_infoframes; } - intel_connector->get_hw_state = intel_connector_get_hw_state; + if (IS_HASWELL(dev)) + intel_connector->get_hw_state = intel_ddi_connector_get_hw_state; + else + intel_connector->get_hw_state = intel_connector_get_hw_state; intel_hdmi_add_properties(intel_hdmi, connector); |