Re: [PATCH v2 15/19] drm/i915: Rename 'tmp_mask'

[Lucas De Marchi <lucas.demarchi@xxxxxxxxx>]

On Fri, Oct 23, 2020 at 04:34:16PM +0300, Ville Syrjälä wrote:
> From: Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx>
>
> Replace this silly tmp_mask with hotplug_trigger/te_trigger
> where appropriate.
>
> Signed-off-by: Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx>


Reviewed-by: Lucas De Marchi <lucas.demarchi@xxxxxxxxx>

Lucas De Marchi
> ---
> drivers/gpu/drm/i915/i915_irq.c | 22 ++++++++++++----------
> 1 file changed, 12 insertions(+), 10 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c
> index b1f21502b78b..be69c129dd5a 100644
> --- a/drivers/gpu/drm/i915/i915_irq.c
> +++ b/drivers/gpu/drm/i915/i915_irq.c
> @@ -2371,7 +2371,6 @@ gen8_de_irq_handler(struct drm_i915_private *dev_priv, u32 master_ctl)
> 	if (master_ctl & GEN8_DE_PORT_IRQ) {
> 		iir = I915_READ(GEN8_DE_PORT_IIR);
> 		if (iir) {
> -			u32 tmp_mask;
> 			bool found = false;
>
> 			I915_WRITE(GEN8_DE_PORT_IIR, iir);
> @@ -2383,15 +2382,17 @@ gen8_de_irq_handler(struct drm_i915_private *dev_priv, u32 master_ctl)
> 			}
>
> 			if (IS_GEN9_LP(dev_priv)) {
> -				tmp_mask = iir & BXT_DE_PORT_HOTPLUG_MASK;
> -				if (tmp_mask) {
> -					bxt_hpd_irq_handler(dev_priv, tmp_mask);
> +				u32 hotplug_trigger = iir & BXT_DE_PORT_HOTPLUG_MASK;
> +
> +				if (hotplug_trigger) {
> +					bxt_hpd_irq_handler(dev_priv, hotplug_trigger);
> 					found = true;
> 				}
> 			} else if (IS_BROADWELL(dev_priv)) {
> -				tmp_mask = iir & BDW_DE_PORT_HOTPLUG_MASK;
> -				if (tmp_mask) {
> -					ilk_hpd_irq_handler(dev_priv, tmp_mask);
> +				u32 hotplug_trigger = iir & BDW_DE_PORT_HOTPLUG_MASK;
> +
> +				if (hotplug_trigger) {
> +					ilk_hpd_irq_handler(dev_priv, hotplug_trigger);
> 					found = true;
> 				}
> 			}
> @@ -2402,9 +2403,10 @@ gen8_de_irq_handler(struct drm_i915_private *dev_priv, u32 master_ctl)
> 			}
>
> 			if (INTEL_GEN(dev_priv) >= 11) {
> -				tmp_mask = iir & (DSI0_TE | DSI1_TE);
> -				if (tmp_mask) {
> -					gen11_dsi_te_interrupt_handler(dev_priv, tmp_mask);
> +				u32 te_trigger = iir & (DSI0_TE | DSI1_TE);
> +
> +				if (te_trigger) {
> +					gen11_dsi_te_interrupt_handler(dev_priv, te_trigger);
> 					found = true;
> 				}
> 			}
> --
> 2.26.2
>
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@xxxxxxxxxxxxxxxxxxxxx
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx
_______________________________________________
Intel-gfx mailing list
Intel-gfx@xxxxxxxxxxxxxxxxxxxxx
https://lists.freedesktop.org/mailman/listinfo/intel-gfx