Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c0c35329 authored by Ville Syrjälä's avatar Ville Syrjälä Committed by Daniel Vetter
Browse files

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: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: default avatarAntti Koskipää <antti.koskipaa@linux.intel.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 882ec384

drivers/gpu/drm/i915/i915_reg.h

+1 −0
Original line number Original line Diff line number Diff line
@@ -1411,6 +1411,7 @@ enum punit_power_well { 
#define   GMBUS_PORT_SSC	1

#define   GMBUS_PORT_SSC	1

#define   GMBUS_PORT_VGADDC	2

#define   GMBUS_PORT_VGADDC	2

#define   GMBUS_PORT_PANEL	3

#define   GMBUS_PORT_PANEL	3

#define   GMBUS_PORT_DPD_CHV	3 /* HDMID_CHV */

#define   GMBUS_PORT_DPC	4 /* HDMIC */

#define   GMBUS_PORT_DPC	4 /* HDMIC */

#define   GMBUS_PORT_DPB	5 /* SDVO, HDMIB */

#define   GMBUS_PORT_DPB	5 /* SDVO, HDMIB */

#define   GMBUS_PORT_DPD	6 /* HDMID */

#define   GMBUS_PORT_DPD	6 /* HDMID */

drivers/gpu/drm/i915/intel_hdmi.c

+4 −1
Original line number Original line Diff line number Diff line
@@ -1382,6 +1382,9 @@ void intel_hdmi_init_connector(struct intel_digital_port *intel_dig_port, 
		intel_encoder->hpd_pin = HPD_PORT_C;

		intel_encoder->hpd_pin = HPD_PORT_C;

		break;

		break;

	case PORT_D:

	case PORT_D:

		if (IS_CHERRYVIEW(dev))

			intel_hdmi->ddc_bus = GMBUS_PORT_DPD_CHV;

		else

			intel_hdmi->ddc_bus = GMBUS_PORT_DPD;

			intel_hdmi->ddc_bus = GMBUS_PORT_DPD;

		intel_encoder->hpd_pin = HPD_PORT_D;

		intel_encoder->hpd_pin = HPD_PORT_D;

		break;

		break;