[PATCH 3/5] drm/xe/rtp: Expand max rules/actions per entry

[Matt Roper]

On Mon, Jun 17, 2024 at 11:25:16AM -0700, Lucas De Marchi wrote:
> Having at most 4 rules per entry is already reaching the maximum.
> Expand it to 6 to allow for more room. With the addition of OR
> condition for rules, this will very soon not be sufficient.
> 
> 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.h         | 4 ++--
>  drivers/gpu/drm/xe/xe_rtp_helpers.h | 2 ++
>  2 files changed, 4 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/gpu/drm/xe/xe_rtp.h b/drivers/gpu/drm/xe/xe_rtp.h
> index 5a6b112a8be6..bd5b5ba0fb31 100644
> --- a/drivers/gpu/drm/xe/xe_rtp.h
> +++ b/drivers/gpu/drm/xe/xe_rtp.h
> @@ -346,7 +346,7 @@ struct xe_reg_sr;
>   * XE_RTP_RULES - Helper to set multiple rules to a struct xe_rtp_entry_sr entry
>   * @...: Rules
>   *
> - * At least one rule is needed and up to 4 are supported. Multiple rules are
> + * At least one rule is needed and up to 6 are supported. Multiple rules are
>   * AND'ed together, i.e. all the rules must evaluate to true for the entry to
>   * be processed. See XE_RTP_MATCH_* for the possible match rules. Example:
>   *
> @@ -371,7 +371,7 @@ struct xe_reg_sr;
>   * XE_RTP_ACTIONS - Helper to set multiple actions to a struct xe_rtp_entry_sr
>   * @...: Actions to be taken
>   *
> - * At least one action is needed and up to 4 are supported. See XE_RTP_ACTION_*
> + * At least one action is needed and up to 6 are supported. See XE_RTP_ACTION_*
>   * for the possible actions. Example:
>   *
>   * .. code-block:: c
> diff --git a/drivers/gpu/drm/xe/xe_rtp_helpers.h b/drivers/gpu/drm/xe/xe_rtp_helpers.h
> index 7735f217ba71..c59e40fd7fff 100644
> --- a/drivers/gpu/drm/xe/xe_rtp_helpers.h
> +++ b/drivers/gpu/drm/xe/xe_rtp_helpers.h
> @@ -58,6 +58,8 @@
>  #define XE_RTP_PASTE_2(prefix_, sep_, args_) _XE_RTP_CONCAT(prefix_, FIRST_ARG args_) __XE_RTP_PASTE_SEP_ ## sep_ XE_RTP_PASTE_1(prefix_, sep_, _XE_TUPLE_TAIL args_)
>  #define XE_RTP_PASTE_3(prefix_, sep_, args_) _XE_RTP_CONCAT(prefix_, FIRST_ARG args_) __XE_RTP_PASTE_SEP_ ## sep_ XE_RTP_PASTE_2(prefix_, sep_, _XE_TUPLE_TAIL args_)
>  #define XE_RTP_PASTE_4(prefix_, sep_, args_) _XE_RTP_CONCAT(prefix_, FIRST_ARG args_) __XE_RTP_PASTE_SEP_ ## sep_ XE_RTP_PASTE_3(prefix_, sep_, _XE_TUPLE_TAIL args_)
> +#define XE_RTP_PASTE_5(prefix_, sep_, args_) _XE_RTP_CONCAT(prefix_, FIRST_ARG args_) __XE_RTP_PASTE_SEP_ ## sep_ XE_RTP_PASTE_4(prefix_, sep_, _XE_TUPLE_TAIL args_)
> +#define XE_RTP_PASTE_6(prefix_, sep_, args_) _XE_RTP_CONCAT(prefix_, FIRST_ARG args_) __XE_RTP_PASTE_SEP_ ## sep_ XE_RTP_PASTE_5(prefix_, sep_, _XE_TUPLE_TAIL args_)
>  
>  /*
>   * XE_RTP_DROP_CAST - Drop cast to convert a compound statement to a initializer
> -- 
> 2.43.0
> 

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