From: Lucas De Marchi Date: Sat, 25 Feb 2023 00:15:45 +0000 (-0800) Subject: drm/xe: Remove dependency on intel_mchbar_regs.h X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=5ec15f83117f2f89af39109c264c1fb0bbf8b5f0;p=linux.git drm/xe: Remove dependency on intel_mchbar_regs.h The only thing really needed is the base offset, MCHBAR_MIRROR_BASE_SNB. Remove the include and just define it inplace. Signed-off-by: Lucas De Marchi Reviewed-by: Rodrigo Vivi Signed-off-by: Rodrigo Vivi --- diff --git a/drivers/gpu/drm/xe/xe_guc_pc.c b/drivers/gpu/drm/xe/xe_guc_pc.c index d91dad8638efb..5a8d827ba7704 100644 --- a/drivers/gpu/drm/xe/xe_guc_pc.c +++ b/drivers/gpu/drm/xe/xe_guc_pc.c @@ -21,12 +21,12 @@ #include "xe_mmio.h" #include "xe_pcode.h" -#include "intel_mchbar_regs.h" +#define MCHBAR_MIRROR_BASE_SNB 0x140000 -/* For GEN6_RP_STATE_CAP.reg to be merged when the definition moves to Xe */ -#define RP0_MASK REG_GENMASK(7, 0) -#define RP1_MASK REG_GENMASK(15, 8) -#define RPN_MASK REG_GENMASK(23, 16) +#define GEN6_RP_STATE_CAP _MMIO(MCHBAR_MIRROR_BASE_SNB + 0x5998) +#define RP0_MASK REG_GENMASK(7, 0) +#define RP1_MASK REG_GENMASK(15, 8) +#define RPN_MASK REG_GENMASK(23, 16) #define GEN10_FREQ_INFO_REC _MMIO(MCHBAR_MIRROR_BASE_SNB + 0x5ef0) #define RPE_MASK REG_GENMASK(15, 8)