Merge tag 'drm-intel-gt-next-2023-08-04' of git://anongit.freedesktop.org/drm/drm...

[linux-block.git] / drivers / gpu / drm / i915 / gt / intel_gt_regs.h

diff --git a/drivers/gpu/drm/i915/gt/intel_gt_regs.h b/drivers/gpu/drm/i915/gt/intel_gt_regs.h
index d08c00d967abf7131f448d149bbf48a0e8e5376b..2cdfb2f713d02631d4001553f2ac89b828d320ea 100644 (file)
--- a/drivers/gpu/drm/i915/gt/intel_gt_regs.h
+++ b/drivers/gpu/drm/i915/gt/intel_gt_regs.h
@@ -7,7 +7,8 @@
 #define __INTEL_GT_REGS__
 
 #include "i915_reg_defs.h"
-#include "display/intel_display_reg_defs.h"    /* VLV_DISPLAY_BASE */
+
+#define VLV_GUNIT_BASE                 0x180000
 
 /*
  * The perf control registers are technically multicast registers, but the
@@ -1469,7 +1470,7 @@
 #define GEN12_RCU_MODE                         _MMIO(0x14800)
 #define   GEN12_RCU_MODE_CCS_ENABLE            REG_BIT(0)
 
-#define CHV_FUSE_GT                            _MMIO(VLV_DISPLAY_BASE + 0x2168)
+#define CHV_FUSE_GT                            _MMIO(VLV_GUNIT_BASE + 0x2168)
 #define   CHV_FGT_DISABLE_SS0                  (1 << 10)
 #define   CHV_FGT_DISABLE_SS1                  (1 << 11)
 #define   CHV_FGT_EU_DIS_SS0_R0_SHIFT          16