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

drm/xe: Rename reg field to addr 



Rename the address field to "addr" rather than "reg" so it's easier to
understand what it is.

Reviewed-by: default avatarRodrigo Vivi <rodrigo.vivi@intel.com>
Link: https://lore.kernel.org/r/20230508225322.2692066-4-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 ce8bf5bd

drivers/gpu/drm/xe/regs/xe_reg_defs.h

+3 −3
Original line number Diff line number Diff line
@@ -18,8 +18,8 @@ 
struct xe_reg {

	union {

		struct {

			/** @reg: address */

			u32 reg:22;

			/** @addr: address */

			u32 addr:22;

			/**

			 * @masked: register is "masked", with upper 16bits used

			 * to identify the bits that are updated on the lower
@@ -73,7 +73,7 @@ struct xe_reg_mcr { 
 * object of the right type. However when initializing static const storage,

 * where a compound statement is not allowed, this can be used instead.

 */

#define XE_REG_INITIALIZER(r_, ...)    { .reg = r_, __VA_ARGS__ }

#define XE_REG_INITIALIZER(r_, ...)    { .addr = r_, __VA_ARGS__ }





/**

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

+1 −1
Original line number Diff line number Diff line
@@ -244,7 +244,7 @@ static void xe_rtp_process_tests(struct kunit *test) 
	xe_rtp_process(param->entries, reg_sr, &xe->gt[0], NULL);



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

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

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

			sr_entry = sre;



		count++;

drivers/gpu/drm/xe/xe_force_wake.c

+1 −1
Original line number Diff line number Diff line
@@ -129,7 +129,7 @@ static int domain_sleep_wait(struct xe_gt *gt, 
	for (tmp__ = (mask__); tmp__; tmp__ &= ~BIT(ffs(tmp__) - 1)) \

		for_each_if((domain__ = ((fw__)->domains + \

					 (ffs(tmp__) - 1))) && \

					 domain__->reg_ctl.reg)

					 domain__->reg_ctl.addr)



int xe_force_wake_get(struct xe_force_wake *fw,

		      enum xe_force_wake_domains domains)

drivers/gpu/drm/xe/xe_gt_mcr.c

+1 −1
Original line number Diff line number Diff line
@@ -398,7 +398,7 @@ static bool xe_gt_mcr_get_nonterminated_steering(struct xe_gt *gt, 
	 */

	drm_WARN(&gt_to_xe(gt)->drm, true,

		 "Did not find MCR register %#x in any MCR steering table\n",

		 reg.reg);

		 reg.addr);

	*group = 0;

	*instance = 0;

drivers/gpu/drm/xe/xe_guc.c

+1 −1
Original line number Diff line number Diff line
@@ -713,7 +713,7 @@ int xe_guc_mmio_send_recv(struct xe_guc *guc, const u32 *request, 
		response_buf[0] = header;



		for (i = 1; i < VF_SW_FLAG_COUNT; i++) {

			reply_reg.reg += i * sizeof(u32);

			reply_reg.addr += i * sizeof(u32);

			response_buf[i] = xe_mmio_read32(gt, reply_reg);

		}

	}