[Intel-xe] [PATCH 05/19] drm/xe/rtp: Move match function from wa to rtp

[Matt Roper]

On Tue, Mar 07, 2023 at 01:24:32AM -0800, Lucas De Marchi wrote:
> Match functions are generally useful for other parts of the code (e.g.
> xe_tuning.c). Move and rename the single one available to create a place
> where similar match functions can be added.
> 
> Signed-off-by: Lucas De Marchi <lucas.demarchi at intel.com>

Reviewed-by: Matt Roper <matthew.d.roper at intel.com>

> ---
>  drivers/gpu/drm/xe/xe_rtp.c |  6 ++++++
>  drivers/gpu/drm/xe/xe_rtp.h | 12 ++++++++++++
>  drivers/gpu/drm/xe/xe_wa.c  |  8 +-------
>  3 files changed, 19 insertions(+), 7 deletions(-)
> 
> diff --git a/drivers/gpu/drm/xe/xe_rtp.c b/drivers/gpu/drm/xe/xe_rtp.c
> index 5b1316b588d8..c04eca290ef0 100644
> --- a/drivers/gpu/drm/xe/xe_rtp.c
> +++ b/drivers/gpu/drm/xe/xe_rtp.c
> @@ -154,3 +154,9 @@ void xe_rtp_process(const struct xe_rtp_entry *entries, struct xe_reg_sr *sr,
>  		}
>  	}
>  }
> +
> +bool xe_rtp_match_even_instance(const struct xe_gt *gt,
> +				const struct xe_hw_engine *hwe)
> +{
> +	return hwe->instance % 2 == 0;
> +}
> diff --git a/drivers/gpu/drm/xe/xe_rtp.h b/drivers/gpu/drm/xe/xe_rtp.h
> index bd44fd8bbe05..9bd2532442ed 100644
> --- a/drivers/gpu/drm/xe/xe_rtp.h
> +++ b/drivers/gpu/drm/xe/xe_rtp.h
> @@ -397,4 +397,16 @@ struct xe_reg_sr;
>  void xe_rtp_process(const struct xe_rtp_entry *entries, struct xe_reg_sr *sr,
>  		    struct xe_gt *gt, struct xe_hw_engine *hwe);
>  
> +/* Match functions to be used with XE_RTP_MATCH_FUNC */
> +
> +/**
> + * xe_rtp_match_even_instance - Match if engine instance is even
> + * @gt: GT structure
> + * @hwe: Engine instance
> + *
> + * Returns: true if engine instance is even, false otherwise
> + */
> +bool xe_rtp_match_even_instance(const struct xe_gt *gt,
> +				const struct xe_hw_engine *hwe);
> +
>  #endif
> diff --git a/drivers/gpu/drm/xe/xe_wa.c b/drivers/gpu/drm/xe/xe_wa.c
> index 03c5b01a14e4..67539f9d70b4 100644
> --- a/drivers/gpu/drm/xe/xe_wa.c
> +++ b/drivers/gpu/drm/xe/xe_wa.c
> @@ -91,17 +91,11 @@
>  #define _MMIO(x)	_XE_RTP_REG(x)
>  #define MCR_REG(x)	_XE_RTP_MCR_REG(x)
>  
> -static bool match_14011060649(const struct xe_gt *gt,
> -			      const struct xe_hw_engine *hwe)
> -{
> -	return hwe->instance % 2 == 0;
> -}
> -
>  static const struct xe_rtp_entry gt_was[] = {
>  	{ XE_RTP_NAME("14011060649"),
>  	  XE_RTP_RULES(MEDIA_VERSION_RANGE(1200, 1255),
>  		       ENGINE_CLASS(VIDEO_DECODE),
> -		       FUNC(match_14011060649)),
> +		       FUNC(xe_rtp_match_even_instance)),
>  	  XE_RTP_ACTIONS(SET(VDBOX_CGCTL3F10(0), IECPUNIT_CLKGATE_DIS)),
>  	  XE_RTP_ENTRY_FLAG(FOREACH_ENGINE),
>  	},
> -- 
> 2.39.0
> 

-- 
Matt Roper
Graphics Software Engineer
Linux GPU Platform Enablement
Intel Corporation