Commit 512660cd authored by Lucas De Marchi's avatar Lucas De Marchi Committed by Matt Roper
Browse files

drm/xe/rtp: Expand max rules/actions per entry 



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.

Reviewed-by: default avatarMatt Roper <matthew.d.roper@intel.com>
Signed-off-by: default avatarLucas De Marchi <lucas.demarchi@intel.com>
Signed-off-by: default avatarMatt Roper <matthew.d.roper@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20240618050044.324454-3-lucas.demarchi@intel.com
parent 60454736

drivers/gpu/drm/xe/xe_rtp.h

+2 −2
Original line number Diff line number Diff line
@@ -325,7 +325,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:

 *
@@ -350,7 +350,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

drivers/gpu/drm/xe/xe_rtp_helpers.h

+2 −0
Original line number Diff line number Diff line
@@ -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