aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/i915/intel_hdmi.c
diff options
context:
space:
mode:
authorVille Syrjälä <ville.syrjala@linux.intel.com>2014-04-09 06:28:52 -0400
committerDaniel Vetter <daniel.vetter@ffwll.ch>2014-05-20 09:30:48 -0400
commitc0c353299c48b19c95de1e7bda494c0c71248c0c (patch)
treec070107503f769280f07f89eb0d230ce14e864ea /drivers/gpu/drm/i915/intel_hdmi.c
parent882ec3846e1f88b2893bea5e5920576f1d79bbee (diff)
drm/i915/chv: Fix gmbus for port D
On CHV the GMBUS port for port D is different from other gmch platforms which have port D. Fix it up. Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com> Reviewed-by: Antti Koskipää <antti.koskipaa@linux.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 5976693927e6..166785d597ce 100644
--- a/drivers/gpu/drm/i915/intel_hdmi.c
+++ b/drivers/gpu/drm/i915/intel_hdmi.c
@@ -1382,7 +1382,10 @@ void intel_hdmi_init_connector(struct intel_digital_port *intel_dig_port,
1382 intel_encoder->hpd_pin = HPD_PORT_C; 1382 intel_encoder->hpd_pin = HPD_PORT_C;
1383 break; 1383 break;
1384 case PORT_D: 1384 case PORT_D:
1385 intel_hdmi->ddc_bus = GMBUS_PORT_DPD; 1385 if (IS_CHERRYVIEW(dev))
1386 intel_hdmi->ddc_bus = GMBUS_PORT_DPD_CHV;
1387 else
1388 intel_hdmi->ddc_bus = GMBUS_PORT_DPD;
1386 intel_encoder->hpd_pin = HPD_PORT_D; 1389 intel_encoder->hpd_pin = HPD_PORT_D;
1387 break; 1390 break;
1388 case PORT_A: 1391 case PORT_A: