drm/xe: Remove dependency on intel_gt_regs.h
authorLucas De Marchi <lucas.demarchi@intel.com>
Sat, 25 Feb 2023 00:15:40 +0000 (16:15 -0800)
committerRodrigo Vivi <rodrigo.vivi@intel.com>
Tue, 19 Dec 2023 23:29:21 +0000 (18:29 -0500)
Create regs/xe_gt_regs.h file with all the registers and bit
definitions used by the xe driver. Eventually the registers may be
defined in a different way and since xe doesn't supported below gen12,
the number of registers touched is much smaller, so create a new header.

The definitions themselves are direct copy from the
gt/intel_gt_regs.h file, just sorting the registers by address.
Cleaning those up and adhering to a common coding style is left for
later.

v2: Make the change to MCR_REG location in a separate patch to go
    through the i915 branch  (Matt Roper / Rodrigo)

Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com>
Reviewed-by: Matt Roper <matthew.d.roper@intel.com>
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
20 files changed:
drivers/gpu/drm/xe/regs/xe_gt_regs.h [new file with mode: 0644]
drivers/gpu/drm/xe/xe_execlist.c
drivers/gpu/drm/xe/xe_force_wake.c
drivers/gpu/drm/xe/xe_ggtt.c
drivers/gpu/drm/xe/xe_gt.c
drivers/gpu/drm/xe/xe_gt_clock.c
drivers/gpu/drm/xe/xe_gt_mcr.c
drivers/gpu/drm/xe/xe_guc.c
drivers/gpu/drm/xe/xe_guc_ads.c
drivers/gpu/drm/xe/xe_guc_pc.c
drivers/gpu/drm/xe/xe_hw_engine.c
drivers/gpu/drm/xe/xe_irq.c
drivers/gpu/drm/xe/xe_lrc.c
drivers/gpu/drm/xe/xe_mmio.c
drivers/gpu/drm/xe/xe_mocs.c
drivers/gpu/drm/xe/xe_reg_sr.c
drivers/gpu/drm/xe/xe_reg_whitelist.c
drivers/gpu/drm/xe/xe_ring_ops.c
drivers/gpu/drm/xe/xe_tuning.c
drivers/gpu/drm/xe/xe_wa.c

diff --git a/drivers/gpu/drm/xe/regs/xe_gt_regs.h b/drivers/gpu/drm/xe/regs/xe_gt_regs.h
new file mode 100644 (file)
index 0000000..3eb92c9
--- /dev/null
@@ -0,0 +1,288 @@
+/* SPDX-License-Identifier: MIT */
+/*
+ * Copyright © 2023 Intel Corporation
+ */
+
+#ifndef _XE_GT_REGS_H_
+#define _XE_GT_REGS_H_
+
+#include "i915_reg_defs.h"
+
+/* RPM unit config (Gen8+) */
+#define RPM_CONFIG0                            _MMIO(0xd00)
+#define   GEN11_RPM_CONFIG0_CRYSTAL_CLOCK_FREQ_SHIFT   3
+#define   GEN11_RPM_CONFIG0_CRYSTAL_CLOCK_FREQ_MASK    (0x7 << GEN11_RPM_CONFIG0_CRYSTAL_CLOCK_FREQ_SHIFT)
+#define   GEN11_RPM_CONFIG0_CRYSTAL_CLOCK_FREQ_24_MHZ  0
+#define   GEN11_RPM_CONFIG0_CRYSTAL_CLOCK_FREQ_19_2_MHZ        1
+#define   GEN11_RPM_CONFIG0_CRYSTAL_CLOCK_FREQ_38_4_MHZ        2
+#define   GEN11_RPM_CONFIG0_CRYSTAL_CLOCK_FREQ_25_MHZ  3
+#define   GEN10_RPM_CONFIG0_CTC_SHIFT_PARAMETER_SHIFT  1
+#define   GEN10_RPM_CONFIG0_CTC_SHIFT_PARAMETER_MASK   (0x3 << GEN10_RPM_CONFIG0_CTC_SHIFT_PARAMETER_SHIFT)
+
+#define FORCEWAKE_ACK_MEDIA_VDBOX_GEN11(n)     _MMIO(0xd50 + (n) * 4)
+#define FORCEWAKE_ACK_MEDIA_VEBOX_GEN11(n)     _MMIO(0xd70 + (n) * 4)
+#define FORCEWAKE_ACK_RENDER_GEN9              _MMIO(0xd84)
+#define FORCEWAKE_ACK_GT_MTL                   _MMIO(0xdfc)
+
+#define GEN9_LNCFCMOCS(i)                      _MMIO(0xb020 + (i) * 4) /* L3 Cache Control */
+#define LNCFCMOCS_REG_COUNT                    32
+
+#define MCFG_MCR_SELECTOR                      _MMIO(0xfd0)
+#define MTL_MCR_SELECTOR                       _MMIO(0xfd4)
+#define SF_MCR_SELECTOR                                _MMIO(0xfd8)
+#define GEN8_MCR_SELECTOR                      _MMIO(0xfdc)
+#define GAM_MCR_SELECTOR                       _MMIO(0xfe0)
+#define   GEN11_MCR_MULTICAST                  REG_BIT(31)
+#define   GEN11_MCR_SLICE(slice)               (((slice) & 0xf) << 27)
+#define   GEN11_MCR_SLICE_MASK                 GEN11_MCR_SLICE(0xf)
+#define   GEN11_MCR_SUBSLICE(subslice)         (((subslice) & 0x7) << 24)
+#define   GEN11_MCR_SUBSLICE_MASK              GEN11_MCR_SUBSLICE(0x7)
+#define   MTL_MCR_GROUPID                      REG_GENMASK(11, 8)
+#define   MTL_MCR_INSTANCEID                   REG_GENMASK(3, 0)
+
+#define GEN7_FF_SLICE_CS_CHICKEN1              _MMIO(0x20e0)
+#define   GEN9_FFSC_PERCTX_PREEMPT_CTRL                (1 << 14)
+
+#define GEN9_CS_DEBUG_MODE1                    _MMIO(0x20ec)
+#define   FF_DOP_CLOCK_GATE_DISABLE            REG_BIT(1)
+
+#define PS_INVOCATION_COUNT                    _MMIO(0x2348)
+
+#define GEN8_CS_CHICKEN1                       _MMIO(0x2580)
+#define   GEN9_PREEMPT_3D_OBJECT_LEVEL         (1 << 0)
+#define   GEN9_PREEMPT_GPGPU_LEVEL(hi, lo)     (((hi) << 2) | ((lo) << 1))
+#define   GEN9_PREEMPT_GPGPU_MID_THREAD_LEVEL  GEN9_PREEMPT_GPGPU_LEVEL(0, 0)
+#define   GEN9_PREEMPT_GPGPU_THREAD_GROUP_LEVEL        GEN9_PREEMPT_GPGPU_LEVEL(0, 1)
+#define   GEN9_PREEMPT_GPGPU_COMMAND_LEVEL     GEN9_PREEMPT_GPGPU_LEVEL(1, 0)
+#define   GEN9_PREEMPT_GPGPU_LEVEL_MASK                GEN9_PREEMPT_GPGPU_LEVEL(1, 1)
+
+#define GEN12_GLOBAL_MOCS(i)                   _MMIO(0x4000 + (i) * 4) /* Global MOCS regs */
+#define GEN12_CCS_AUX_INV                      _MMIO(0x4208)
+
+#define GEN12_VD0_AUX_INV                      _MMIO(0x4218)
+#define GEN12_VE0_AUX_INV                      _MMIO(0x4238)
+
+#define GEN12_VE1_AUX_INV                      _MMIO(0x42b8)
+#define   AUX_INV                              REG_BIT(0)
+
+#define GEN12_PAT_INDEX(index)                 _MMIO(0x4800 + (index) * 4)
+#define XEHP_TILE0_ADDR_RANGE                  MCR_REG(0x4900)
+#define XEHP_FLAT_CCS_BASE_ADDR                        MCR_REG(0x4910)
+
+#define GEN12_FF_MODE2                         _MMIO(0x6604)
+#define XEHP_FF_MODE2                          MCR_REG(0x6604)
+#define   FF_MODE2_GS_TIMER_MASK               REG_GENMASK(31, 24)
+#define   FF_MODE2_GS_TIMER_224                        REG_FIELD_PREP(FF_MODE2_GS_TIMER_MASK, 224)
+#define   FF_MODE2_TDS_TIMER_MASK              REG_GENMASK(23, 16)
+#define   FF_MODE2_TDS_TIMER_128               REG_FIELD_PREP(FF_MODE2_TDS_TIMER_MASK, 4)
+
+#define HIZ_CHICKEN                            _MMIO(0x7018)
+#define   DG1_HZ_READ_SUPPRESSION_OPTIMIZATION_DISABLE REG_BIT(14)
+
+/* GEN7 chicken */
+#define GEN7_COMMON_SLICE_CHICKEN1             _MMIO(0x7010)
+
+#define GEN11_COMMON_SLICE_CHICKEN3            _MMIO(0x7304)
+#define XEHP_COMMON_SLICE_CHICKEN3             MCR_REG(0x7304)
+#define   DG1_FLOAT_POINT_BLEND_OPT_STRICT_MODE_EN     REG_BIT(12)
+#define   XEHP_DUAL_SIMD8_SEQ_MERGE_DISABLE    REG_BIT(12)
+#define   GEN11_BLEND_EMB_FIX_DISABLE_IN_RCC   REG_BIT(11)
+#define   GEN12_DISABLE_CPS_AWARE_COLOR_PIPE   REG_BIT(9)
+
+#define XEHP_SQCM                              MCR_REG(0x8724)
+#define   EN_32B_ACCESS                                REG_BIT(30)
+
+#define        GEN10_MIRROR_FUSE3                      _MMIO(0x9118)
+#define   GEN10_L3BANK_PAIR_COUNT              4
+#define   GEN10_L3BANK_MASK                    0x0F
+/* on Xe_HP the same fuses indicates mslices instead of L3 banks */
+#define   GEN12_MAX_MSLICES                    4
+#define   GEN12_MEML3_EN_MASK                  0x0F
+
+/* Fuse readout registers for GT */
+#define XEHP_FUSE4                             _MMIO(0x9114)
+#define   GT_L3_EXC_MASK                       REG_GENMASK(6, 4)
+
+#define GEN11_GT_VEBOX_VDBOX_DISABLE           _MMIO(0x9140)
+#define   GEN11_GT_VDBOX_DISABLE_MASK          0xff
+#define   GEN11_GT_VEBOX_DISABLE_SHIFT         16
+#define   GEN11_GT_VEBOX_DISABLE_MASK          (0x0f << GEN11_GT_VEBOX_DISABLE_SHIFT)
+
+#define GEN6_GDRST                             _MMIO(0x941c)
+#define   GEN11_GRDOM_GUC                      REG_BIT(3)
+#define   GEN6_GRDOM_FULL                      (1 << 0)
+#define   GEN11_GRDOM_FULL                     GEN6_GRDOM_FULL
+
+#define GEN7_MISCCPCTL                         _MMIO(0x9424)
+#define   GEN7_DOP_CLOCK_GATE_ENABLE           (1 << 0)
+#define   GEN12_DOP_CLOCK_GATE_RENDER_ENABLE   REG_BIT(1)
+
+#define UNSLCGCTL9430                          _MMIO(0x9430)
+#define   MSQDUNIT_CLKGATE_DIS                 REG_BIT(3)
+
+#define UNSLICE_UNIT_LEVEL_CLKGATE             _MMIO(0x9434)
+#define   VFUNIT_CLKGATE_DIS                   REG_BIT(20)
+#define   TSGUNIT_CLKGATE_DIS                  REG_BIT(17) /* XEHPSDV */
+#define   CG3DDISCFEG_CLKGATE_DIS              REG_BIT(17) /* DG2 */
+#define   GAMEDIA_CLKGATE_DIS                  REG_BIT(11)
+#define   HSUNIT_CLKGATE_DIS                   REG_BIT(8)
+#define   VSUNIT_CLKGATE_DIS                   REG_BIT(3)
+
+#define UNSLCGCTL9440                          _MMIO(0x9440)
+#define   GAMTLBOACS_CLKGATE_DIS               REG_BIT(28)
+#define   GAMTLBVDBOX5_CLKGATE_DIS             REG_BIT(27)
+#define   GAMTLBVDBOX6_CLKGATE_DIS             REG_BIT(26)
+#define   GAMTLBVDBOX3_CLKGATE_DIS             REG_BIT(24)
+#define   GAMTLBVDBOX4_CLKGATE_DIS             REG_BIT(23)
+#define   GAMTLBVDBOX7_CLKGATE_DIS             REG_BIT(22)
+#define   GAMTLBVDBOX2_CLKGATE_DIS             REG_BIT(21)
+#define   GAMTLBVDBOX0_CLKGATE_DIS             REG_BIT(17)
+#define   GAMTLBKCR_CLKGATE_DIS                        REG_BIT(16)
+#define   GAMTLBGUC_CLKGATE_DIS                        REG_BIT(15)
+#define   GAMTLBBLT_CLKGATE_DIS                        REG_BIT(14)
+#define   GAMTLBVDBOX1_CLKGATE_DIS             REG_BIT(6)
+
+#define UNSLCGCTL9444                          _MMIO(0x9444)
+#define   GAMTLBGFXA0_CLKGATE_DIS              REG_BIT(30)
+#define   GAMTLBGFXA1_CLKGATE_DIS              REG_BIT(29)
+#define   GAMTLBCOMPA0_CLKGATE_DIS             REG_BIT(28)
+#define   GAMTLBCOMPA1_CLKGATE_DIS             REG_BIT(27)
+#define   GAMTLBCOMPB0_CLKGATE_DIS             REG_BIT(26)
+#define   GAMTLBCOMPB1_CLKGATE_DIS             REG_BIT(25)
+#define   GAMTLBCOMPC0_CLKGATE_DIS             REG_BIT(24)
+#define   GAMTLBCOMPC1_CLKGATE_DIS             REG_BIT(23)
+#define   GAMTLBCOMPD0_CLKGATE_DIS             REG_BIT(22)
+#define   GAMTLBCOMPD1_CLKGATE_DIS             REG_BIT(21)
+#define   GAMTLBMERT_CLKGATE_DIS               REG_BIT(20)
+#define   GAMTLBVEBOX3_CLKGATE_DIS             REG_BIT(19)
+#define   GAMTLBVEBOX2_CLKGATE_DIS             REG_BIT(18)
+#define   GAMTLBVEBOX1_CLKGATE_DIS             REG_BIT(17)
+#define   GAMTLBVEBOX0_CLKGATE_DIS             REG_BIT(16)
+#define   LTCDD_CLKGATE_DIS                    REG_BIT(10)
+
+#define GEN11_SLICE_UNIT_LEVEL_CLKGATE         _MMIO(0x94d4)
+#define XEHP_SLICE_UNIT_LEVEL_CLKGATE          MCR_REG(0x94d4)
+#define   SARBUNIT_CLKGATE_DIS                 (1 << 5)
+#define   RCCUNIT_CLKGATE_DIS                  (1 << 7)
+#define   MSCUNIT_CLKGATE_DIS                  (1 << 10)
+#define   NODEDSS_CLKGATE_DIS                  REG_BIT(12)
+#define   L3_CLKGATE_DIS                       REG_BIT(16)
+#define   L3_CR2X_CLKGATE_DIS                  REG_BIT(17)
+
+#define UNSLICE_UNIT_LEVEL_CLKGATE2            _MMIO(0x94e4)
+#define   VSUNIT_CLKGATE_DIS_TGL               REG_BIT(19)
+#define   PSDUNIT_CLKGATE_DIS                  REG_BIT(5)
+
+#define GEN11_SUBSLICE_UNIT_LEVEL_CLKGATE      MCR_REG(0x9524)
+#define   DSS_ROUTER_CLKGATE_DIS               REG_BIT(28)
+#define   GWUNIT_CLKGATE_DIS                   REG_BIT(16)
+
+#define SUBSLICE_UNIT_LEVEL_CLKGATE2           MCR_REG(0x9528)
+#define   CPSSUNIT_CLKGATE_DIS                 REG_BIT(9)
+
+#define SSMCGCTL9530                           MCR_REG(0x9530)
+#define   RTFUNIT_CLKGATE_DIS                  REG_BIT(18)
+
+#define GEN10_DFR_RATIO_EN_AND_CHICKEN         MCR_REG(0x9550)
+#define   DFR_DISABLE                          (1 << 9)
+
+#define GEN6_RPNSWREQ                          _MMIO(0xa008)
+#define GEN6_RC_CONTROL                                _MMIO(0xa090)
+#define GEN6_RC_STATE                          _MMIO(0xa094)
+
+#define GEN6_PMINTRMSK                         _MMIO(0xa168)
+#define   GEN8_PMINTR_DISABLE_REDIRECT_TO_GUC  (1 << 31)
+#define   ARAT_EXPIRED_INTRMSK                 (1 << 9)
+
+#define FORCEWAKE_GT_GEN9                      _MMIO(0xa188)
+
+#define GEN9_PG_ENABLE                         _MMIO(0xa210)
+
+/* GPM unit config (Gen9+) */
+#define CTC_MODE                               _MMIO(0xa26c)
+#define   CTC_SOURCE_PARAMETER_MASK            1
+#define   CTC_SOURCE_CRYSTAL_CLOCK             0
+#define   CTC_SOURCE_DIVIDE_LOGIC              1
+#define   CTC_SHIFT_PARAMETER_SHIFT            1
+#define   CTC_SHIFT_PARAMETER_MASK             (0x3 << CTC_SHIFT_PARAMETER_SHIFT)
+
+#define FORCEWAKE_RENDER_GEN9                  _MMIO(0xa278)
+#define FORCEWAKE_MEDIA_VDBOX_GEN11(n)         _MMIO(0xa540 + (n) * 4)
+#define FORCEWAKE_MEDIA_VEBOX_GEN11(n)         _MMIO(0xa560 + (n) * 4)
+
+#define GEN10_SAMPLER_MODE                     MCR_REG(0xe18c)
+#define   ENABLE_SMALLPL                       REG_BIT(15)
+#define   SC_DISABLE_POWER_OPTIMIZATION_EBB    REG_BIT(9)
+#define   GEN11_SAMPLER_ENABLE_HEADLESS_MSG    REG_BIT(5)
+
+#define GEN9_ROW_CHICKEN4                      MCR_REG(0xe48c)
+#define   GEN12_DISABLE_GRF_CLEAR              REG_BIT(13)
+#define   XEHP_DIS_BBL_SYSPIPE                 REG_BIT(11)
+#define   GEN12_DISABLE_TDL_PUSH               REG_BIT(9)
+#define   GEN11_DIS_PICK_2ND_EU                        REG_BIT(7)
+#define   GEN12_DISABLE_HDR_PAST_PAYLOAD_HOLD_FIX      REG_BIT(4)
+#define   THREAD_EX_ARB_MODE                   REG_GENMASK(3, 2)
+#define   THREAD_EX_ARB_MODE_RR_AFTER_DEP      REG_FIELD_PREP(THREAD_EX_ARB_MODE, 0x2)
+
+#define GEN7_ROW_CHICKEN2                      _MMIO(0xe4f4)
+#define   GEN12_DISABLE_READ_SUPPRESSION       REG_BIT(15)
+#define   GEN12_DISABLE_EARLY_READ             REG_BIT(14)
+#define   GEN12_ENABLE_LARGE_GRF_MODE          REG_BIT(12)
+#define   GEN12_PUSH_CONST_DEREF_HOLD_DIS      REG_BIT(8)
+#define   GEN12_DISABLE_DOP_GATING              REG_BIT(0)
+
+#define SARB_CHICKEN1                          MCR_REG(0xe90c)
+#define   COMP_CKN_IN                          REG_GENMASK(30, 29)
+
+#define GEN12_RCU_MODE                         _MMIO(0x14800)
+#define   GEN12_RCU_MODE_CCS_ENABLE            REG_BIT(0)
+
+#define FORCEWAKE_ACK_GT_GEN9                  _MMIO(0x130044)
+#define   FORCEWAKE_KERNEL                     BIT(0)
+#define   FORCEWAKE_USER                       BIT(1)
+#define   FORCEWAKE_KERNEL_FALLBACK            BIT(15)
+
+#define GEN6_GT_CORE_STATUS                    _MMIO(0x138060)
+#define   GEN6_RC0                             0
+#define   GEN6_RC6                             3
+
+#define GEN6_GT_GFX_RC6_LOCKED                 _MMIO(0x138104)
+#define GEN6_GT_GFX_RC6                                _MMIO(0x138108)
+
+#define GFX_FLSH_CNTL_GEN6                     _MMIO(0x101008)
+#define   GFX_FLSH_CNTL_EN                     (1 << 0)
+
+#define GEN11_GT_INTR_DW(x)                    _MMIO(0x190018 + ((x) * 4))
+
+#define GEN11_GUC_SG_INTR_ENABLE               _MMIO(0x190038)
+#define   ENGINE1_MASK                         REG_GENMASK(31, 16)
+#define   ENGINE0_MASK                         REG_GENMASK(15, 0)
+
+#define GEN11_GPM_WGBOXPERF_INTR_ENABLE                _MMIO(0x19003c)
+
+#define GEN11_INTR_IDENTITY_REG(x)             _MMIO(0x190060 + ((x) * 4))
+#define   GEN11_INTR_DATA_VALID                        (1 << 31)
+#define   GEN11_INTR_ENGINE_INSTANCE(x)                (((x) & GENMASK(25, 20)) >> 20)
+#define   GEN11_INTR_ENGINE_CLASS(x)           (((x) & GENMASK(18, 16)) >> 16)
+#define   GEN11_INTR_ENGINE_INTR(x)            ((x) & 0xffff)
+#define   OTHER_GUC_INSTANCE                   0
+
+#define GEN11_RENDER_COPY_INTR_ENABLE          _MMIO(0x190030)
+#define GEN11_VCS_VECS_INTR_ENABLE             _MMIO(0x190034)
+#define GEN12_CCS_RSVD_INTR_ENABLE             _MMIO(0x190048)
+#define GEN11_IIR_REG_SELECTOR(x)              _MMIO(0x190070 + ((x) * 4))
+#define GEN11_RCS0_RSVD_INTR_MASK              _MMIO(0x190090)
+#define GEN11_BCS_RSVD_INTR_MASK               _MMIO(0x1900a0)
+#define GEN11_VCS0_VCS1_INTR_MASK              _MMIO(0x1900a8)
+#define GEN11_VCS2_VCS3_INTR_MASK              _MMIO(0x1900ac)
+#define GEN11_VECS0_VECS1_INTR_MASK            _MMIO(0x1900d0)
+#define GEN11_GUC_SG_INTR_MASK                 _MMIO(0x1900e8)
+#define GEN11_GPM_WGBOXPERF_INTR_MASK          _MMIO(0x1900ec)
+#define GEN12_CCS0_CCS1_INTR_MASK              _MMIO(0x190100)
+#define GEN12_CCS2_CCS3_INTR_MASK              _MMIO(0x190104)
+#define XEHPC_BCS1_BCS2_INTR_MASK              _MMIO(0x190110)
+#define XEHPC_BCS3_BCS4_INTR_MASK              _MMIO(0x190114)
+#define XEHPC_BCS5_BCS6_INTR_MASK              _MMIO(0x190118)
+#define XEHPC_BCS7_BCS8_INTR_MASK              _MMIO(0x19011c)
+
+#endif
index e700737a213db6e09d43daa296c85a1ec69001bb..fe20c61281347dee71aba4966b6b6b632e89fee2 100644 (file)
@@ -8,6 +8,7 @@
 #include <drm/drm_managed.h>
 
 #include "regs/xe_engine_regs.h"
+#include "regs/xe_gt_regs.h"
 #include "xe_bo.h"
 #include "xe_device.h"
 #include "xe_engine.h"
@@ -21,7 +22,6 @@
 #include "xe_sched_job.h"
 
 #include "gt/intel_gpu_commands.h"
-#include "gt/intel_gt_regs.h"
 #include "gt/intel_lrc_reg.h"
 #include "i915_reg.h"
 
index 1ead587cd5c991b664ec9f420022b2720a479f49..77a210acfac3966dde598f3e8ae2a8fa1ba3b72f 100644 (file)
@@ -7,11 +7,10 @@
 
 #include <drm/drm_util.h>
 
+#include "regs/xe_gt_regs.h"
 #include "xe_gt.h"
 #include "xe_mmio.h"
 
-#include "gt/intel_gt_regs.h"
-
 #define XE_FORCE_WAKE_ACK_TIMEOUT_MS   50
 
 static struct xe_gt *
index 3730bbeb26b219f0024cb980c1e6af9975be1ff3..3bf437321149805697b40b7a2adaf03e119fd3d5 100644 (file)
@@ -10,6 +10,7 @@
 #include <drm/drm_managed.h>
 #include <drm/i915_drm.h>
 
+#include "regs/xe_gt_regs.h"
 #include "xe_bo.h"
 #include "xe_device.h"
 #include "xe_gt.h"
@@ -18,7 +19,6 @@
 #include "xe_mmio.h"
 #include "xe_wopcm.h"
 
-#include "gt/intel_gt_regs.h"
 #include "i915_reg.h"
 
 /* FIXME: Common file, preferably auto-gen */
index 74e9445befe4efb80f1823e82167cf7c1c9d4da2..343370b44506e0bab247a1feea44a65838eb6dd1 100644 (file)
@@ -9,6 +9,7 @@
 
 #include <drm/drm_managed.h>
 
+#include "regs/xe_gt_regs.h"
 #include "xe_bb.h"
 #include "xe_bo.h"
 #include "xe_device.h"
@@ -41,8 +42,6 @@
 #include "xe_wa.h"
 #include "xe_wopcm.h"
 
-#include "gt/intel_gt_regs.h"
-
 struct xe_gt *xe_find_full_gt(struct xe_gt *gt)
 {
        struct xe_gt *search;
index 2d9f2aa42badedc875247d384277c85154034ebe..fd0ca33925cd93c077f6400119a80c951264d576 100644 (file)
@@ -5,12 +5,12 @@
 
 #include "xe_gt_clock.h"
 
+#include "regs/xe_gt_regs.h"
 #include "xe_device.h"
 #include "xe_gt.h"
 #include "xe_macros.h"
 #include "xe_mmio.h"
 
-#include "gt/intel_gt_regs.h"
 #include "i915_reg.h"
 
 static u32 read_reference_ts_freq(struct xe_gt *gt)
index 8fa59988d08e4cdfa671e092a405f8adb5fb33be..10eff02cc7db11ff2f0cfd2ce91b70fc6b441c06 100644 (file)
@@ -5,13 +5,12 @@
 
 #include "xe_gt_mcr.h"
 
+#include "regs/xe_gt_regs.h"
 #include "xe_gt.h"
 #include "xe_gt_topology.h"
 #include "xe_gt_types.h"
 #include "xe_mmio.h"
 
-#include "gt/intel_gt_regs.h"
-
 /**
  * DOC: GT Multicast/Replicated (MCR) Register Support
  *
index db3d8c947603a7a88e370bd273c19cd65541eaf0..661effa9830ff6c8fb55b5cde680a715f93f678b 100644 (file)
@@ -5,6 +5,7 @@
 
 #include "xe_guc.h"
 
+#include "regs/xe_gt_regs.h"
 #include "xe_bo.h"
 #include "xe_device.h"
 #include "xe_force_wake.h"
@@ -21,7 +22,6 @@
 #include "xe_uc_fw.h"
 #include "xe_wopcm.h"
 
-#include "gt/intel_gt_regs.h"
 #include "i915_reg_defs.h"
 
 /* TODO: move to common file */
index 6cd07f51b8282c99084c9e02f8947d28c5437545..49725093fb4708ce5e7772546c28d243a6262cc3 100644 (file)
@@ -8,6 +8,7 @@
 #include <drm/drm_managed.h>
 
 #include "regs/xe_engine_regs.h"
+#include "regs/xe_gt_regs.h"
 #include "xe_bo.h"
 #include "xe_gt.h"
 #include "xe_guc.h"
@@ -18,9 +19,6 @@
 #include "xe_mmio.h"
 #include "xe_platform_types.h"
 
-#include "gt/intel_gt_regs.h"
-
-
 /* Slack of a few additional entries per engine */
 #define ADS_REGSET_EXTRA_MAX   8
 
index 28b86e8f3f6eae202bc11e3e64ed65b6ce2d8d88..f983f47cefb6ac19eb72395fd3a98fc9e581951f 100644 (file)
@@ -9,6 +9,7 @@
 
 #include <drm/drm_managed.h>
 
+#include "regs/xe_gt_regs.h"
 #include "xe_bo.h"
 #include "xe_device.h"
 #include "xe_gt.h"
@@ -31,7 +32,6 @@
 #define GEN10_FREQ_INFO_REC    _MMIO(MCHBAR_MIRROR_BASE_SNB + 0x5ef0)
 #define   RPE_MASK             REG_GENMASK(15, 8)
 
-#include "gt/intel_gt_regs.h"
 /* For GEN6_RPNSWREQ.reg to be merged when the definition moves to Xe */
 #define   REQ_RATIO_MASK       REG_GENMASK(31, 23)
 
index f7c5f709b088b9fb5474ee526458b3614b18eacc..5e7f21b319bb34ab59363822a008b4ee6e1ae78e 100644 (file)
@@ -8,6 +8,7 @@
 #include <drm/drm_managed.h>
 
 #include "regs/xe_engine_regs.h"
+#include "regs/xe_gt_regs.h"
 #include "xe_bo.h"
 #include "xe_device.h"
 #include "xe_execlist.h"
@@ -22,7 +23,6 @@
 #include "xe_sched_job.h"
 #include "xe_wa.h"
 
-#include "gt/intel_gt_regs.h"
 #include "i915_reg.h"
 
 #define MAX_MMIO_BASES 3
index 46431f0e4af82adf984360d45e465910c9598fdc..04b3801fc0a8b18bde6f5d8b7d55994ecdc23667 100644 (file)
@@ -9,6 +9,7 @@
 
 #include <drm/drm_managed.h>
 
+#include "regs/xe_gt_regs.h"
 #include "xe_device.h"
 #include "xe_drv.h"
 #include "xe_gt.h"
@@ -16,7 +17,6 @@
 #include "xe_hw_engine.h"
 #include "xe_mmio.h"
 
-#include "gt/intel_gt_regs.h"
 #include "i915_reg.h"
 
 static void gen3_assert_iir_is_zero(struct xe_gt *gt, i915_reg_t reg)
index 887d9189fcec38e069b7da6050d9111dee74406e..bf12f71fbe729d388387d06a8e6f1d85bbd161c3 100644 (file)
@@ -6,6 +6,7 @@
 #include "xe_lrc.h"
 
 #include "regs/xe_engine_regs.h"
+#include "regs/xe_gt_regs.h"
 #include "xe_bo.h"
 #include "xe_device.h"
 #include "xe_engine_types.h"
@@ -15,7 +16,6 @@
 #include "xe_vm.h"
 
 #include "gt/intel_gpu_commands.h"
-#include "gt/intel_gt_regs.h"
 #include "gt/intel_lrc_reg.h"
 #include "i915_reg.h"
 
index 07db7912a9313dab79c53ed533a8a9a256a462b1..5e6ca0d2076ad130f1e7218f4c525ad213433139 100644 (file)
@@ -9,13 +9,13 @@
 #include <drm/xe_drm.h>
 
 #include "regs/xe_engine_regs.h"
+#include "regs/xe_gt_regs.h"
 #include "xe_device.h"
 #include "xe_gt.h"
 #include "xe_gt_mcr.h"
 #include "xe_macros.h"
 #include "xe_module.h"
 
-#include "gt/intel_gt_regs.h"
 #include "i915_reg.h"
 
 #define XEHP_MTCFG_ADDR                _MMIO(0x101800)
index d91054c7870244276f6e39a8a69f3baf6550071f..7ff81041d5ce6dd6f06c044be301295697189da2 100644 (file)
@@ -5,6 +5,7 @@
 
 #include "xe_mocs.h"
 
+#include "regs/xe_gt_regs.h"
 #include "xe_bo.h"
 #include "xe_device.h"
 #include "xe_engine.h"
@@ -13,8 +14,6 @@
 #include "xe_platform_types.h"
 #include "xe_step_types.h"
 
-#include "gt/intel_gt_regs.h"
-
 #if IS_ENABLED(CONFIG_DRM_XE_DEBUG)
 #define mocs_dbg drm_dbg
 #else
index 359de4724bb5442debce287c4b07d047c4ae3a16..d675164697108cd667e4121c00b309564f3f2071 100644 (file)
@@ -13,6 +13,7 @@
 #include <drm/drm_print.h>
 
 #include "regs/xe_engine_regs.h"
+#include "regs/xe_gt_regs.h"
 #include "xe_device_types.h"
 #include "xe_force_wake.h"
 #include "xe_gt.h"
@@ -21,8 +22,6 @@
 #include "xe_mmio.h"
 #include "xe_rtp_types.h"
 
-#include "gt/intel_gt_regs.h"
-
 #define XE_REG_SR_GROW_STEP_DEFAULT    16
 
 static void reg_sr_fini(struct drm_device *drm, void *arg)
index 5aa73c1c40973eba27bc280a703cbf67f1a62f9c..2dd10e62718f1456fd5120b1cf90b4abd79cfaff 100644 (file)
@@ -6,12 +6,11 @@
 #include "xe_reg_whitelist.h"
 
 #include "regs/xe_engine_regs.h"
+#include "regs/xe_gt_regs.h"
 #include "xe_gt_types.h"
 #include "xe_platform_types.h"
 #include "xe_rtp.h"
 
-#include "gt/intel_gt_regs.h"
-
 #undef _MMIO
 #undef MCR_REG
 #define _MMIO(x)       _XE_RTP_REG(x)
index 2e118d37b88ce5784ad0be96b246fce453aac30a..1b633222fda6145c512dee6c1640ad1249c95e9f 100644 (file)
@@ -5,6 +5,7 @@
 
 #include "xe_ring_ops.h"
 
+#include "regs/xe_gt_regs.h"
 #include "xe_engine_types.h"
 #include "xe_gt.h"
 #include "xe_lrc.h"
@@ -13,7 +14,6 @@
 #include "xe_vm_types.h"
 
 #include "gt/intel_gpu_commands.h"
-#include "gt/intel_gt_regs.h"
 #include "gt/intel_lrc_reg.h"
 #include "i915_reg.h"
 
index a3872f0330cb067c034c5ba19dbb8588d084b11e..624b257ecfbc59b3847edf0c6030f5d535eae96c 100644 (file)
@@ -5,12 +5,11 @@
 
 #include "xe_tuning.h"
 
+#include "regs/xe_gt_regs.h"
 #include "xe_gt_types.h"
 #include "xe_platform_types.h"
 #include "xe_rtp.h"
 
-#include "gt/intel_gt_regs.h"
-
 #undef _MMIO
 #undef MCR_REG
 #define _MMIO(x)       _XE_RTP_REG(x)
index 92065341c00162b64178f7deb6d1fb2b8b644420..155cfd1dcc500b14e78de6ce628767ddf8d74107 100644 (file)
@@ -8,6 +8,7 @@
 #include <linux/compiler_types.h>
 
 #include "regs/xe_engine_regs.h"
+#include "regs/xe_gt_regs.h"
 #include "xe_device_types.h"
 #include "xe_force_wake.h"
 #include "xe_gt.h"
@@ -17,7 +18,6 @@
 #include "xe_rtp.h"
 #include "xe_step.h"
 
-#include "gt/intel_gt_regs.h"
 #include "i915_reg.h"
 
 /**