diff options
| author |  Ville Syrjälä <ville.syrjala@linux.intel.com>
| 2014-04-09 13:28:52 +0300 |
|---|---|---|
| committer |  Daniel Vetter <daniel.vetter@ffwll.ch>
| 2014-05-20 15:30:48 +0200 |
| commit | c0c353299c48b19c95de1e7bda494c0c71248c0c (patch) | |
| tree | c070107503f769280f07f89eb0d230ce14e864ea /drivers/gpu/drm/i915/intel_hdmi.c | |
| parent | drm/i915/chv: Configure crtc_mask correctly for CHV (diff) | |
| download | linux-c0c353299c48b19c95de1e7bda494c0c71248c0c.tar.gz linux-c0c353299c48b19c95de1e7bda494c0c71248c0c.tar.bz2 linux-c0c353299c48b19c95de1e7bda494c0c71248c0c.zip | |
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.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 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, intel_encoder->hpd_pin = HPD_PORT_C; break; case PORT_D: - intel_hdmi->ddc_bus = GMBUS_PORT_DPD; + if (IS_CHERRYVIEW(dev)) + intel_hdmi->ddc_bus = GMBUS_PORT_DPD_CHV; + else + intel_hdmi->ddc_bus = GMBUS_PORT_DPD; intel_encoder->hpd_pin = HPD_PORT_D; break; case PORT_A: |