On Fri, 03 Feb 2017, Ander Conselvan de Oliveira <ander.conselvan.de.oliveira@xxxxxxxxx> wrote:
> Remove workaround for swapped HPD pins in broxton A stepping, which is
> pre-production hardware.
>
> Cc: Jani Nikula <jani.nikula@xxxxxxxxxxxxxxx>
> Signed-off-by: Ander Conselvan de Oliveira <ander.conselvan.de.oliveira@xxxxxxxxx>
Reviewed-by: Jani Nikula <jani.nikula@xxxxxxxxx>
> ---
> drivers/gpu/drm/i915/intel_ddi.c | 9 +--------
> drivers/gpu/drm/i915/intel_dp.c | 2 --
> drivers/gpu/drm/i915/intel_hdmi.c | 9 +--------
> 3 files changed, 2 insertions(+), 18 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/intel_ddi.c b/drivers/gpu/drm/i915/intel_ddi.c
> index d957211..b5b3065 100644
> --- a/drivers/gpu/drm/i915/intel_ddi.c
> +++ b/drivers/gpu/drm/i915/intel_ddi.c
> @@ -2264,14 +2264,7 @@ void intel_ddi_init(struct drm_i915_private *dev_priv, enum port port)
> goto err;
>
> 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;
> }
>
> /* In theory we don't need the encoder->type check, but leave it just in
> diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c
> index 2ab0192..1a07072 100644
> --- a/drivers/gpu/drm/i915/intel_dp.c
> +++ b/drivers/gpu/drm/i915/intel_dp.c
> @@ -5995,8 +5995,6 @@ intel_dp_init_connector(struct intel_digital_port *intel_dig_port,
> break;
> case 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;
> case PORT_C:
> intel_encoder->hpd_pin = HPD_PORT_C;
> diff --git a/drivers/gpu/drm/i915/intel_hdmi.c b/drivers/gpu/drm/i915/intel_hdmi.c
> index ebae2bd..a580de8 100644
> --- a/drivers/gpu/drm/i915/intel_hdmi.c
> +++ b/drivers/gpu/drm/i915/intel_hdmi.c
> @@ -1869,14 +1869,7 @@ void intel_hdmi_init_connector(struct intel_digital_port *intel_dig_port,
>
> switch (port) {
> 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;
> case PORT_C:
> intel_encoder->hpd_pin = HPD_PORT_C;
--
Jani Nikula, Intel Open Source Technology Center
_______________________________________________
Intel-gfx mailing list
Intel-gfx@xxxxxxxxxxxxxxxxxxxxx
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
