On Fri, 2023-03-03 at 18:58 +0200, Ville Syrjala wrote:
> From: Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx>
>
> Pair each <platform>_hotplug_enables() function with
> a corresponding <platform>_hotplug_mask() function so that
> we can determine right bits to clear on a per hpd_pin basis.
> We'll need this for turning on HPD sense for a specific
> encoder rather than just all of them.
>
> v2: Drop the unused 'i915' param (Jani)
> v3: Drop the _foo_hotplug_enables() redirection too
>
> Cc: Jani Nikula <jani.nikula@xxxxxxxxx>
> Signed-off-by: Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx>
> ---
Reviewed-by: Vinod Govindapillai <vinod.govindapillai@xxxxxxxxx>
> drivers/gpu/drm/i915/i915_irq.c | 205 +++++++++++++++++++++-----------
> 1 file changed, 134 insertions(+), 71 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c
> index cc3d016f76d1..22658b38454d 100644
> --- a/drivers/gpu/drm/i915/i915_irq.c
> +++ b/drivers/gpu/drm/i915/i915_irq.c
> @@ -2836,6 +2836,22 @@ static void cherryview_irq_reset(struct drm_i915_private *dev_priv)
> spin_unlock_irq(&dev_priv->irq_lock);
> }
>
> +static u32 ibx_hotplug_mask(enum hpd_pin hpd_pin)
> +{
> + switch (hpd_pin) {
> + case HPD_PORT_A:
> + return PORTA_HOTPLUG_ENABLE;
> + case HPD_PORT_B:
> + return PORTB_HOTPLUG_ENABLE | PORTB_PULSE_DURATION_MASK;
> + case HPD_PORT_C:
> + return PORTC_HOTPLUG_ENABLE | PORTC_PULSE_DURATION_MASK;
> + case HPD_PORT_D:
> + return PORTD_HOTPLUG_ENABLE | PORTD_PULSE_DURATION_MASK;
> + default:
> + return 0;
> + }
> +}
> +
> static u32 ibx_hotplug_enables(struct intel_encoder *encoder)
> {
> struct drm_i915_private *i915 = to_i915(encoder->base.dev);
> @@ -2870,13 +2886,10 @@ static void ibx_hpd_detection_setup(struct drm_i915_private *dev_priv)
> * The pulse duration bits are reserved on LPT+.
> */
> intel_uncore_rmw(&dev_priv->uncore, PCH_PORT_HOTPLUG,
> - PORTA_HOTPLUG_ENABLE |
> - PORTB_HOTPLUG_ENABLE |
> - PORTC_HOTPLUG_ENABLE |
> - PORTD_HOTPLUG_ENABLE |
> - PORTB_PULSE_DURATION_MASK |
> - PORTC_PULSE_DURATION_MASK |
> - PORTD_PULSE_DURATION_MASK,
> + ibx_hotplug_mask(HPD_PORT_A) |
> + ibx_hotplug_mask(HPD_PORT_B) |
> + ibx_hotplug_mask(HPD_PORT_C) |
> + ibx_hotplug_mask(HPD_PORT_D),
> intel_hpd_hotplug_enables(dev_priv, ibx_hotplug_enables));
> }
>
> @@ -2892,14 +2905,34 @@ static void ibx_hpd_irq_setup(struct drm_i915_private *dev_priv)
> ibx_hpd_detection_setup(dev_priv);
> }
>
> +static u32 icp_ddi_hotplug_mask(enum hpd_pin hpd_pin)
> +{
> + switch (hpd_pin) {
> + case HPD_PORT_A:
> + case HPD_PORT_B:
> + case HPD_PORT_C:
> + case HPD_PORT_D:
> + return SHOTPLUG_CTL_DDI_HPD_ENABLE(hpd_pin);
> + default:
> + return 0;
> + }
> +}
> +
> static u32 icp_ddi_hotplug_enables(struct intel_encoder *encoder)
> {
> - switch (encoder->hpd_pin) {
> - case HPD_PORT_A:
> - case HPD_PORT_B:
> - case HPD_PORT_C:
> - case HPD_PORT_D:
> - return SHOTPLUG_CTL_DDI_HPD_ENABLE(encoder->hpd_pin);
> + return icp_ddi_hotplug_mask(encoder->hpd_pin);
> +}
> +
> +static u32 icp_tc_hotplug_mask(enum hpd_pin hpd_pin)
> +{
> + switch (hpd_pin) {
> + case HPD_PORT_TC1:
> + case HPD_PORT_TC2:
> + case HPD_PORT_TC3:
> + case HPD_PORT_TC4:
> + case HPD_PORT_TC5:
> + case HPD_PORT_TC6:
> + return ICP_TC_HPD_ENABLE(hpd_pin);
> default:
> return 0;
> }
> @@ -2907,38 +2940,28 @@ static u32 icp_ddi_hotplug_enables(struct intel_encoder *encoder)
>
> static u32 icp_tc_hotplug_enables(struct intel_encoder *encoder)
> {
> - switch (encoder->hpd_pin) {
> - case HPD_PORT_TC1:
> - case HPD_PORT_TC2:
> - case HPD_PORT_TC3:
> - case HPD_PORT_TC4:
> - case HPD_PORT_TC5:
> - case HPD_PORT_TC6:
> - return ICP_TC_HPD_ENABLE(encoder->hpd_pin);
> - default:
> - return 0;
> - }
> + return icp_tc_hotplug_mask(encoder->hpd_pin);
> }
>
> static void icp_ddi_hpd_detection_setup(struct drm_i915_private *dev_priv)
> {
> intel_uncore_rmw(&dev_priv->uncore, SHOTPLUG_CTL_DDI,
> - SHOTPLUG_CTL_DDI_HPD_ENABLE(HPD_PORT_A) |
> - SHOTPLUG_CTL_DDI_HPD_ENABLE(HPD_PORT_B) |
> - SHOTPLUG_CTL_DDI_HPD_ENABLE(HPD_PORT_C) |
> - SHOTPLUG_CTL_DDI_HPD_ENABLE(HPD_PORT_D),
> + icp_ddi_hotplug_mask(HPD_PORT_A) |
> + icp_ddi_hotplug_mask(HPD_PORT_B) |
> + icp_ddi_hotplug_mask(HPD_PORT_C) |
> + icp_ddi_hotplug_mask(HPD_PORT_D),
> intel_hpd_hotplug_enables(dev_priv, icp_ddi_hotplug_enables));
> }
>
> static void icp_tc_hpd_detection_setup(struct drm_i915_private *dev_priv)
> {
> intel_uncore_rmw(&dev_priv->uncore, SHOTPLUG_CTL_TC,
> - ICP_TC_HPD_ENABLE(HPD_PORT_TC1) |
> - ICP_TC_HPD_ENABLE(HPD_PORT_TC2) |
> - ICP_TC_HPD_ENABLE(HPD_PORT_TC3) |
> - ICP_TC_HPD_ENABLE(HPD_PORT_TC4) |
> - ICP_TC_HPD_ENABLE(HPD_PORT_TC5) |
> - ICP_TC_HPD_ENABLE(HPD_PORT_TC6),
> + icp_tc_hotplug_mask(HPD_PORT_TC1) |
> + icp_tc_hotplug_mask(HPD_PORT_TC2) |
> + icp_tc_hotplug_mask(HPD_PORT_TC3) |
> + icp_tc_hotplug_mask(HPD_PORT_TC4) |
> + icp_tc_hotplug_mask(HPD_PORT_TC5) |
> + icp_tc_hotplug_mask(HPD_PORT_TC6),
> intel_hpd_hotplug_enables(dev_priv, icp_tc_hotplug_enables));
> }
>
> @@ -2958,19 +2981,24 @@ static void icp_hpd_irq_setup(struct drm_i915_private *dev_priv)
> icp_tc_hpd_detection_setup(dev_priv);
> }
>
> +static u32 gen11_hotplug_mask(enum hpd_pin hpd_pin)
> +{
> + switch (hpd_pin) {
> + case HPD_PORT_TC1:
> + case HPD_PORT_TC2:
> + case HPD_PORT_TC3:
> + case HPD_PORT_TC4:
> + case HPD_PORT_TC5:
> + case HPD_PORT_TC6:
> + return GEN11_HOTPLUG_CTL_ENABLE(hpd_pin);
> + default:
> + return 0;
> + }
> +}
> +
> static u32 gen11_hotplug_enables(struct intel_encoder *encoder)
> {
> - switch (encoder->hpd_pin) {
> - case HPD_PORT_TC1:
> - case HPD_PORT_TC2:
> - case HPD_PORT_TC3:
> - case HPD_PORT_TC4:
> - case HPD_PORT_TC5:
> - case HPD_PORT_TC6:
> - return GEN11_HOTPLUG_CTL_ENABLE(encoder->hpd_pin);
> - default:
> - return 0;
> - }
> + return gen11_hotplug_mask(encoder->hpd_pin);
> }
>
> static void dg1_hpd_invert(struct drm_i915_private *i915)
> @@ -2991,24 +3019,24 @@ static void dg1_hpd_irq_setup(struct drm_i915_private *dev_priv)
> static void gen11_tc_hpd_detection_setup(struct drm_i915_private *dev_priv)
> {
> intel_uncore_rmw(&dev_priv->uncore, GEN11_TC_HOTPLUG_CTL,
> - GEN11_HOTPLUG_CTL_ENABLE(HPD_PORT_TC1) |
> - GEN11_HOTPLUG_CTL_ENABLE(HPD_PORT_TC2) |
> - GEN11_HOTPLUG_CTL_ENABLE(HPD_PORT_TC3) |
> - GEN11_HOTPLUG_CTL_ENABLE(HPD_PORT_TC4) |
> - GEN11_HOTPLUG_CTL_ENABLE(HPD_PORT_TC5) |
> - GEN11_HOTPLUG_CTL_ENABLE(HPD_PORT_TC6),
> + gen11_hotplug_mask(HPD_PORT_TC1) |
> + gen11_hotplug_mask(HPD_PORT_TC2) |
> + gen11_hotplug_mask(HPD_PORT_TC3) |
> + gen11_hotplug_mask(HPD_PORT_TC4) |
> + gen11_hotplug_mask(HPD_PORT_TC5) |
> + gen11_hotplug_mask(HPD_PORT_TC6),
> intel_hpd_hotplug_enables(dev_priv, gen11_hotplug_enables));
> }
>
> static void gen11_tbt_hpd_detection_setup(struct drm_i915_private *dev_priv)
> {
> intel_uncore_rmw(&dev_priv->uncore, GEN11_TBT_HOTPLUG_CTL,
> - GEN11_HOTPLUG_CTL_ENABLE(HPD_PORT_TC1) |
> - GEN11_HOTPLUG_CTL_ENABLE(HPD_PORT_TC2) |
> - GEN11_HOTPLUG_CTL_ENABLE(HPD_PORT_TC3) |
> - GEN11_HOTPLUG_CTL_ENABLE(HPD_PORT_TC4) |
> - GEN11_HOTPLUG_CTL_ENABLE(HPD_PORT_TC5) |
> - GEN11_HOTPLUG_CTL_ENABLE(HPD_PORT_TC6),
> + gen11_hotplug_mask(HPD_PORT_TC1) |
> + gen11_hotplug_mask(HPD_PORT_TC2) |
> + gen11_hotplug_mask(HPD_PORT_TC3) |
> + gen11_hotplug_mask(HPD_PORT_TC4) |
> + gen11_hotplug_mask(HPD_PORT_TC5) |
> + gen11_hotplug_mask(HPD_PORT_TC6),
> intel_hpd_hotplug_enables(dev_priv, gen11_hotplug_enables));
> }
>
> @@ -3030,9 +3058,9 @@ static void gen11_hpd_irq_setup(struct drm_i915_private *dev_priv)
> icp_hpd_irq_setup(dev_priv);
> }
>
> -static u32 spt_hotplug_enables(struct intel_encoder *encoder)
> +static u32 spt_hotplug_mask(enum hpd_pin hpd_pin)
> {
> - switch (encoder->hpd_pin) {
> + switch (hpd_pin) {
> case HPD_PORT_A:
> return PORTA_HOTPLUG_ENABLE;
> case HPD_PORT_B:
> @@ -3046,9 +3074,14 @@ static u32 spt_hotplug_enables(struct intel_encoder *encoder)
> }
> }
>
> -static u32 spt_hotplug2_enables(struct intel_encoder *encoder)
> +static u32 spt_hotplug_enables(struct intel_encoder *encoder)
> {
> - switch (encoder->hpd_pin) {
> + return spt_hotplug_mask(encoder->hpd_pin);
> +}
> +
> +static u32 spt_hotplug2_mask(enum hpd_pin hpd_pin)
> +{
> + switch (hpd_pin) {
> case HPD_PORT_E:
> return PORTE_HOTPLUG_ENABLE;
> default:
> @@ -3056,6 +3089,11 @@ static u32 spt_hotplug2_enables(struct intel_encoder *encoder)
> }
> }
>
> +static u32 spt_hotplug2_enables(struct intel_encoder *encoder)
> +{
> + return spt_hotplug2_mask(encoder->hpd_pin);
> +}
> +
> static void spt_hpd_detection_setup(struct drm_i915_private *dev_priv)
> {
> /* Display WA #1179 WaHardHangonHotPlug: cnp */
> @@ -3066,13 +3104,14 @@ static void spt_hpd_detection_setup(struct drm_i915_private *dev_priv)
>
> /* Enable digital hotplug on the PCH */
> intel_uncore_rmw(&dev_priv->uncore, PCH_PORT_HOTPLUG,
> - PORTA_HOTPLUG_ENABLE |
> - PORTB_HOTPLUG_ENABLE |
> - PORTC_HOTPLUG_ENABLE |
> - PORTD_HOTPLUG_ENABLE,
> + spt_hotplug_mask(HPD_PORT_A) |
> + spt_hotplug_mask(HPD_PORT_B) |
> + spt_hotplug_mask(HPD_PORT_C) |
> + spt_hotplug_mask(HPD_PORT_D),
> intel_hpd_hotplug_enables(dev_priv, spt_hotplug_enables));
>
> - intel_uncore_rmw(&dev_priv->uncore, PCH_PORT_HOTPLUG2, PORTE_HOTPLUG_ENABLE,
> + intel_uncore_rmw(&dev_priv->uncore, PCH_PORT_HOTPLUG2,
> + spt_hotplug2_mask(HPD_PORT_E),
> intel_hpd_hotplug_enables(dev_priv, spt_hotplug2_enables));
> }
>
> @@ -3091,6 +3130,17 @@ static void spt_hpd_irq_setup(struct drm_i915_private *dev_priv)
> spt_hpd_detection_setup(dev_priv);
> }
>
> +static u32 ilk_hotplug_mask(enum hpd_pin hpd_pin)
> +{
> + switch (hpd_pin) {
> + case HPD_PORT_A:
> + return DIGITAL_PORTA_HOTPLUG_ENABLE |
> + DIGITAL_PORTA_PULSE_DURATION_MASK;
> + default:
> + return 0;
> + }
> +}
> +
> static u32 ilk_hotplug_enables(struct intel_encoder *encoder)
> {
> switch (encoder->hpd_pin) {
> @@ -3110,7 +3160,7 @@ static void ilk_hpd_detection_setup(struct drm_i915_private *dev_priv)
> * The pulse duration bits are reserved on HSW+.
> */
> intel_uncore_rmw(&dev_priv->uncore, DIGITAL_PORT_HOTPLUG_CNTRL,
> - DIGITAL_PORTA_HOTPLUG_ENABLE | DIGITAL_PORTA_PULSE_DURATION_MASK,
> + ilk_hotplug_mask(HPD_PORT_A),
> intel_hpd_hotplug_enables(dev_priv, ilk_hotplug_enables));
> }
>
> @@ -3131,6 +3181,20 @@ static void ilk_hpd_irq_setup(struct drm_i915_private *dev_priv)
> ibx_hpd_irq_setup(dev_priv);
> }
>
> +static u32 bxt_hotplug_mask(enum hpd_pin hpd_pin)
> +{
> + switch (hpd_pin) {
> + case HPD_PORT_A:
> + return PORTA_HOTPLUG_ENABLE | BXT_DDIA_HPD_INVERT;
> + case HPD_PORT_B:
> + return PORTB_HOTPLUG_ENABLE | BXT_DDIB_HPD_INVERT;
> + case HPD_PORT_C:
> + return PORTC_HOTPLUG_ENABLE | BXT_DDIC_HPD_INVERT;
> + default:
> + return 0;
> + }
> +}
> +
> static u32 bxt_hotplug_enables(struct intel_encoder *encoder)
> {
> u32 hotplug;
> @@ -3159,10 +3223,9 @@ static u32 bxt_hotplug_enables(struct intel_encoder *encoder)
> static void bxt_hpd_detection_setup(struct drm_i915_private *dev_priv)
> {
> intel_uncore_rmw(&dev_priv->uncore, PCH_PORT_HOTPLUG,
> - PORTA_HOTPLUG_ENABLE |
> - PORTB_HOTPLUG_ENABLE |
> - PORTC_HOTPLUG_ENABLE |
> - BXT_DDI_HPD_INVERT_MASK,
> + bxt_hotplug_mask(HPD_PORT_A) |
> + bxt_hotplug_mask(HPD_PORT_B) |
> + bxt_hotplug_mask(HPD_PORT_C),
> intel_hpd_hotplug_enables(dev_priv, bxt_hotplug_enables));
> }
>
