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

Commit ca4c3890 authored Feb 03, 2017 by Ander Conselvan de Oliveira

drm/i915: Remove WA for swapped HPD pins in broxton A stepping

Remove workaround for swapped HPD pins in broxton A stepping, which is
pre-production hardware.

Cc: Jani Nikula <jani.nikula@linux.intel.com>
Signed-off-by: Ander Conselvan de Oliveira <ander.conselvan.de.oliveira@intel.com>
Reviewed-by: Jani Nikula <jani.nikula@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/20170203140316.20792-1-ander.conselvan.de.oliveira@intel.com

parent 1f7b847d

drivers/gpu/drm/i915/intel_ddi.c

+1 −8

Original line number	Original line	Diff line number	Diff line
	@@ -2264,13 +2264,6 @@ void intel_ddi_init(struct drm_i915_private *dev_priv, enum port port)
	goto err;		goto err;

	intel_dig_port->hpd_pulse = intel_dp_hpd_pulse;		intel_dig_port->hpd_pulse = intel_dp_hpd_pulse;
	/*
	* On BXT A0/A1, sw needs to activate DDIA HPD logic and
	* interrupts to check the external panel connection.
	*/
	if (IS_BXT_REVID(dev_priv, 0, BXT_REVID_A1) && port == PORT_B)
	dev_priv->hotplug.irq_port[PORT_A] = intel_dig_port;
	else
	dev_priv->hotplug.irq_port[port] = intel_dig_port;		dev_priv->hotplug.irq_port[port] = intel_dig_port;
	}		}

drivers/gpu/drm/i915/intel_dp.c

+0 −2

Original line number	Original line	Diff line number	Diff line
	@@ -5995,8 +5995,6 @@ intel_dp_init_connector(struct intel_digital_port *intel_dig_port,
	break;		break;
	case PORT_B:		case PORT_B:
	intel_encoder->hpd_pin = HPD_PORT_B;		intel_encoder->hpd_pin = HPD_PORT_B;
	if (IS_BXT_REVID(dev_priv, 0, BXT_REVID_A1))
	intel_encoder->hpd_pin = HPD_PORT_A;
	break;		break;
	case PORT_C:		case PORT_C:
	intel_encoder->hpd_pin = HPD_PORT_C;		intel_encoder->hpd_pin = HPD_PORT_C;

drivers/gpu/drm/i915/intel_hdmi.c

+1 −8

Original line number	Original line	Diff line number	Diff line
	@@ -1868,13 +1868,6 @@ void intel_hdmi_init_connector(struct intel_digital_port *intel_dig_port,

	switch (port) {		switch (port) {
	case PORT_B:		case PORT_B:
	/*
	* On BXT A0/A1, sw needs to activate DDIA HPD logic and
	* interrupts to check the external panel connection.
	*/
	if (IS_BXT_REVID(dev_priv, 0, BXT_REVID_A1))
	intel_encoder->hpd_pin = HPD_PORT_A;
	else
	intel_encoder->hpd_pin = HPD_PORT_B;		intel_encoder->hpd_pin = HPD_PORT_B;
	break;		break;
	case PORT_C:		case PORT_C: