From e12ef39272a3690bc779e2d4d812e36c0e7d45f8 Mon Sep 17 00:00:00 2001 From: Lucas De Marchi Date: Fri, 24 Feb 2023 16:15:44 -0800 Subject: [PATCH] drm/xe/guc_pc: Move gt register to the proper place Move a few defines from xe_guc_pc.c to the right register, now that there is one: xe_gt_regs.h. Signed-off-by: Lucas De Marchi Reviewed-by: Rodrigo Vivi Signed-off-by: Rodrigo Vivi --- drivers/gpu/drm/xe/regs/xe_gt_regs.h | 2 ++ drivers/gpu/drm/xe/xe_guc_pc.c | 6 ------ 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/drivers/gpu/drm/xe/regs/xe_gt_regs.h b/drivers/gpu/drm/xe/regs/xe_gt_regs.h index 3eb92c975085..df2677c9c9f6 100644 --- a/drivers/gpu/drm/xe/regs/xe_gt_regs.h +++ b/drivers/gpu/drm/xe/regs/xe_gt_regs.h @@ -187,6 +187,7 @@ #define DFR_DISABLE (1 << 9) #define GEN6_RPNSWREQ _MMIO(0xa008) +#define REQ_RATIO_MASK REG_GENMASK(31, 23) #define GEN6_RC_CONTROL _MMIO(0xa090) #define GEN6_RC_STATE _MMIO(0xa094) @@ -243,6 +244,7 @@ #define FORCEWAKE_KERNEL_FALLBACK BIT(15) #define GEN6_GT_CORE_STATUS _MMIO(0x138060) +#define RCN_MASK REG_GENMASK(2, 0) #define GEN6_RC0 0 #define GEN6_RC6 3 diff --git a/drivers/gpu/drm/xe/xe_guc_pc.c b/drivers/gpu/drm/xe/xe_guc_pc.c index acaba5c375e5..d91dad8638ef 100644 --- a/drivers/gpu/drm/xe/xe_guc_pc.c +++ b/drivers/gpu/drm/xe/xe_guc_pc.c @@ -31,12 +31,6 @@ #define GEN10_FREQ_INFO_REC _MMIO(MCHBAR_MIRROR_BASE_SNB + 0x5ef0) #define RPE_MASK REG_GENMASK(15, 8) -/* For GEN6_RPNSWREQ.reg to be merged when the definition moves to Xe */ -#define REQ_RATIO_MASK REG_GENMASK(31, 23) - -/* For GEN6_GT_CORE_STATUS.reg to be merged when the definition moves to Xe */ -#define RCN_MASK REG_GENMASK(2, 0) - #define GEN12_RPSTAT1 _MMIO(0x1381b4) #define GEN12_CAGF_MASK REG_GENMASK(19, 11)