On Wed, 2019-09-18 at 16:56 -0700, Matt Roper wrote:
> The MCC hpd table is just a subset of the ICP table; we can eliminate
> it
> and use the ICP table everywhere. The extra pins in the table won't
> be
> a problem for MCC since we still supply an appropriate hotplug
> trigger
> mask anywhere the pin table is used.
>
Reviewed-by: José Roberto de Souza <jose.souza@xxxxxxxxx>
> Cc: José Roberto de Souza <jose.souza@xxxxxxxxx>
> Signed-off-by: Matt Roper <matthew.d.roper@xxxxxxxxx>
> ---
> drivers/gpu/drm/i915/i915_irq.c | 10 ++--------
> 1 file changed, 2 insertions(+), 8 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/i915_irq.c
> b/drivers/gpu/drm/i915/i915_irq.c
> index ae7228032d2c..bc83f094065a 100644
> --- a/drivers/gpu/drm/i915/i915_irq.c
> +++ b/drivers/gpu/drm/i915/i915_irq.c
> @@ -157,12 +157,6 @@ static const u32 hpd_icp[HPD_NUM_PINS] = {
> [HPD_PORT_F] = SDE_TC_HOTPLUG_ICP(PORT_TC4),
> };
>
> -static const u32 hpd_mcc[HPD_NUM_PINS] = {
> - [HPD_PORT_A] = SDE_DDI_HOTPLUG_ICP(PORT_A),
> - [HPD_PORT_B] = SDE_DDI_HOTPLUG_ICP(PORT_B),
> - [HPD_PORT_C] = SDE_TC_HOTPLUG_ICP(PORT_TC1),
> -};
> -
> static const u32 hpd_tgp[HPD_NUM_PINS] = {
> [HPD_PORT_A] = SDE_DDI_HOTPLUG_ICP(PORT_A),
> [HPD_PORT_B] = SDE_DDI_HOTPLUG_ICP(PORT_B),
> @@ -2258,7 +2252,7 @@ static void icp_irq_handler(struct
> drm_i915_private *dev_priv, u32 pch_iir)
> } else if (HAS_PCH_MCC(dev_priv)) {
> ddi_hotplug_trigger = pch_iir & SDE_DDI_MASK_TGP;
> tc_hotplug_trigger = 0;
> - pins = hpd_mcc;
> + pins = hpd_icp;
> } else {
> ddi_hotplug_trigger = pch_iir & SDE_DDI_MASK_ICP;
> tc_hotplug_trigger = pch_iir & SDE_TC_MASK_ICP;
> @@ -3434,7 +3428,7 @@ static void mcc_hpd_irq_setup(struct
> drm_i915_private *dev_priv)
> icp_hpd_irq_setup(dev_priv,
> SDE_DDI_MASK_TGP, 0,
> TGP_DDI_HPD_ENABLE_MASK, 0,
> - hpd_mcc);
> + hpd_icp);
> }
>
> static void gen11_hpd_detection_setup(struct drm_i915_private
> *dev_priv)
_______________________________________________
Intel-gfx mailing list
Intel-gfx@xxxxxxxxxxxxxxxxxxxxx
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
