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>

2 files changed, 5 insertions, 1 deletions

diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h
index 3822d25723a6..ada0cf326e7f 100644
--- a/drivers/gpu/drm/i915/i915_reg.h
+++ b/drivers/gpu/drm/i915/i915_reg.h
@@ -1411,6 +1411,7 @@ enum punit_power_well {
 #define   GMBUS_PORT_SSC        1
 #define   GMBUS_PORT_VGADDC     2
 #define   GMBUS_PORT_PANEL      3
+#define   GMBUS_PORT_DPD_CHV    3 /* HDMID_CHV */
 #define   GMBUS_PORT_DPC        4 /* HDMIC */
 #define   GMBUS_PORT_DPB        5 /* SDVO, HDMIB */
 #define   GMBUS_PORT_DPD        6 /* HDMID */
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: