Commit cf03825b authored by Niranjana Vishwanathapura's avatar Niranjana Vishwanathapura Committed by Lucas De Marchi
Browse files

drm/xe: Use FIELD_PREP for lrc descriptor 



Use FIELD_PREP for setting lrc descriptor fields instead
of shifting values to fields.

v2: Use ULL macro variants
v3: Do not use FIELD_PREP for 1-bit values

Signed-off-by: default avatarNiranjana Vishwanathapura <niranjana.vishwanathapura@intel.com>
Reviewed-by: default avatarLucas De Marchi <lucas.demarchi@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20240322191455.7613-1-niranjana.vishwanathapura@intel.com


Signed-off-by: default avatarLucas De Marchi <lucas.demarchi@intel.com>
parent 008aa86a

drivers/gpu/drm/xe/xe_lrc.c

+8 −8
Original line number Diff line number Diff line
@@ -26,13 +26,13 @@ 
#include "xe_sriov.h"

#include "xe_vm.h"



#define LRC_VALID				(1 << 0)

#define LRC_PRIVILEGE				(1 << 8)

#define LRC_ADDRESSING_MODE_SHIFT		3

#define LRC_VALID				BIT_ULL(0)

#define LRC_PRIVILEGE				BIT_ULL(8)

#define LRC_ADDRESSING_MODE			GENMASK_ULL(4, 3)

#define LRC_LEGACY_64B_CONTEXT			3



#define ENGINE_CLASS_SHIFT			61

#define ENGINE_INSTANCE_SHIFT			48

#define LRC_ENGINE_CLASS			GENMASK_ULL(63, 61)

#define LRC_ENGINE_INSTANCE			GENMASK_ULL(53, 48)



struct xe_lrc_snapshot {

	struct xe_bo *lrc_bo;
@@ -796,7 +796,7 @@ int xe_lrc_init(struct xe_lrc *lrc, struct xe_hw_engine *hwe, 
		xe_lrc_write_ctx_reg(lrc, PVC_CTX_ASID, vm->usm.asid);



	lrc->desc = LRC_VALID;

	lrc->desc |= LRC_LEGACY_64B_CONTEXT << LRC_ADDRESSING_MODE_SHIFT;

	lrc->desc |= FIELD_PREP(LRC_ADDRESSING_MODE, LRC_LEGACY_64B_CONTEXT);

	/* TODO: Priority */



	/* While this appears to have something about privileged batches or
@@ -806,8 +806,8 @@ int xe_lrc_init(struct xe_lrc *lrc, struct xe_hw_engine *hwe, 
		lrc->desc |= LRC_PRIVILEGE;



	if (GRAPHICS_VERx100(xe) < 1250) {

		lrc->desc |= (u64)hwe->instance << ENGINE_INSTANCE_SHIFT;

		lrc->desc |= (u64)hwe->class << ENGINE_CLASS_SHIFT;

		lrc->desc |= FIELD_PREP(LRC_ENGINE_INSTANCE, hwe->instance);

		lrc->desc |= FIELD_PREP(LRC_ENGINE_CLASS, hwe->class);

	}



	arb_enable = MI_ARB_ON_OFF | MI_ARB_ENABLE;