Commit 91042671 authored by Lucas De Marchi's avatar Lucas De Marchi Committed by Rodrigo Vivi
Browse files

drm/xe/rtp: Add "_sr" to entry/function names 



The xe_rtp_process() function and xe_rtp_entry depend on the
save-restore struct. In future it will be desired to process rtp rules,
regardless of adding them to a save-restore. Rename the struct and
function so the intent is clear and the name is freed for future uses.

Reviewed-by: default avatarMatt Roper <matthew.d.roper@intel.com>
Link: https://lore.kernel.org/r/20230526164358.86393-5-lucas.demarchi@intel.com


Signed-off-by: default avatarLucas De Marchi <lucas.demarchi@intel.com>
Signed-off-by: default avatarRodrigo Vivi <rodrigo.vivi@intel.com>
parent cc982f0c

drivers/gpu/drm/xe/tests/xe_rtp_test.c

+11 −11
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ struct rtp_test_case { 
	u32 expected_clr_bits;

	unsigned long expected_count;

	unsigned int expected_sr_errors;

	const struct xe_rtp_entry *entries;

	const struct xe_rtp_entry_sr *entries;

};



static bool match_yes(const struct xe_gt *gt, const struct xe_hw_engine *hwe)
@@ -57,7 +57,7 @@ static const struct rtp_test_case cases[] = { 
		.expected_clr_bits = REG_BIT(0) | REG_BIT(1),

		.expected_count = 1,

		/* Different bits on the same register: create a single entry */

		.entries = (const struct xe_rtp_entry[]) {

		.entries = (const struct xe_rtp_entry_sr[]) {

			{ XE_RTP_NAME("basic-1"),

			  XE_RTP_RULES(FUNC(match_yes)),

			  XE_RTP_ACTIONS(SET(REGULAR_REG1, REG_BIT(0)))
@@ -76,7 +76,7 @@ static const struct rtp_test_case cases[] = { 
		.expected_clr_bits = REG_BIT(0),

		.expected_count = 1,

		/* Don't coalesce second entry since rules don't match */

		.entries = (const struct xe_rtp_entry[]) {

		.entries = (const struct xe_rtp_entry_sr[]) {

			{ XE_RTP_NAME("basic-1"),

			  XE_RTP_RULES(FUNC(match_yes)),

			  XE_RTP_ACTIONS(SET(REGULAR_REG1, REG_BIT(0)))
@@ -95,7 +95,7 @@ static const struct rtp_test_case cases[] = { 
		.expected_clr_bits = REG_BIT(0),

		.expected_count = 1,

		/* Don't coalesce second entry due to one of the rules */

		.entries = (const struct xe_rtp_entry[]) {

		.entries = (const struct xe_rtp_entry_sr[]) {

			{ XE_RTP_NAME("basic-1"),

			  XE_RTP_RULES(FUNC(match_yes)),

			  XE_RTP_ACTIONS(SET(REGULAR_REG1, REG_BIT(0)))
@@ -114,7 +114,7 @@ static const struct rtp_test_case cases[] = { 
		.expected_clr_bits = REG_BIT(0),

		.expected_count = 2,

		/* Same bits on different registers are not coalesced */

		.entries = (const struct xe_rtp_entry[]) {

		.entries = (const struct xe_rtp_entry_sr[]) {

			{ XE_RTP_NAME("basic-1"),

			  XE_RTP_RULES(FUNC(match_yes)),

			  XE_RTP_ACTIONS(SET(REGULAR_REG1, REG_BIT(0)))
@@ -133,7 +133,7 @@ static const struct rtp_test_case cases[] = { 
		.expected_clr_bits = REG_BIT(1) | REG_BIT(0),

		.expected_count = 1,

		/* Check clr vs set actions on different bits */

		.entries = (const struct xe_rtp_entry[]) {

		.entries = (const struct xe_rtp_entry_sr[]) {

			{ XE_RTP_NAME("basic-1"),

			  XE_RTP_RULES(FUNC(match_yes)),

			  XE_RTP_ACTIONS(SET(REGULAR_REG1, REG_BIT(0)))
@@ -154,7 +154,7 @@ static const struct rtp_test_case cases[] = { 
		.expected_clr_bits = TEMP_MASK,

		.expected_count = 1,

		/* Check FIELD_SET works */

		.entries = (const struct xe_rtp_entry[]) {

		.entries = (const struct xe_rtp_entry_sr[]) {

			{ XE_RTP_NAME("basic-1"),

			  XE_RTP_RULES(FUNC(match_yes)),

			  XE_RTP_ACTIONS(FIELD_SET(REGULAR_REG1,
@@ -172,7 +172,7 @@ static const struct rtp_test_case cases[] = { 
		.expected_clr_bits = REG_BIT(0),

		.expected_count = 1,

		.expected_sr_errors = 1,

		.entries = (const struct xe_rtp_entry[]) {

		.entries = (const struct xe_rtp_entry_sr[]) {

			{ XE_RTP_NAME("basic-1"),

			  XE_RTP_RULES(FUNC(match_yes)),

			  XE_RTP_ACTIONS(SET(REGULAR_REG1, REG_BIT(0)))
@@ -192,7 +192,7 @@ static const struct rtp_test_case cases[] = { 
		.expected_clr_bits = REG_BIT(0),

		.expected_count = 1,

		.expected_sr_errors = 1,

		.entries = (const struct xe_rtp_entry[]) {

		.entries = (const struct xe_rtp_entry_sr[]) {

			{ XE_RTP_NAME("basic-1"),

			  XE_RTP_RULES(FUNC(match_yes)),

			  XE_RTP_ACTIONS(SET(REGULAR_REG1, REG_BIT(0)))
@@ -212,7 +212,7 @@ static const struct rtp_test_case cases[] = { 
		.expected_clr_bits = REG_BIT(0),

		.expected_count = 1,

		.expected_sr_errors = 2,

		.entries = (const struct xe_rtp_entry[]) {

		.entries = (const struct xe_rtp_entry_sr[]) {

			{ XE_RTP_NAME("basic-1"),

			  XE_RTP_RULES(FUNC(match_yes)),

			  XE_RTP_ACTIONS(SET(REGULAR_REG1, REG_BIT(0)))
@@ -242,7 +242,7 @@ static void xe_rtp_process_tests(struct kunit *test) 
	unsigned long idx, count = 0;



	xe_reg_sr_init(reg_sr, "xe_rtp_tests", xe);

	xe_rtp_process(&ctx, param->entries, reg_sr);

	xe_rtp_process_to_sr(&ctx, param->entries, reg_sr);



	xa_for_each(&reg_sr->xa, idx, sre) {

		if (idx == param->expected_reg.addr)

drivers/gpu/drm/xe/xe_hw_engine.c

+4 −4
Original line number Diff line number Diff line
@@ -282,7 +282,7 @@ xe_hw_engine_setup_default_lrc_state(struct xe_hw_engine *hwe) 
	u32 blit_cctl_val = REG_FIELD_PREP(BLIT_CCTL_DST_MOCS_MASK, mocs_write_idx) |

			    REG_FIELD_PREP(BLIT_CCTL_SRC_MOCS_MASK, mocs_read_idx);

	struct xe_rtp_process_ctx ctx = XE_RTP_PROCESS_CTX_INITIALIZER(hwe);

	const struct xe_rtp_entry lrc_was[] = {

	const struct xe_rtp_entry_sr lrc_was[] = {

		/*

		 * Some blitter commands do not have a field for MOCS, those

		 * commands will use MOCS index pointed by BLIT_CCTL.
@@ -300,7 +300,7 @@ xe_hw_engine_setup_default_lrc_state(struct xe_hw_engine *hwe) 
		{}

	};



	xe_rtp_process(&ctx, lrc_was, &hwe->reg_lrc);

	xe_rtp_process_to_sr(&ctx, lrc_was, &hwe->reg_lrc);

}



static void
@@ -313,7 +313,7 @@ hw_engine_setup_default_state(struct xe_hw_engine *hwe) 
	u32 ring_cmd_cctl_val = REG_FIELD_PREP(CMD_CCTL_WRITE_OVERRIDE_MASK, mocs_write_idx) |

			        REG_FIELD_PREP(CMD_CCTL_READ_OVERRIDE_MASK, mocs_read_idx);

	struct xe_rtp_process_ctx ctx = XE_RTP_PROCESS_CTX_INITIALIZER(hwe);

	const struct xe_rtp_entry engine_entries[] = {

	const struct xe_rtp_entry_sr engine_entries[] = {

		/*

		 * RING_CMD_CCTL specifies the default MOCS entry that will be

		 * used by the command streamer when executing commands that
@@ -334,7 +334,7 @@ hw_engine_setup_default_state(struct xe_hw_engine *hwe) 
		{}

	};



	xe_rtp_process(&ctx, engine_entries, &hwe->reg_sr);

	xe_rtp_process_to_sr(&ctx, engine_entries, &hwe->reg_sr);

}



static void hw_engine_init_early(struct xe_gt *gt, struct xe_hw_engine *hwe,

drivers/gpu/drm/xe/xe_reg_whitelist.c

+2 −2
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ static bool match_not_render(const struct xe_gt *gt, 
	return hwe->class != XE_ENGINE_CLASS_RENDER;

}



static const struct xe_rtp_entry register_whitelist[] = {

static const struct xe_rtp_entry_sr register_whitelist[] = {

	{ XE_RTP_NAME("WaAllowPMDepthAndInvocationCountAccessFromUMD, 1408556865"),

	  XE_RTP_RULES(GRAPHICS_VERSION_RANGE(1200, 1210), ENGINE_CLASS(RENDER)),

	  XE_RTP_ACTIONS(WHITELIST(PS_INVOCATION_COUNT,
@@ -65,7 +65,7 @@ void xe_reg_whitelist_process_engine(struct xe_hw_engine *hwe) 
{

	struct xe_rtp_process_ctx ctx = XE_RTP_PROCESS_CTX_INITIALIZER(hwe);



	xe_rtp_process(&ctx, register_whitelist, &hwe->reg_whitelist);

	xe_rtp_process_to_sr(&ctx, register_whitelist, &hwe->reg_whitelist);

}



/**

drivers/gpu/drm/xe/xe_rtp.c

+14 −12
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ 
static bool rule_matches(const struct xe_device *xe,

			 struct xe_gt *gt,

			 struct xe_hw_engine *hwe,

			 const struct xe_rtp_entry *entry)

			 const struct xe_rtp_entry_sr *entry)

{

	const struct xe_rtp_rule *r;

	unsigned int i;
@@ -112,7 +112,7 @@ static void rtp_add_sr_entry(const struct xe_rtp_action *action, 
	xe_reg_sr_add(sr, &sr_entry);

}



static void rtp_process_one(const struct xe_rtp_entry *entry,

static void rtp_process_one_sr(const struct xe_rtp_entry_sr *entry,

			       struct xe_device *xe, struct xe_gt *gt,

			       struct xe_hw_engine *hwe, struct xe_reg_sr *sr)

{
@@ -154,10 +154,11 @@ static void rtp_get_context(struct xe_rtp_process_ctx *ctx, 
}



/**

 * xe_rtp_process - Process all rtp @entries, adding the matching ones to @sr

 * xe_rtp_process_to_sr - Process all rtp @entries, adding the matching ones to

 *                        the save-restore argument.

 * @ctx: The context for processing the table, with one of device, gt or hwe

 * @entries: Table with RTP definitions

 * @sr: Where to add an entry to with the values for matching. This can be

 * @sr: Save-restore struct where matching rules execute the action. This can be

 *      viewed as the "coalesced view" of multiple the tables. The bits for each

 *      register set are expected not to collide with previously added entries

 *
@@ -165,10 +166,11 @@ static void rtp_get_context(struct xe_rtp_process_ctx *ctx, 
 * entries with matching rules to @sr. If @hwe is not NULL, its mmio_base is

 * used to calculate the right register offset

 */

void xe_rtp_process(struct xe_rtp_process_ctx *ctx,

		    const struct xe_rtp_entry *entries, struct xe_reg_sr *sr)

void xe_rtp_process_to_sr(struct xe_rtp_process_ctx *ctx,

			  const struct xe_rtp_entry_sr *entries,

			  struct xe_reg_sr *sr)

{

	const struct xe_rtp_entry *entry;

	const struct xe_rtp_entry_sr *entry;

	struct xe_hw_engine *hwe = NULL;

	struct xe_gt *gt = NULL;

	struct xe_device *xe = NULL;
@@ -181,13 +183,13 @@ void xe_rtp_process(struct xe_rtp_process_ctx *ctx, 
			enum xe_hw_engine_id id;



			for_each_hw_engine(each_hwe, gt, id)

				rtp_process_one(entry, xe, gt, each_hwe, sr);

				rtp_process_one_sr(entry, xe, gt, each_hwe, sr);

		} else {

			rtp_process_one(entry, xe, gt, hwe, sr);

			rtp_process_one_sr(entry, xe, gt, hwe, sr);

		}

	}

}

EXPORT_SYMBOL_IF_KUNIT(xe_rtp_process);

EXPORT_SYMBOL_IF_KUNIT(xe_rtp_process_to_sr);



bool xe_rtp_match_even_instance(const struct xe_gt *gt,

				const struct xe_hw_engine *hwe)

drivers/gpu/drm/xe/xe_rtp.h

+10 −10
Original line number Diff line number Diff line
@@ -261,7 +261,7 @@ struct xe_reg_sr; 
#define XE_RTP_NAME(s_)	.name = (s_)



/**

 * XE_RTP_ENTRY_FLAG - Helper to add multiple flags to a struct xe_rtp_entry

 * XE_RTP_ENTRY_FLAG - Helper to add multiple flags to a struct xe_rtp_entry_sr

 * @...: Entry flags, without the ``XE_RTP_ENTRY_FLAG_`` prefix

 *

 * Helper to automatically add a ``XE_RTP_ENTRY_FLAG_`` prefix to the flags
@@ -269,7 +269,7 @@ struct xe_reg_sr; 
 *

 * .. code-block:: c

 *

 *	const struct xe_rtp_entry wa_entries[] = {

 *	const struct xe_rtp_entry_sr wa_entries[] = {

 *		...

 *		{ XE_RTP_NAME("test-entry"),

 *		  ...
@@ -291,7 +291,7 @@ struct xe_reg_sr; 
 *

 * .. code-block:: c

 *

 *	const struct xe_rtp_entry wa_entries[] = {

 *	const struct xe_rtp_entry_sr wa_entries[] = {

 *		...

 *		{ XE_RTP_NAME("test-entry"),

 *		  ...
@@ -305,7 +305,7 @@ struct xe_reg_sr; 
	.flags = (XE_RTP_PASTE_FOREACH(ACTION_FLAG_, BITWISE_OR, (__VA_ARGS__)))



/**

 * XE_RTP_RULES - Helper to set multiple rules to a struct xe_rtp_entry entry

 * 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
@@ -314,7 +314,7 @@ struct xe_reg_sr; 
 *

 * .. code-block:: c

 *

 *	const struct xe_rtp_entry wa_entries[] = {

 *	const struct xe_rtp_entry_sr wa_entries[] = {

 *		...

 *		{ XE_RTP_NAME("test-entry"),

 *		  XE_RTP_RULES(SUBPLATFORM(DG2, G10), STEP(A0, B0)),
@@ -330,7 +330,7 @@ struct xe_reg_sr; 
	}



/**

 * XE_RTP_ACTIONS - Helper to set multiple actions to a struct xe_rtp_entry

 * XE_RTP_ACTIONS - Helper to set multiple actions to a struct xe_rtp_entry_sr

 * @...: Actions to be taken

 *

 * At least one rule is needed and up to 4 are supported. Multiple rules are
@@ -339,7 +339,7 @@ struct xe_reg_sr; 
 *

 * .. code-block:: c

 *

 *	const struct xe_rtp_entry wa_entries[] = {

 *	const struct xe_rtp_entry_sr wa_entries[] = {

 *		...

 *		{ XE_RTP_NAME("test-entry"),

 *		  XE_RTP_RULES(...),
@@ -359,8 +359,8 @@ struct xe_reg_sr; 
	struct xe_hw_engine *:	(struct xe_rtp_process_ctx){ { (void *)(arg__) }, XE_RTP_PROCESS_TYPE_ENGINE },	\

	struct xe_gt *:		(struct xe_rtp_process_ctx){ { (void *)(arg__) }, XE_RTP_PROCESS_TYPE_GT })



void xe_rtp_process(struct xe_rtp_process_ctx *ctx,

		    const struct xe_rtp_entry *entries,

void xe_rtp_process_to_sr(struct xe_rtp_process_ctx *ctx,

			  const struct xe_rtp_entry_sr *entries,

			  struct xe_reg_sr *sr);



/* Match functions to be used with XE_RTP_MATCH_FUNC */