[PATCH 5/5] drm/i915: remove WA_SET_FIELD_MASKED()

[Chris Wilson]

Quoting Lucas De Marchi (2020-12-04 19:25:03)
> Remove the last macro and implement it as a function like the rest of
> the operations that don't assume there is a `wal` list, but rather
> receive it as argument.
> 
> Signed-off-by: Lucas De Marchi <lucas.demarchi at intel.com>
> ---
>  drivers/gpu/drm/i915/gt/intel_workarounds.c | 20 ++++++++++++--------
>  1 file changed, 12 insertions(+), 8 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/gt/intel_workarounds.c b/drivers/gpu/drm/i915/gt/intel_workarounds.c
> index 337c16846d47..3e8b3b18e71c 100644
> --- a/drivers/gpu/drm/i915/gt/intel_workarounds.c
> +++ b/drivers/gpu/drm/i915/gt/intel_workarounds.c
> @@ -229,8 +229,12 @@ wa_masked_dis(struct i915_wa_list *wal, i915_reg_t reg, u32 val)
>         wa_add(wal, reg, 0, _MASKED_BIT_DISABLE(val), val);
>  }
>  
> -#define WA_SET_FIELD_MASKED(addr, mask, value) \
> -       wa_write_masked_or(wal, (addr), 0, _MASKED_FIELD((mask), (value)))
> +static void
> +wa_masked_field_set(struct i915_wa_list *wal, i915_reg_t reg,
> +                   u32 mask, u32 val)
> +{
> +       wa_write_masked_or(wal, reg, 0, _MASKED_FIELD(mask,val));

Spare a ' ' for an old man? (mask, val)
Reviewed-by: Chris Wilson <chris at chris-wilson.co.uk>
-Chris