Skip to content

L
linux
Commit d9b79ad2 authored by Lucas De Marchi's avatar Lucas De Marchi Committed by Rodrigo Vivi
Browse files
Options

drm/xe: Drop gen afixes from registers 

The defines for the registers were brought over from i915 while
bootstrapping the driver. As xe supports TGL and later only, it doesn't
make sense to keep the GEN* prefixes and suffixes in the registers: TGL
is graphics version 12, previously called "GEN12". So drop the prefix
everywhere.

v2:
  - Also drop _TGL suffix and reword commit message as suggested
    by Matt Roper. While at it, rename VSUNIT_CLKGATE_DIS_TGL to
    VSUNIT_CLKGATE2_DIS with the additional "2", so it doesn't clash
    with the define for the other register
Reviewed-by: default avatarMatt Roper <matthew.d.roper@intel.com>
Link: https://lore.kernel.org/r/20230427223256.1432787-3-lucas.demarchi@intel.comSigned-off-by: default avatarLucas De Marchi <lucas.demarchi@intel.com>
Signed-off-by: default avatarRodrigo Vivi <rodrigo.vivi@intel.com>
parent 7b829f6d
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 280 additions and 283 deletions
drivers/gpu/drm/xe/regs/xe_engine_regs.h
View file @ d9b79ad2
...@@ -22,8 +22,8 @@ ...@@ -22,8 +22,8 @@
#define RING_CTL_SIZE(size) ((size) - PAGE_SIZE) /* in bytes -> pages */ #define RING_CTL_SIZE(size) ((size) - PAGE_SIZE) /* in bytes -> pages */
#define RING_PSMI_CTL(base) _MMIO((base) + 0x50) #define RING_PSMI_CTL(base) _MMIO((base) + 0x50)
#define GEN8_RC_SEMA_IDLE_MSG_DISABLE REG_BIT(12) #define RC_SEMA_IDLE_MSG_DISABLE REG_BIT(12)
#define GEN12_WAIT_FOR_EVENT_POWER_DOWN_DISABLE REG_BIT(7) #define WAIT_FOR_EVENT_POWER_DOWN_DISABLE REG_BIT(7)
#define RING_ACTHD_UDW(base) _MMIO((base) + 0x5c) #define RING_ACTHD_UDW(base) _MMIO((base) + 0x5c)
#define RING_DMA_FADD_UDW(base) _MMIO((base) + 0x60) #define RING_DMA_FADD_UDW(base) _MMIO((base) + 0x60)
...@@ -53,8 +53,8 @@ ...@@ -53,8 +53,8 @@
#define CTX_CTRL_INHIBIT_SYN_CTX_SWITCH REG_BIT(3) #define CTX_CTRL_INHIBIT_SYN_CTX_SWITCH REG_BIT(3)
#define CTX_CTRL_ENGINE_CTX_RESTORE_INHIBIT REG_BIT(0) #define CTX_CTRL_ENGINE_CTX_RESTORE_INHIBIT REG_BIT(0)
#define RING_MODE_GEN7(base) _MMIO((base) + 0x29c) #define RING_MODE(base) _MMIO((base) + 0x29c)
#define GEN11_GFX_DISABLE_LEGACY_MODE (1 << 3) #define GFX_DISABLE_LEGACY_MODE (1 << 3)
#define RING_TIMESTAMP(base) _MMIO((base) + 0x358) #define RING_TIMESTAMP(base) _MMIO((base) + 0x358)
......
drivers/gpu/drm/xe/regs/xe_gpu_commands.h
View file @ d9b79ad2
...@@ -37,7 +37,7 @@ ...@@ -37,7 +37,7 @@
#define MI_FLUSH_DW_OP_STOREDW (1<<14) #define MI_FLUSH_DW_OP_STOREDW (1<<14)
#define MI_FLUSH_DW_USE_GTT (1<<2) #define MI_FLUSH_DW_USE_GTT (1<<2)
#define MI_BATCH_BUFFER_START_GEN8 MI_INSTR(0x31, 1) #define MI_BATCH_BUFFER_START MI_INSTR(0x31, 1)
#define XY_CTRL_SURF_COPY_BLT ((2 << 29) | (0x48 << 22) | 3) #define XY_CTRL_SURF_COPY_BLT ((2 << 29) | (0x48 << 22) | 3)
#define SRC_ACCESS_TYPE_SHIFT 21 #define SRC_ACCESS_TYPE_SHIFT 21
......
drivers/gpu/drm/xe/regs/xe_gt_regs.h
View file @ d9b79ad2
This diff is collapsed.
drivers/gpu/drm/xe/regs/xe_guc_regs.h
View file @ d9b79ad2
...@@ -54,23 +54,21 @@ ...@@ -54,23 +54,21 @@
#define HUC_STATUS2 _MMIO(0xd3b0) #define HUC_STATUS2 _MMIO(0xd3b0)
#define HUC_FW_VERIFIED REG_BIT(7) #define HUC_FW_VERIFIED REG_BIT(7)
#define GEN11_HUC_KERNEL_LOAD_INFO _MMIO(0xc1dc) #define HUC_KERNEL_LOAD_INFO _MMIO(0xc1dc)
#define HUC_LOAD_SUCCESSFUL REG_BIT(0) #define HUC_LOAD_SUCCESSFUL REG_BIT(0)
#define GUC_WOPCM_SIZE _MMIO(0xc050) #define GUC_WOPCM_SIZE _MMIO(0xc050)
#define GUC_WOPCM_SIZE_MASK REG_GENMASK(31, 12) #define GUC_WOPCM_SIZE_MASK REG_GENMASK(31, 12)
#define GUC_WOPCM_SIZE_LOCKED REG_BIT(0) #define GUC_WOPCM_SIZE_LOCKED REG_BIT(0)
#define GEN8_GT_PM_CONFIG _MMIO(0x138140) #define GT_PM_CONFIG _MMIO(0x13816c)
#define GEN9LP_GT_PM_CONFIG _MMIO(0x138140)
#define GEN9_GT_PM_CONFIG _MMIO(0x13816c)
#define GT_DOORBELL_ENABLE REG_BIT(0) #define GT_DOORBELL_ENABLE REG_BIT(0)
#define GEN8_GTCR _MMIO(0x4274) #define GTCR _MMIO(0x4274)
#define GEN8_GTCR_INVALIDATE REG_BIT(0) #define GTCR_INVALIDATE REG_BIT(0)
#define GEN12_GUC_TLB_INV_CR _MMIO(0xcee8) #define GUC_TLB_INV_CR _MMIO(0xcee8)
#define GEN12_GUC_TLB_INV_CR_INVALIDATE REG_BIT(0) #define GUC_TLB_INV_CR_INVALIDATE REG_BIT(0)
#define GUC_ARAT_C6DIS _MMIO(0xa178) #define GUC_ARAT_C6DIS _MMIO(0xa178)
...@@ -79,11 +77,11 @@ ...@@ -79,11 +77,11 @@
#define PVC_GUC_MOCS_UC_INDEX 1 #define PVC_GUC_MOCS_UC_INDEX 1
#define PVC_GUC_MOCS_INDEX(index) REG_FIELD_PREP(PVC_GUC_MOCS_INDEX_MASK, \ #define PVC_GUC_MOCS_INDEX(index) REG_FIELD_PREP(PVC_GUC_MOCS_INDEX_MASK, \
index) index)
#define GUC_GEN10_SHIM_WC_ENABLE REG_BIT(21) #define GUC_SHIM_WC_ENABLE REG_BIT(21)
#define GUC_ENABLE_MIA_CLOCK_GATING REG_BIT(15) #define GUC_ENABLE_MIA_CLOCK_GATING REG_BIT(15)
#define GUC_ENABLE_READ_CACHE_FOR_WOPCM_DATA REG_BIT(10) #define GUC_ENABLE_READ_CACHE_FOR_WOPCM_DATA REG_BIT(10)
#define GUC_ENABLE_READ_CACHE_FOR_SRAM_DATA REG_BIT(9) #define GUC_ENABLE_READ_CACHE_FOR_SRAM_DATA REG_BIT(9)
#define GUC_GEN10_MSGCH_ENABLE REG_BIT(4) #define GUC_MSGCH_ENABLE REG_BIT(4)
#define GUC_ENABLE_MIA_CACHING REG_BIT(2) #define GUC_ENABLE_MIA_CACHING REG_BIT(2)
#define GUC_ENABLE_READ_CACHE_LOGIC REG_BIT(1) #define GUC_ENABLE_READ_CACHE_LOGIC REG_BIT(1)
#define GUC_DISABLE_SRAM_INIT_TO_ZEROES REG_BIT(0) #define GUC_DISABLE_SRAM_INIT_TO_ZEROES REG_BIT(0)
...@@ -91,7 +89,7 @@ ...@@ -91,7 +89,7 @@
#define GUC_SEND_INTERRUPT _MMIO(0xc4c8) #define GUC_SEND_INTERRUPT _MMIO(0xc4c8)
#define GUC_SEND_TRIGGER REG_BIT(0) #define GUC_SEND_TRIGGER REG_BIT(0)
#define GEN11_GUC_HOST_INTERRUPT _MMIO(0x1901f0) #define GUC_HOST_INTERRUPT _MMIO(0x1901f0)
#define GUC_NUM_DOORBELLS 256 #define GUC_NUM_DOORBELLS 256
...@@ -105,13 +103,13 @@ struct guc_doorbell_info { ...@@ -105,13 +103,13 @@ struct guc_doorbell_info {
u32 reserved[14]; u32 reserved[14];
} __packed; } __packed;
#define GEN8_DRBREGL(x) _MMIO(0x1000 + (x) * 8) #define DRBREGL(x) _MMIO(0x1000 + (x) * 8)
#define GEN8_DRB_VALID REG_BIT(0) #define DRB_VALID REG_BIT(0)
#define GEN8_DRBREGU(x) _MMIO(0x1000 + (x) * 8 + 4) #define DRBREGU(x) _MMIO(0x1000 + (x) * 8 + 4)
#define GEN12_DIST_DBS_POPULATED _MMIO(0xd08) #define DIST_DBS_POPULATED _MMIO(0xd08)
#define GEN12_DOORBELLS_PER_SQIDI_MASK REG_GENMASK(23, 16) #define DOORBELLS_PER_SQIDI_MASK REG_GENMASK(23, 16)
#define GEN12_SQIDIS_DOORBELL_EXIST_MASK REG_GENMASK(15, 0) #define SQIDIS_DOORBELL_EXIST_MASK REG_GENMASK(15, 0)
#define GUC_BCS_RCS_IER _MMIO(0xC550) #define GUC_BCS_RCS_IER _MMIO(0xC550)
#define GUC_VCS2_VCS1_IER _MMIO(0xC554) #define GUC_VCS2_VCS1_IER _MMIO(0xC554)
......
drivers/gpu/drm/xe/regs/xe_regs.h
View file @ d9b79ad2
...@@ -11,23 +11,22 @@ ...@@ -11,23 +11,22 @@
#define LMEM_INIT REG_BIT(7) #define LMEM_INIT REG_BIT(7)
#define RENDER_RING_BASE 0x02000 #define RENDER_RING_BASE 0x02000
#define GEN11_BSD_RING_BASE 0x1c0000 #define BSD_RING_BASE 0x1c0000
#define GEN11_BSD2_RING_BASE 0x1c4000 #define BSD2_RING_BASE 0x1c4000
#define GEN11_BSD3_RING_BASE 0x1d0000 #define BSD3_RING_BASE 0x1d0000
#define GEN11_BSD4_RING_BASE 0x1d4000 #define BSD4_RING_BASE 0x1d4000
#define XEHP_BSD5_RING_BASE 0x1e0000 #define XEHP_BSD5_RING_BASE 0x1e0000
#define XEHP_BSD6_RING_BASE 0x1e4000 #define XEHP_BSD6_RING_BASE 0x1e4000
#define XEHP_BSD7_RING_BASE 0x1f0000 #define XEHP_BSD7_RING_BASE 0x1f0000
#define XEHP_BSD8_RING_BASE 0x1f4000 #define XEHP_BSD8_RING_BASE 0x1f4000
#define VEBOX_RING_BASE 0x1a000 #define VEBOX_RING_BASE 0x1c8000
#define GEN11_VEBOX_RING_BASE 0x1c8000 #define VEBOX2_RING_BASE 0x1d8000
#define GEN11_VEBOX2_RING_BASE 0x1d8000
#define XEHP_VEBOX3_RING_BASE 0x1e8000 #define XEHP_VEBOX3_RING_BASE 0x1e8000
#define XEHP_VEBOX4_RING_BASE 0x1f8000 #define XEHP_VEBOX4_RING_BASE 0x1f8000
#define GEN12_COMPUTE0_RING_BASE 0x1a000 #define COMPUTE0_RING_BASE 0x1a000
#define GEN12_COMPUTE1_RING_BASE 0x1c000 #define COMPUTE1_RING_BASE 0x1c000
#define GEN12_COMPUTE2_RING_BASE 0x1e000 #define COMPUTE2_RING_BASE 0x1e000
#define GEN12_COMPUTE3_RING_BASE 0x26000 #define COMPUTE3_RING_BASE 0x26000
#define BLT_RING_BASE 0x22000 #define BLT_RING_BASE 0x22000
#define XEHPC_BCS1_RING_BASE 0x3e0000 #define XEHPC_BCS1_RING_BASE 0x3e0000
#define XEHPC_BCS2_RING_BASE 0x3e2000 #define XEHPC_BCS2_RING_BASE 0x3e2000
...@@ -43,8 +42,8 @@ ...@@ -43,8 +42,8 @@
#define GT_CS_MASTER_ERROR_INTERRUPT REG_BIT(3) #define GT_CS_MASTER_ERROR_INTERRUPT REG_BIT(3)
#define GT_RENDER_USER_INTERRUPT (1 << 0) #define GT_RENDER_USER_INTERRUPT (1 << 0)
#define GEN7_FF_THREAD_MODE _MMIO(0x20a0) #define FF_THREAD_MODE _MMIO(0x20a0)
#define GEN12_FF_TESSELATION_DOP_GATE_DISABLE BIT(19) #define FF_TESSELATION_DOP_GATE_DISABLE BIT(19)
#define PVC_RP_STATE_CAP _MMIO(0x281014) #define PVC_RP_STATE_CAP _MMIO(0x281014)
#define MTL_RP_STATE_CAP _MMIO(0x138000) #define MTL_RP_STATE_CAP _MMIO(0x138000)
...@@ -86,18 +85,18 @@ ...@@ -86,18 +85,18 @@
#define DG1_MSTR_IRQ REG_BIT(31) #define DG1_MSTR_IRQ REG_BIT(31)
#define DG1_MSTR_TILE(t) REG_BIT(t) #define DG1_MSTR_TILE(t) REG_BIT(t)
#define GEN9_TIMESTAMP_OVERRIDE _MMIO(0x44074) #define TIMESTAMP_OVERRIDE _MMIO(0x44074)
#define GEN9_TIMESTAMP_OVERRIDE_US_COUNTER_DIVIDER_SHIFT 0 #define TIMESTAMP_OVERRIDE_US_COUNTER_DIVIDER_SHIFT 0
#define GEN9_TIMESTAMP_OVERRIDE_US_COUNTER_DIVIDER_MASK 0x3ff #define TIMESTAMP_OVERRIDE_US_COUNTER_DIVIDER_MASK 0x3ff
#define GEN9_TIMESTAMP_OVERRIDE_US_COUNTER_DENOMINATOR_SHIFT 12 #define TIMESTAMP_OVERRIDE_US_COUNTER_DENOMINATOR_SHIFT 12
#define GEN9_TIMESTAMP_OVERRIDE_US_COUNTER_DENOMINATOR_MASK (0xf << 12) #define TIMESTAMP_OVERRIDE_US_COUNTER_DENOMINATOR_MASK (0xf << 12)
#define GGC _MMIO(0x108040) #define GGC _MMIO(0x108040)
#define GMS_MASK REG_GENMASK(15, 8) #define GMS_MASK REG_GENMASK(15, 8)
#define GGMS_MASK REG_GENMASK(7, 6) #define GGMS_MASK REG_GENMASK(7, 6)
#define GEN12_GSMBASE _MMIO(0x108100) #define GSMBASE _MMIO(0x108100)
#define GEN12_DSMBASE _MMIO(0x1080C0) #define DSMBASE _MMIO(0x1080C0)
#define GEN12_BDSM_MASK REG_GENMASK64(63, 20) #define BDSM_MASK REG_GENMASK64(63, 20)
#endif #endif
drivers/gpu/drm/xe/xe_execlist.c
View file @ d9b79ad2
...@@ -60,8 +60,8 @@ static void __start_lrc(struct xe_hw_engine *hwe, struct xe_lrc *lrc, ...@@ -60,8 +60,8 @@ static void __start_lrc(struct xe_hw_engine *hwe, struct xe_lrc *lrc,
} }
if (hwe->class == XE_ENGINE_CLASS_COMPUTE) if (hwe->class == XE_ENGINE_CLASS_COMPUTE)
xe_mmio_write32(hwe->gt, GEN12_RCU_MODE.reg, xe_mmio_write32(hwe->gt, RCU_MODE.reg,
_MASKED_BIT_ENABLE(GEN12_RCU_MODE_CCS_ENABLE)); _MASKED_BIT_ENABLE(RCU_MODE_CCS_ENABLE));
xe_lrc_write_ctx_reg(lrc, CTX_RING_TAIL, lrc->ring.tail); xe_lrc_write_ctx_reg(lrc, CTX_RING_TAIL, lrc->ring.tail);
lrc->ring.old_tail = lrc->ring.tail; lrc->ring.old_tail = lrc->ring.tail;
...@@ -81,8 +81,8 @@ static void __start_lrc(struct xe_hw_engine *hwe, struct xe_lrc *lrc, ...@@ -81,8 +81,8 @@ static void __start_lrc(struct xe_hw_engine *hwe, struct xe_lrc *lrc,
xe_mmio_write32(gt, RING_HWS_PGA(hwe->mmio_base).reg, xe_mmio_write32(gt, RING_HWS_PGA(hwe->mmio_base).reg,
xe_bo_ggtt_addr(hwe->hwsp)); xe_bo_ggtt_addr(hwe->hwsp));
xe_mmio_read32(gt, RING_HWS_PGA(hwe->mmio_base).reg); xe_mmio_read32(gt, RING_HWS_PGA(hwe->mmio_base).reg);
xe_mmio_write32(gt, RING_MODE_GEN7(hwe->mmio_base).reg, xe_mmio_write32(gt, RING_MODE(hwe->mmio_base).reg,
_MASKED_BIT_ENABLE(GEN11_GFX_DISABLE_LEGACY_MODE)); _MASKED_BIT_ENABLE(GFX_DISABLE_LEGACY_MODE));
xe_mmio_write32(gt, RING_EXECLIST_SQ_CONTENTS_LO(hwe->mmio_base).reg, xe_mmio_write32(gt, RING_EXECLIST_SQ_CONTENTS_LO(hwe->mmio_base).reg,
lower_32_bits(lrc_desc)); lower_32_bits(lrc_desc));
......
drivers/gpu/drm/xe/xe_force_wake.c
View file @ d9b79ad2
...@@ -49,14 +49,14 @@ void xe_force_wake_init_gt(struct xe_gt *gt, struct xe_force_wake *fw) ...@@ -49,14 +49,14 @@ void xe_force_wake_init_gt(struct xe_gt *gt, struct xe_force_wake *fw)
if (xe->info.graphics_verx100 >= 1270) { if (xe->info.graphics_verx100 >= 1270) {
domain_init(&fw->domains[XE_FW_DOMAIN_ID_GT], domain_init(&fw->domains[XE_FW_DOMAIN_ID_GT],
XE_FW_DOMAIN_ID_GT, XE_FW_DOMAIN_ID_GT,
FORCEWAKE_GT_GEN9.reg, FORCEWAKE_GT.reg,
FORCEWAKE_ACK_GT_MTL.reg, FORCEWAKE_ACK_GT_MTL.reg,
BIT(0), BIT(16)); BIT(0), BIT(16));
} else { } else {
domain_init(&fw->domains[XE_FW_DOMAIN_ID_GT], domain_init(&fw->domains[XE_FW_DOMAIN_ID_GT],
XE_FW_DOMAIN_ID_GT, XE_FW_DOMAIN_ID_GT,
FORCEWAKE_GT_GEN9.reg, FORCEWAKE_GT.reg,
FORCEWAKE_ACK_GT_GEN9.reg, FORCEWAKE_ACK_GT.reg,
BIT(0), BIT(16)); BIT(0), BIT(16));
} }
} }
...@@ -71,8 +71,8 @@ void xe_force_wake_init_engines(struct xe_gt *gt, struct xe_force_wake *fw) ...@@ -71,8 +71,8 @@ void xe_force_wake_init_engines(struct xe_gt *gt, struct xe_force_wake *fw)
if (!xe_gt_is_media_type(gt)) if (!xe_gt_is_media_type(gt))
domain_init(&fw->domains[XE_FW_DOMAIN_ID_RENDER], domain_init(&fw->domains[XE_FW_DOMAIN_ID_RENDER],
XE_FW_DOMAIN_ID_RENDER, XE_FW_DOMAIN_ID_RENDER,
FORCEWAKE_RENDER_GEN9.reg, FORCEWAKE_RENDER.reg,
FORCEWAKE_ACK_RENDER_GEN9.reg, FORCEWAKE_ACK_RENDER.reg,
BIT(0), BIT(16)); BIT(0), BIT(16));
for (i = XE_HW_ENGINE_VCS0, j = 0; i <= XE_HW_ENGINE_VCS7; ++i, ++j) { for (i = XE_HW_ENGINE_VCS0, j = 0; i <= XE_HW_ENGINE_VCS7; ++i, ++j) {
...@@ -81,8 +81,8 @@ void xe_force_wake_init_engines(struct xe_gt *gt, struct xe_force_wake *fw) ...@@ -81,8 +81,8 @@ void xe_force_wake_init_engines(struct xe_gt *gt, struct xe_force_wake *fw)
domain_init(&fw->domains[XE_FW_DOMAIN_ID_MEDIA_VDBOX0 + j], domain_init(&fw->domains[XE_FW_DOMAIN_ID_MEDIA_VDBOX0 + j],
XE_FW_DOMAIN_ID_MEDIA_VDBOX0 + j, XE_FW_DOMAIN_ID_MEDIA_VDBOX0 + j,
FORCEWAKE_MEDIA_VDBOX_GEN11(j).reg, FORCEWAKE_MEDIA_VDBOX(j).reg,
FORCEWAKE_ACK_MEDIA_VDBOX_GEN11(j).reg, FORCEWAKE_ACK_MEDIA_VDBOX(j).reg,
BIT(0), BIT(16)); BIT(0), BIT(16));
} }
...@@ -92,8 +92,8 @@ void xe_force_wake_init_engines(struct xe_gt *gt, struct xe_force_wake *fw) ...@@ -92,8 +92,8 @@ void xe_force_wake_init_engines(struct xe_gt *gt, struct xe_force_wake *fw)
domain_init(&fw->domains[XE_FW_DOMAIN_ID_MEDIA_VEBOX0 + j], domain_init(&fw->domains[XE_FW_DOMAIN_ID_MEDIA_VEBOX0 + j],
XE_FW_DOMAIN_ID_MEDIA_VEBOX0 + j, XE_FW_DOMAIN_ID_MEDIA_VEBOX0 + j,
FORCEWAKE_MEDIA_VEBOX_GEN11(j).reg, FORCEWAKE_MEDIA_VEBOX(j).reg,
FORCEWAKE_ACK_MEDIA_VEBOX_GEN11(j).reg, FORCEWAKE_ACK_MEDIA_VEBOX(j).reg,
BIT(0), BIT(16)); BIT(0), BIT(16));
} }
} }
......
drivers/gpu/drm/xe/xe_ggtt.c
View file @ d9b79ad2
...@@ -185,12 +185,12 @@ int xe_ggtt_init(struct xe_gt *gt, struct xe_ggtt *ggtt) ...@@ -185,12 +185,12 @@ int xe_ggtt_init(struct xe_gt *gt, struct xe_ggtt *ggtt)
return err; return err;
} }
#define GEN12_GUC_TLB_INV_CR _MMIO(0xcee8) #define GUC_TLB_INV_CR _MMIO(0xcee8)
#define GEN12_GUC_TLB_INV_CR_INVALIDATE REG_BIT(0) #define GUC_TLB_INV_CR_INVALIDATE REG_BIT(0)
#define PVC_GUC_TLB_INV_DESC0 _MMIO(0xcf7c) #define PVC_GUC_TLB_INV_DESC0 _MMIO(0xcf7c)
#define PVC_GUC_TLB_INV_DESC0_VALID REG_BIT(0) #define PVC_GUC_TLB_INV_DESC0_VALID REG_BIT(0)
#define PVC_GUC_TLB_INV_DESC1 _MMIO(0xcf80) #define PVC_GUC_TLB_INV_DESC1 _MMIO(0xcf80)
#define PVC_GUC_TLB_INV_DESC1_INVALIDATE REG_BIT(6) #define PVC_GUC_TLB_INV_DESC1_INVALIDATE REG_BIT(6)
void xe_ggtt_invalidate(struct xe_gt *gt) void xe_ggtt_invalidate(struct xe_gt *gt)
{ {
...@@ -212,8 +212,8 @@ void xe_ggtt_invalidate(struct xe_gt *gt) ...@@ -212,8 +212,8 @@ void xe_ggtt_invalidate(struct xe_gt *gt)
xe_mmio_write32(gt, PVC_GUC_TLB_INV_DESC0.reg, xe_mmio_write32(gt, PVC_GUC_TLB_INV_DESC0.reg,
PVC_GUC_TLB_INV_DESC0_VALID); PVC_GUC_TLB_INV_DESC0_VALID);
} else } else
xe_mmio_write32(gt, GEN12_GUC_TLB_INV_CR.reg, xe_mmio_write32(gt, GUC_TLB_INV_CR.reg,
GEN12_GUC_TLB_INV_CR_INVALIDATE); GUC_TLB_INV_CR_INVALIDATE);
} }
} }
......
drivers/gpu/drm/xe/xe_gt.c
View file @ d9b79ad2
...@@ -541,8 +541,8 @@ static int do_gt_reset(struct xe_gt *gt) ...@@ -541,8 +541,8 @@ static int do_gt_reset(struct xe_gt *gt)
struct xe_device *xe = gt_to_xe(gt); struct xe_device *xe = gt_to_xe(gt);
int err; int err;
xe_mmio_write32(gt, GEN6_GDRST.reg, GEN11_GRDOM_FULL); xe_mmio_write32(gt, GDRST.reg, GRDOM_FULL);
err = xe_mmio_wait32(gt, GEN6_GDRST.reg, 0, GEN11_GRDOM_FULL, 5000, err = xe_mmio_wait32(gt, GDRST.reg, 0, GRDOM_FULL, 5000,
NULL, false); NULL, false);
if (err) if (err)
drm_err(&xe->drm, drm_err(&xe->drm,
......
drivers/gpu/drm/xe/xe_gt_clock.c
View file @ d9b79ad2
...@@ -14,16 +14,16 @@ ...@@ -14,16 +14,16 @@
static u32 read_reference_ts_freq(struct xe_gt *gt) static u32 read_reference_ts_freq(struct xe_gt *gt)
{ {
u32 ts_override = xe_mmio_read32(gt, GEN9_TIMESTAMP_OVERRIDE.reg); u32 ts_override = xe_mmio_read32(gt, TIMESTAMP_OVERRIDE.reg);
u32 base_freq, frac_freq; u32 base_freq, frac_freq;
base_freq = ((ts_override & GEN9_TIMESTAMP_OVERRIDE_US_COUNTER_DIVIDER_MASK) >> base_freq = ((ts_override & TIMESTAMP_OVERRIDE_US_COUNTER_DIVIDER_MASK) >>
GEN9_TIMESTAMP_OVERRIDE_US_COUNTER_DIVIDER_SHIFT) + 1; TIMESTAMP_OVERRIDE_US_COUNTER_DIVIDER_SHIFT) + 1;
base_freq *= 1000000; base_freq *= 1000000;
frac_freq = ((ts_override & frac_freq = ((ts_override &
GEN9_TIMESTAMP_OVERRIDE_US_COUNTER_DENOMINATOR_MASK) >> TIMESTAMP_OVERRIDE_US_COUNTER_DENOMINATOR_MASK) >>
GEN9_TIMESTAMP_OVERRIDE_US_COUNTER_DENOMINATOR_SHIFT); TIMESTAMP_OVERRIDE_US_COUNTER_DENOMINATOR_SHIFT);
frac_freq = 1000000 / (frac_freq + 1); frac_freq = 1000000 / (frac_freq + 1);
return base_freq + frac_freq; return base_freq + frac_freq;
...@@ -36,17 +36,17 @@ static u32 get_crystal_clock_freq(u32 rpm_config_reg) ...@@ -36,17 +36,17 @@ static u32 get_crystal_clock_freq(u32 rpm_config_reg)
const u32 f25_mhz = 25000000; const u32 f25_mhz = 25000000;
const u32 f38_4_mhz = 38400000; const u32 f38_4_mhz = 38400000;
u32 crystal_clock = u32 crystal_clock =
(rpm_config_reg & GEN11_RPM_CONFIG0_CRYSTAL_CLOCK_FREQ_MASK) >> (rpm_config_reg & RPM_CONFIG0_CRYSTAL_CLOCK_FREQ_MASK) >>
GEN11_RPM_CONFIG0_CRYSTAL_CLOCK_FREQ_SHIFT; RPM_CONFIG0_CRYSTAL_CLOCK_FREQ_SHIFT;
switch (crystal_clock) { switch (crystal_clock) {
case GEN11_RPM_CONFIG0_CRYSTAL_CLOCK_FREQ_24_MHZ: case RPM_CONFIG0_CRYSTAL_CLOCK_FREQ_24_MHZ :
return f24_mhz; return f24_mhz;
case GEN11_RPM_CONFIG0_CRYSTAL_CLOCK_FREQ_19_2_MHZ: case RPM_CONFIG0_CRYSTAL_CLOCK_FREQ_19_2_MHZ :
return f19_2_mhz; return f19_2_mhz;
case GEN11_RPM_CONFIG0_CRYSTAL_CLOCK_FREQ_38_4_MHZ: case RPM_CONFIG0_CRYSTAL_CLOCK_FREQ_38_4_MHZ :
return f38_4_mhz; return f38_4_mhz;
case GEN11_RPM_CONFIG0_CRYSTAL_CLOCK_FREQ_25_MHZ: case RPM_CONFIG0_CRYSTAL_CLOCK_FREQ_25_MHZ :
return f25_mhz; return f25_mhz;
default: default:
XE_BUG_ON("NOT_POSSIBLE"); XE_BUG_ON("NOT_POSSIBLE");
...@@ -74,8 +74,8 @@ int xe_gt_clock_init(struct xe_gt *gt) ...@@ -74,8 +74,8 @@ int xe_gt_clock_init(struct xe_gt *gt)
* register increments from this frequency (it might * register increments from this frequency (it might
* increment only every few clock cycle). * increment only every few clock cycle).
*/ */
freq >>= 3 - ((c0 & GEN10_RPM_CONFIG0_CTC_SHIFT_PARAMETER_MASK) >> freq >>= 3 - ((c0 & RPM_CONFIG0_CTC_SHIFT_PARAMETER_MASK) >>
GEN10_RPM_CONFIG0_CTC_SHIFT_PARAMETER_SHIFT); RPM_CONFIG0_CTC_SHIFT_PARAMETER_SHIFT);
} }
gt->info.clock_freq = freq; gt->info.clock_freq = freq;
......
drivers/gpu/drm/xe/xe_gt_mcr.c
View file @ d9b79ad2
...@@ -177,8 +177,8 @@ static const struct xe_mmio_range dg2_implicit_steering_table[] = { ...@@ -177,8 +177,8 @@ static const struct xe_mmio_range dg2_implicit_steering_table[] = {
static void init_steering_l3bank(struct xe_gt *gt) static void init_steering_l3bank(struct xe_gt *gt)
{ {
if (GRAPHICS_VERx100(gt_to_xe(gt)) >= 1270) { if (GRAPHICS_VERx100(gt_to_xe(gt)) >= 1270) {
u32 mslice_mask = REG_FIELD_GET(GEN12_MEML3_EN_MASK, u32 mslice_mask = REG_FIELD_GET(MEML3_EN_MASK,
xe_mmio_read32(gt, GEN10_MIRROR_FUSE3.reg)); xe_mmio_read32(gt, MIRROR_FUSE3.reg));
u32 bank_mask = REG_FIELD_GET(GT_L3_EXC_MASK, u32 bank_mask = REG_FIELD_GET(GT_L3_EXC_MASK,
xe_mmio_read32(gt, XEHP_FUSE4.reg)); xe_mmio_read32(gt, XEHP_FUSE4.reg));
...@@ -190,8 +190,8 @@ static void init_steering_l3bank(struct xe_gt *gt) ...@@ -190,8 +190,8 @@ static void init_steering_l3bank(struct xe_gt *gt)
gt->steering[L3BANK].instance_target = gt->steering[L3BANK].instance_target =
bank_mask & BIT(0) ? 0 : 2; bank_mask & BIT(0) ? 0 : 2;
} else if (gt_to_xe(gt)->info.platform == XE_DG2) { } else if (gt_to_xe(gt)->info.platform == XE_DG2) {
u32 mslice_mask = REG_FIELD_GET(GEN12_MEML3_EN_MASK, u32 mslice_mask = REG_FIELD_GET(MEML3_EN_MASK,
xe_mmio_read32(gt, GEN10_MIRROR_FUSE3.reg)); xe_mmio_read32(gt, MIRROR_FUSE3.reg));
u32 bank = __ffs(mslice_mask) * 8; u32 bank = __ffs(mslice_mask) * 8;
/* /*
...@@ -202,8 +202,8 @@ static void init_steering_l3bank(struct xe_gt *gt) ...@@ -202,8 +202,8 @@ static void init_steering_l3bank(struct xe_gt *gt)
gt->steering[L3BANK].group_target = (bank >> 2) & 0x7; gt->steering[L3BANK].group_target = (bank >> 2) & 0x7;
gt->steering[L3BANK].instance_target = bank & 0x3; gt->steering[L3BANK].instance_target = bank & 0x3;
} else { } else {
u32 fuse = REG_FIELD_GET(GEN10_L3BANK_MASK, u32 fuse = REG_FIELD_GET(L3BANK_MASK,
~xe_mmio_read32(gt, GEN10_MIRROR_FUSE3.reg)); ~xe_mmio_read32(gt, MIRROR_FUSE3.reg));
gt->steering[L3BANK].group_target = 0; /* unused */ gt->steering[L3BANK].group_target = 0; /* unused */
gt->steering[L3BANK].instance_target = __ffs(fuse); gt->steering[L3BANK].instance_target = __ffs(fuse);
...@@ -212,8 +212,8 @@ static void init_steering_l3bank(struct xe_gt *gt) ...@@ -212,8 +212,8 @@ static void init_steering_l3bank(struct xe_gt *gt)
static void init_steering_mslice(struct xe_gt *gt) static void init_steering_mslice(struct xe_gt *gt)
{ {
u32 mask = REG_FIELD_GET(GEN12_MEML3_EN_MASK, u32 mask = REG_FIELD_GET(MEML3_EN_MASK,
xe_mmio_read32(gt, GEN10_MIRROR_FUSE3.reg)); xe_mmio_read32(gt, MIRROR_FUSE3.reg));
/* /*
* mslice registers are valid (not terminated) if either the meml3 * mslice registers are valid (not terminated) if either the meml3
...@@ -329,8 +329,8 @@ void xe_gt_mcr_set_implicit_defaults(struct xe_gt *gt) ...@@ -329,8 +329,8 @@ void xe_gt_mcr_set_implicit_defaults(struct xe_gt *gt)
struct xe_device *xe = gt_to_xe(gt); struct xe_device *xe = gt_to_xe(gt);
if (xe->info.platform == XE_DG2) { if (xe->info.platform == XE_DG2) {
u32 steer_val = REG_FIELD_PREP(GEN11_MCR_SLICE_MASK, 0) | u32 steer_val = REG_FIELD_PREP(MCR_SLICE_MASK, 0) |
REG_FIELD_PREP(GEN11_MCR_SUBSLICE_MASK, 2); REG_FIELD_PREP(MCR_SUBSLICE_MASK, 2);
xe_mmio_write32(gt, MCFG_MCR_SELECTOR.reg, steer_val); xe_mmio_write32(gt, MCFG_MCR_SELECTOR.reg, steer_val);
xe_mmio_write32(gt, SF_MCR_SELECTOR.reg, steer_val); xe_mmio_write32(gt, SF_MCR_SELECTOR.reg, steer_val);
...@@ -448,9 +448,9 @@ static u32 rw_with_mcr_steering(struct xe_gt *gt, i915_mcr_reg_t reg, u8 rw_flag ...@@ -448,9 +448,9 @@ static u32 rw_with_mcr_steering(struct xe_gt *gt, i915_mcr_reg_t reg, u8 rw_flag
steer_val = REG_FIELD_PREP(MTL_MCR_GROUPID, group) | steer_val = REG_FIELD_PREP(MTL_MCR_GROUPID, group) |
REG_FIELD_PREP(MTL_MCR_INSTANCEID, instance); REG_FIELD_PREP(MTL_MCR_INSTANCEID, instance);
} else { } else {
steer_reg = GEN8_MCR_SELECTOR.reg; steer_reg = MCR_SELECTOR.reg;
steer_val = REG_FIELD_PREP(GEN11_MCR_SLICE_MASK, group) | steer_val = REG_FIELD_PREP(MCR_SLICE_MASK, group) |
REG_FIELD_PREP(GEN11_MCR_SUBSLICE_MASK, instance); REG_FIELD_PREP(MCR_SUBSLICE_MASK, instance);
} }
/* /*
...@@ -461,7 +461,7 @@ static u32 rw_with_mcr_steering(struct xe_gt *gt, i915_mcr_reg_t reg, u8 rw_flag ...@@ -461,7 +461,7 @@ static u32 rw_with_mcr_steering(struct xe_gt *gt, i915_mcr_reg_t reg, u8 rw_flag
* No need to save old steering reg value. * No need to save old steering reg value.
*/ */
if (rw_flag == MCR_OP_READ) if (rw_flag == MCR_OP_READ)
steer_val |= GEN11_MCR_MULTICAST; steer_val |= MCR_MULTICAST;
xe_mmio_write32(gt, steer_reg, steer_val); xe_mmio_write32(gt, steer_reg, steer_val);
...@@ -477,7 +477,7 @@ static u32 rw_with_mcr_steering(struct xe_gt *gt, i915_mcr_reg_t reg, u8 rw_flag ...@@ -477,7 +477,7 @@ static u32 rw_with_mcr_steering(struct xe_gt *gt, i915_mcr_reg_t reg, u8 rw_flag
* operation. * operation.
*/ */
if (rw_flag == MCR_OP_WRITE) if (rw_flag == MCR_OP_WRITE)
xe_mmio_write32(gt, steer_reg, GEN11_MCR_MULTICAST); xe_mmio_write32(gt, steer_reg, MCR_MULTICAST);
return val; return val;
} }
......
drivers/gpu/drm/xe/xe_guc.c
View file @ d9b79ad2
...@@ -278,7 +278,7 @@ int xe_guc_init(struct xe_guc *guc) ...@@ -278,7 +278,7 @@ int xe_guc_init(struct xe_guc *guc)
if (xe_gt_is_media_type(gt)) if (xe_gt_is_media_type(gt))
guc->notify_reg = MEDIA_GUC_HOST_INTERRUPT.reg; guc->notify_reg = MEDIA_GUC_HOST_INTERRUPT.reg;
else else
guc->notify_reg = GEN11_GUC_HOST_INTERRUPT.reg; guc->notify_reg = GUC_HOST_INTERRUPT.reg;
xe_uc_fw_change_status(&guc->fw, XE_UC_FIRMWARE_LOADABLE); xe_uc_fw_change_status(&guc->fw, XE_UC_FIRMWARE_LOADABLE);
...@@ -317,9 +317,9 @@ int xe_guc_reset(struct xe_guc *guc) ...@@ -317,9 +317,9 @@ int xe_guc_reset(struct xe_guc *guc)
xe_force_wake_assert_held(gt_to_fw(gt), XE_FW_GT); xe_force_wake_assert_held(gt_to_fw(gt), XE_FW_GT);
xe_mmio_write32(gt, GEN6_GDRST.reg, GEN11_GRDOM_GUC); xe_mmio_write32(gt, GDRST.reg, GRDOM_GUC);
ret = xe_mmio_wait32(gt, GEN6_GDRST.reg, 0, GEN11_GRDOM_GUC, 5000, ret = xe_mmio_wait32(gt, GDRST.reg, 0, GRDOM_GUC, 5000,
&gdrst, false); &gdrst, false);
if (ret) { if (ret) {
drm_err(&xe->drm, "GuC reset timed out, GEN6_GDRST=0x%8x\n", drm_err(&xe->drm, "GuC reset timed out, GEN6_GDRST=0x%8x\n",
...@@ -362,7 +362,7 @@ static void guc_prepare_xfer(struct xe_guc *guc) ...@@ -362,7 +362,7 @@ static void guc_prepare_xfer(struct xe_guc *guc)
/* Must program this register before loading the ucode with DMA */ /* Must program this register before loading the ucode with DMA */
xe_mmio_write32(gt, GUC_SHIM_CONTROL.reg, shim_flags); xe_mmio_write32(gt, GUC_SHIM_CONTROL.reg, shim_flags);
xe_mmio_write32(gt, GEN9_GT_PM_CONFIG.reg, GT_DOORBELL_ENABLE); xe_mmio_write32(gt, GT_PM_CONFIG.reg, GT_DOORBELL_ENABLE);
} }
/* /*
...@@ -575,7 +575,7 @@ int xe_guc_enable_communication(struct xe_guc *guc) ...@@ -575,7 +575,7 @@ int xe_guc_enable_communication(struct xe_guc *guc)
guc_enable_irq(guc); guc_enable_irq(guc);
xe_mmio_rmw32(guc_to_gt(guc), GEN6_PMINTRMSK.reg, xe_mmio_rmw32(guc_to_gt(guc), PMINTRMSK.reg,
ARAT_EXPIRED_INTRMSK, 0); ARAT_EXPIRED_INTRMSK, 0);
err = xe_guc_ct_enable(&guc->ct); err = xe_guc_ct_enable(&guc->ct);
......
drivers/gpu/drm/xe/xe_guc_ads.c
View file @ d9b79ad2
...@@ -450,10 +450,10 @@ static unsigned int guc_mmio_regset_write(struct xe_guc_ads *ads, ...@@ -450,10 +450,10 @@ static unsigned int guc_mmio_regset_write(struct xe_guc_ads *ads,
u32 flags; u32 flags;
bool skip; bool skip;
} *e, extra_regs[] = { } *e, extra_regs[] = {
{ .reg = RING_MODE_GEN7(hwe->mmio_base).reg, }, { .reg = RING_MODE(hwe->mmio_base).reg, },
{ .reg = RING_HWS_PGA(hwe->mmio_base).reg, }, { .reg = RING_HWS_PGA(hwe->mmio_base).reg, },
{ .reg = RING_IMR(hwe->mmio_base).reg, }, { .reg = RING_IMR(hwe->mmio_base).reg, },
{ .reg = GEN12_RCU_MODE.reg, .flags = 0x3, { .reg = RCU_MODE.reg, .flags = 0x3,
.skip = hwe != hwe_rcs_reset_domain }, .skip = hwe != hwe_rcs_reset_domain },
}; };
u32 i; u32 i;
...@@ -478,7 +478,8 @@ static unsigned int guc_mmio_regset_write(struct xe_guc_ads *ads, ...@@ -478,7 +478,8 @@ static unsigned int guc_mmio_regset_write(struct xe_guc_ads *ads,
if (needs_wa_1607983814(xe) && hwe->class == XE_ENGINE_CLASS_RENDER) { if (needs_wa_1607983814(xe) && hwe->class == XE_ENGINE_CLASS_RENDER) {
for (i = 0; i < LNCFCMOCS_REG_COUNT; i++) { for (i = 0; i < LNCFCMOCS_REG_COUNT; i++) {
guc_mmio_regset_write_one(ads, regset_map, guc_mmio_regset_write_one(ads, regset_map,
GEN9_LNCFCMOCS(i).reg, 0, count++); LNCFCMOCS(i).reg, 0,
count++);
} }
} }
...@@ -557,11 +558,11 @@ static void guc_doorbell_init(struct xe_guc_ads *ads) ...@@ -557,11 +558,11 @@ static void guc_doorbell_init(struct xe_guc_ads *ads)
if (GRAPHICS_VER(xe) >= 12 && !IS_DGFX(xe)) { if (GRAPHICS_VER(xe) >= 12 && !IS_DGFX(xe)) {
u32 distdbreg = u32 distdbreg =
xe_mmio_read32(gt, GEN12_DIST_DBS_POPULATED.reg); xe_mmio_read32(gt, DIST_DBS_POPULATED.reg);
ads_blob_write(ads, ads_blob_write(ads,
system_info.generic_gt_sysinfo[GUC_GENERIC_GT_SYSINFO_DOORBELL_COUNT_PER_SQIDI], system_info.generic_gt_sysinfo[GUC_GENERIC_GT_SYSINFO_DOORBELL_COUNT_PER_SQIDI],
REG_FIELD_GET(GEN12_DOORBELLS_PER_SQIDI_MASK, distdbreg) + 1); REG_FIELD_GET(DOORBELLS_PER_SQIDI_MASK, distdbreg) + 1);
} }
} }
......
drivers/gpu/drm/xe/xe_guc_pc.c
View file @ d9b79ad2
...@@ -413,7 +413,7 @@ static ssize_t freq_cur_show(struct device *dev, ...@@ -413,7 +413,7 @@ static ssize_t freq_cur_show(struct device *dev,
if (ret) if (ret)
goto out; goto out;
freq = xe_mmio_read32(gt, GEN6_RPNSWREQ.reg); freq = xe_mmio_read32(gt, RPNSWREQ.reg);
freq = REG_FIELD_GET(REQ_RATIO_MASK, freq); freq = REG_FIELD_GET(REQ_RATIO_MASK, freq);
ret = sysfs_emit(buf, "%d\n", decode_freq(freq)); ret = sysfs_emit(buf, "%d\n", decode_freq(freq));
...@@ -588,7 +588,7 @@ static ssize_t rc_status_show(struct device *dev, ...@@ -588,7 +588,7 @@ static ssize_t rc_status_show(struct device *dev,
u32 reg; u32 reg;
xe_device_mem_access_get(gt_to_xe(gt)); xe_device_mem_access_get(gt_to_xe(gt));
reg = xe_mmio_read32(gt, GEN6_GT_CORE_STATUS.reg); reg = xe_mmio_read32(gt, GT_CORE_STATUS.reg);
xe_device_mem_access_put(gt_to_xe(gt)); xe_device_mem_access_put(gt_to_xe(gt));
switch (REG_FIELD_GET(RCN_MASK, reg)) { switch (REG_FIELD_GET(RCN_MASK, reg)) {
...@@ -615,7 +615,7 @@ static ssize_t rc6_residency_show(struct device *dev, ...@@ -615,7 +615,7 @@ static ssize_t rc6_residency_show(struct device *dev,
if (ret) if (ret)
goto out; goto out;
reg = xe_mmio_read32(gt, GEN6_GT_GFX_RC6.reg); reg = xe_mmio_read32(gt, GT_GFX_RC6.reg);
ret = sysfs_emit(buff, "%u\n", reg); ret = sysfs_emit(buff, "%u\n", reg);
XE_WARN_ON(xe_force_wake_put(gt_to_fw(gt), XE_FORCEWAKE_ALL)); XE_WARN_ON(xe_force_wake_put(gt_to_fw(gt), XE_FORCEWAKE_ALL));
...@@ -745,9 +745,9 @@ static int pc_gucrc_disable(struct xe_guc_pc *pc) ...@@ -745,9 +745,9 @@ static int pc_gucrc_disable(struct xe_guc_pc *pc)
if (ret) if (ret)
return ret; return ret;
xe_mmio_write32(gt, GEN9_PG_ENABLE.reg, 0); xe_mmio_write32(gt, PG_ENABLE.reg, 0);
xe_mmio_write32(gt, GEN6_RC_CONTROL.reg, 0); xe_mmio_write32(gt, RC_CONTROL.reg, 0);
xe_mmio_write32(gt, GEN6_RC_STATE.reg, 0); xe_mmio_write32(gt, RC_STATE.reg, 0);
XE_WARN_ON(xe_force_wake_put(gt_to_fw(gt), XE_FORCEWAKE_ALL)); XE_WARN_ON(xe_force_wake_put(gt_to_fw(gt), XE_FORCEWAKE_ALL));
return 0; return 0;
......
drivers/gpu/drm/xe/xe_huc.c
View file @ d9b79ad2
...@@ -84,7 +84,7 @@ int xe_huc_auth(struct xe_huc *huc) ...@@ -84,7 +84,7 @@ int xe_huc_auth(struct xe_huc *huc)
goto fail; goto fail;
} }
ret = xe_mmio_wait32(gt, GEN11_HUC_KERNEL_LOAD_INFO.reg, ret = xe_mmio_wait32(gt, HUC_KERNEL_LOAD_INFO.reg,
HUC_LOAD_SUCCESSFUL, HUC_LOAD_SUCCESSFUL,
HUC_LOAD_SUCCESSFUL, 100000, NULL, false); HUC_LOAD_SUCCESSFUL, 100000, NULL, false);
if (ret) { if (ret) {
...@@ -126,7 +126,7 @@ void xe_huc_print_info(struct xe_huc *huc, struct drm_printer *p) ...@@ -126,7 +126,7 @@ void xe_huc_print_info(struct xe_huc *huc, struct drm_printer *p)
return; return;
drm_printf(p, "\nHuC status: 0x%08x\n", drm_printf(p, "\nHuC status: 0x%08x\n",
xe_mmio_read32(gt, GEN11_HUC_KERNEL_LOAD_INFO.reg)); xe_mmio_read32(gt, HUC_KERNEL_LOAD_INFO.reg));
xe_force_wake_put(gt_to_fw(gt), XE_FW_GT); xe_force_wake_put(gt_to_fw(gt), XE_FW_GT);
} }
drivers/gpu/drm/xe/xe_hw_engine.c
View file @ d9b79ad2
...@@ -110,28 +110,28 @@ static const struct engine_info engine_infos[] = { ...@@ -110,28 +110,28 @@ static const struct engine_info engine_infos[] = {
.class = XE_ENGINE_CLASS_VIDEO_DECODE, .class = XE_ENGINE_CLASS_VIDEO_DECODE,
.instance = 0, .instance = 0,
.domain = XE_FW_MEDIA_VDBOX0, .domain = XE_FW_MEDIA_VDBOX0,
.mmio_base = GEN11_BSD_RING_BASE, .mmio_base = BSD_RING_BASE,
}, },
[XE_HW_ENGINE_VCS1] = { [XE_HW_ENGINE_VCS1] = {
.name = "vcs1", .name = "vcs1",
.class = XE_ENGINE_CLASS_VIDEO_DECODE, .class = XE_ENGINE_CLASS_VIDEO_DECODE,
.instance = 1, .instance = 1,
.domain = XE_FW_MEDIA_VDBOX1, .domain = XE_FW_MEDIA_VDBOX1,
.mmio_base = GEN11_BSD2_RING_BASE, .mmio_base = BSD2_RING_BASE,
}, },
[XE_HW_ENGINE_VCS2] = { [XE_HW_ENGINE_VCS2] = {
.name = "vcs2", .name = "vcs2",
.class = XE_ENGINE_CLASS_VIDEO_DECODE, .class = XE_ENGINE_CLASS_VIDEO_DECODE,
.instance = 2, .instance = 2,
.domain = XE_FW_MEDIA_VDBOX2, .domain = XE_FW_MEDIA_VDBOX2,
.mmio_base = GEN11_BSD3_RING_BASE, .mmio_base = BSD3_RING_BASE,
}, },
[XE_HW_ENGINE_VCS3] = { [XE_HW_ENGINE_VCS3] = {
.name = "vcs3", .name = "vcs3",
.class = XE_ENGINE_CLASS_VIDEO_DECODE, .class = XE_ENGINE_CLASS_VIDEO_DECODE,
.instance = 3, .instance = 3,
.domain = XE_FW_MEDIA_VDBOX3, .domain = XE_FW_MEDIA_VDBOX3,
.mmio_base = GEN11_BSD4_RING_BASE, .mmio_base = BSD4_RING_BASE,
}, },
[XE_HW_ENGINE_VCS4] = { [XE_HW_ENGINE_VCS4] = {
.name = "vcs4", .name = "vcs4",
...@@ -166,14 +166,14 @@ static const struct engine_info engine_infos[] = { ...@@ -166,14 +166,14 @@ static const struct engine_info engine_infos[] = {
.class = XE_ENGINE_CLASS_VIDEO_ENHANCE, .class = XE_ENGINE_CLASS_VIDEO_ENHANCE,
.instance = 0, .instance = 0,
.domain = XE_FW_MEDIA_VEBOX0, .domain = XE_FW_MEDIA_VEBOX0,
.mmio_base = GEN11_VEBOX_RING_BASE, .mmio_base = VEBOX_RING_BASE,
}, },
[XE_HW_ENGINE_VECS1] = { [XE_HW_ENGINE_VECS1] = {
.name = "vecs1", .name = "vecs1",
.class = XE_ENGINE_CLASS_VIDEO_ENHANCE, .class = XE_ENGINE_CLASS_VIDEO_ENHANCE,
.instance = 1, .instance = 1,
.domain = XE_FW_MEDIA_VEBOX1, .domain = XE_FW_MEDIA_VEBOX1,
.mmio_base = GEN11_VEBOX2_RING_BASE, .mmio_base = VEBOX2_RING_BASE,
}, },
[XE_HW_ENGINE_VECS2] = { [XE_HW_ENGINE_VECS2] = {
.name = "vecs2", .name = "vecs2",
...@@ -194,28 +194,28 @@ static const struct engine_info engine_infos[] = { ...@@ -194,28 +194,28 @@ static const struct engine_info engine_infos[] = {
.class = XE_ENGINE_CLASS_COMPUTE, .class = XE_ENGINE_CLASS_COMPUTE,
.instance = 0, .instance = 0,
.domain = XE_FW_RENDER, .domain = XE_FW_RENDER,
.mmio_base = GEN12_COMPUTE0_RING_BASE, .mmio_base = COMPUTE0_RING_BASE,
}, },
[XE_HW_ENGINE_CCS1] = { [XE_HW_ENGINE_CCS1] = {
.name = "ccs1", .name = "ccs1",
.class = XE_ENGINE_CLASS_COMPUTE, .class = XE_ENGINE_CLASS_COMPUTE,
.instance = 1, .instance = 1,
.domain = XE_FW_RENDER, .domain = XE_FW_RENDER,
.mmio_base = GEN12_COMPUTE1_RING_BASE, .mmio_base = COMPUTE1_RING_BASE,
}, },
[XE_HW_ENGINE_CCS2] = { [XE_HW_ENGINE_CCS2] = {
.name = "ccs2", .name = "ccs2",
.class = XE_ENGINE_CLASS_COMPUTE, .class = XE_ENGINE_CLASS_COMPUTE,
.instance = 2, .instance = 2,
.domain = XE_FW_RENDER, .domain = XE_FW_RENDER,
.mmio_base = GEN12_COMPUTE2_RING_BASE, .mmio_base = COMPUTE2_RING_BASE,
}, },
[XE_HW_ENGINE_CCS3] = { [XE_HW_ENGINE_CCS3] = {
.name = "ccs3", .name = "ccs3",
.class = XE_ENGINE_CLASS_COMPUTE, .class = XE_ENGINE_CLASS_COMPUTE,
.instance = 3, .instance = 3,
.domain = XE_FW_RENDER, .domain = XE_FW_RENDER,
.mmio_base = GEN12_COMPUTE3_RING_BASE, .mmio_base = COMPUTE3_RING_BASE,
}, },
}; };
...@@ -254,14 +254,14 @@ void xe_hw_engine_enable_ring(struct xe_hw_engine *hwe) ...@@ -254,14 +254,14 @@ void xe_hw_engine_enable_ring(struct xe_hw_engine *hwe)
xe_hw_engine_mask_per_class(hwe->gt, XE_ENGINE_CLASS_COMPUTE); xe_hw_engine_mask_per_class(hwe->gt, XE_ENGINE_CLASS_COMPUTE);
if (hwe->class == XE_ENGINE_CLASS_COMPUTE && ccs_mask) if (hwe->class == XE_ENGINE_CLASS_COMPUTE && ccs_mask)
xe_mmio_write32(hwe->gt, GEN12_RCU_MODE.reg, xe_mmio_write32(hwe->gt, RCU_MODE.reg,
_MASKED_BIT_ENABLE(GEN12_RCU_MODE_CCS_ENABLE)); _MASKED_BIT_ENABLE(RCU_MODE_CCS_ENABLE));
hw_engine_mmio_write32(hwe, RING_HWSTAM(0).reg, ~0x0); hw_engine_mmio_write32(hwe, RING_HWSTAM(0).reg, ~0x0);
hw_engine_mmio_write32(hwe, RING_HWS_PGA(0).reg, hw_engine_mmio_write32(hwe, RING_HWS_PGA(0).reg,
xe_bo_ggtt_addr(hwe->hwsp)); xe_bo_ggtt_addr(hwe->hwsp));
hw_engine_mmio_write32(hwe, RING_MODE_GEN7(0).reg, hw_engine_mmio_write32(hwe, RING_MODE(0).reg,
_MASKED_BIT_ENABLE(GEN11_GFX_DISABLE_LEGACY_MODE)); _MASKED_BIT_ENABLE(GFX_DISABLE_LEGACY_MODE));
hw_engine_mmio_write32(hwe, RING_MI_MODE(0).reg, hw_engine_mmio_write32(hwe, RING_MI_MODE(0).reg,
_MASKED_BIT_DISABLE(STOP_RING)); _MASKED_BIT_DISABLE(STOP_RING));
hw_engine_mmio_read32(hwe, RING_MI_MODE(0).reg); hw_engine_mmio_read32(hwe, RING_MI_MODE(0).reg);
...@@ -379,7 +379,7 @@ static void read_media_fuses(struct xe_gt *gt) ...@@ -379,7 +379,7 @@ static void read_media_fuses(struct xe_gt *gt)
xe_force_wake_assert_held(gt_to_fw(gt), XE_FW_GT); xe_force_wake_assert_held(gt_to_fw(gt), XE_FW_GT);
media_fuse = xe_mmio_read32(gt, GEN11_GT_VEBOX_VDBOX_DISABLE.reg); media_fuse = xe_mmio_read32(gt, GT_VEBOX_VDBOX_DISABLE.reg);
/* /*
* Pre-Xe_HP platforms had register bits representing absent engines, * Pre-Xe_HP platforms had register bits representing absent engines,
...@@ -390,8 +390,8 @@ static void read_media_fuses(struct xe_gt *gt) ...@@ -390,8 +390,8 @@ static void read_media_fuses(struct xe_gt *gt)
if (GRAPHICS_VERx100(xe) < 1250) if (GRAPHICS_VERx100(xe) < 1250)
media_fuse = ~media_fuse; media_fuse = ~media_fuse;
vdbox_mask = REG_FIELD_GET(GEN11_GT_VDBOX_DISABLE_MASK, media_fuse); vdbox_mask = REG_FIELD_GET(GT_VDBOX_DISABLE_MASK, media_fuse);
vebox_mask = REG_FIELD_GET(GEN11_GT_VEBOX_DISABLE_MASK, media_fuse); vebox_mask = REG_FIELD_GET(GT_VEBOX_DISABLE_MASK, media_fuse);
for (i = XE_HW_ENGINE_VCS0, j = 0; i <= XE_HW_ENGINE_VCS7; ++i, ++j) { for (i = XE_HW_ENGINE_VCS0, j = 0; i <= XE_HW_ENGINE_VCS7; ++i, ++j) {
if (!(gt->info.engine_mask & BIT(i))) if (!(gt->info.engine_mask & BIT(i)))
...@@ -421,8 +421,8 @@ static void read_copy_fuses(struct xe_gt *gt) ...@@ -421,8 +421,8 @@ static void read_copy_fuses(struct xe_gt *gt)
xe_force_wake_assert_held(gt_to_fw(gt), XE_FW_GT); xe_force_wake_assert_held(gt_to_fw(gt), XE_FW_GT);
bcs_mask = xe_mmio_read32(gt, GEN10_MIRROR_FUSE3.reg); bcs_mask = xe_mmio_read32(gt, MIRROR_FUSE3.reg);
bcs_mask = REG_FIELD_GET(GEN12_MEML3_EN_MASK, bcs_mask); bcs_mask = REG_FIELD_GET(MEML3_EN_MASK, bcs_mask);
/* BCS0 is always present; only BCS1-BCS8 may be fused off */ /* BCS0 is always present; only BCS1-BCS8 may be fused off */
for (int i = XE_HW_ENGINE_BCS1, j = 0; i <= XE_HW_ENGINE_BCS8; ++i, ++j) { for (int i = XE_HW_ENGINE_BCS1, j = 0; i <= XE_HW_ENGINE_BCS8; ++i, ++j) {
...@@ -546,7 +546,7 @@ void xe_hw_engine_print_state(struct xe_hw_engine *hwe, struct drm_printer *p) ...@@ -546,7 +546,7 @@ void xe_hw_engine_print_state(struct xe_hw_engine *hwe, struct drm_printer *p)
drm_printf(p, "\tRING_MODE: 0x%08x\n", drm_printf(p, "\tRING_MODE: 0x%08x\n",
hw_engine_mmio_read32(hwe, RING_MI_MODE(0).reg)); hw_engine_mmio_read32(hwe, RING_MI_MODE(0).reg));
drm_printf(p, "\tRING_MODE_GEN7: 0x%08x\n", drm_printf(p, "\tRING_MODE_GEN7: 0x%08x\n",
hw_engine_mmio_read32(hwe, RING_MODE_GEN7(0).reg)); hw_engine_mmio_read32(hwe, RING_MODE(0).reg));
drm_printf(p, "\tRING_IMR: 0x%08x\n", drm_printf(p, "\tRING_IMR: 0x%08x\n",
hw_engine_mmio_read32(hwe, RING_IMR(0).reg)); hw_engine_mmio_read32(hwe, RING_IMR(0).reg));
...@@ -573,8 +573,8 @@ void xe_hw_engine_print_state(struct xe_hw_engine *hwe, struct drm_printer *p) ...@@ -573,8 +573,8 @@ void xe_hw_engine_print_state(struct xe_hw_engine *hwe, struct drm_printer *p)
hw_engine_mmio_read32(hwe, IPEHR(0).reg)); hw_engine_mmio_read32(hwe, IPEHR(0).reg));
if (hwe->class == XE_ENGINE_CLASS_COMPUTE) if (hwe->class == XE_ENGINE_CLASS_COMPUTE)
drm_printf(p, "\tGEN12_RCU_MODE: 0x%08x\n", drm_printf(p, "\tRCU_MODE: 0x%08x\n",
xe_mmio_read32(hwe->gt, GEN12_RCU_MODE.reg)); xe_mmio_read32(hwe->gt, RCU_MODE.reg));
} }
......
drivers/gpu/drm/xe/xe_mmio.c
View file @ d9b79ad2
...@@ -158,7 +158,8 @@ int xe_mmio_total_vram_size(struct xe_device *xe, u64 *vram_size, u64 *usable_si ...@@ -158,7 +158,8 @@ int xe_mmio_total_vram_size(struct xe_device *xe, u64 *vram_size, u64 *usable_si
if (!xe->info.has_flat_ccs) { if (!xe->info.has_flat_ccs) {
*vram_size = pci_resource_len(pdev, GEN12_LMEM_BAR); *vram_size = pci_resource_len(pdev, GEN12_LMEM_BAR);
if (usable_size) if (usable_size)
*usable_size = min(*vram_size, xe_mmio_read64(gt, GEN12_GSMBASE.reg)); *usable_size = min(*vram_size,
xe_mmio_read64(gt, GSMBASE.reg));
return 0; return 0;
} }
......
drivers/gpu/drm/xe/xe_mocs.c
View file @ d9b79ad2
...@@ -512,8 +512,9 @@ static void init_l3cc_table(struct xe_gt *gt, ...@@ -512,8 +512,9 @@ static void init_l3cc_table(struct xe_gt *gt,
(l3cc = l3cc_combine(get_entry_l3cc(info, 2 * i), (l3cc = l3cc_combine(get_entry_l3cc(info, 2 * i),
get_entry_l3cc(info, 2 * i + 1))), 1 : 0; get_entry_l3cc(info, 2 * i + 1))), 1 : 0;
i++) { i++) {
mocs_dbg(&gt->xe->drm, "%d 0x%x 0x%x\n", i, GEN9_LNCFCMOCS(i).reg, l3cc); mocs_dbg(&gt->xe->drm, "%d 0x%x 0x%x\n", i, LNCFCMOCS(i).reg,
xe_mmio_write32(gt, GEN9_LNCFCMOCS(i).reg, l3cc); l3cc);
xe_mmio_write32(gt, LNCFCMOCS(i).reg, l3cc);
} }
} }
...@@ -531,7 +532,7 @@ void xe_mocs_init(struct xe_gt *gt) ...@@ -531,7 +532,7 @@ void xe_mocs_init(struct xe_gt *gt)
gt->mocs.wb_index = table.wb_index; gt->mocs.wb_index = table.wb_index;
if (flags & HAS_GLOBAL_MOCS) if (flags & HAS_GLOBAL_MOCS)
__init_mocs_table(gt, &table, GEN12_GLOBAL_MOCS(0).reg); __init_mocs_table(gt, &table, GLOBAL_MOCS(0).reg);
/* /*
* Initialize the L3CC table as part of mocs initalization to make * Initialize the L3CC table as part of mocs initalization to make
......
drivers/gpu/drm/xe/xe_reg_whitelist.c
View file @ d9b79ad2
...@@ -31,7 +31,7 @@ static const struct xe_rtp_entry register_whitelist[] = { ...@@ -31,7 +31,7 @@ static const struct xe_rtp_entry register_whitelist[] = {
}, },
{ XE_RTP_NAME("1508744258, 14012131227, 1808121037"), { XE_RTP_NAME("1508744258, 14012131227, 1808121037"),
XE_RTP_RULES(GRAPHICS_VERSION_RANGE(1200, 1210), ENGINE_CLASS(RENDER)), XE_RTP_RULES(GRAPHICS_VERSION_RANGE(1200, 1210), ENGINE_CLASS(RENDER)),
XE_RTP_ACTIONS(WHITELIST(GEN7_COMMON_SLICE_CHICKEN1, 0)) XE_RTP_ACTIONS(WHITELIST(COMMON_SLICE_CHICKEN1, 0))
}, },
{ XE_RTP_NAME("1806527549"), { XE_RTP_NAME("1806527549"),
XE_RTP_RULES(GRAPHICS_VERSION_RANGE(1200, 1210), ENGINE_CLASS(RENDER)), XE_RTP_RULES(GRAPHICS_VERSION_RANGE(1200, 1210), ENGINE_CLASS(RENDER)),
......
drivers/gpu/drm/xe/xe_ring_ops.c
View file @ d9b79ad2
...@@ -85,7 +85,7 @@ static int emit_flush_imm_ggtt(u32 addr, u32 value, u32 *dw, int i) ...@@ -85,7 +85,7 @@ static int emit_flush_imm_ggtt(u32 addr, u32 value, u32 *dw, int i)
static int emit_bb_start(u64 batch_addr, u32 ppgtt_flag, u32 *dw, int i) static int emit_bb_start(u64 batch_addr, u32 ppgtt_flag, u32 *dw, int i)
{ {
dw[i++] = MI_BATCH_BUFFER_START_GEN8 | ppgtt_flag; dw[i++] = MI_BATCH_BUFFER_START | ppgtt_flag;
dw[i++] = lower_32_bits(batch_addr); dw[i++] = lower_32_bits(batch_addr);
dw[i++] = upper_32_bits(batch_addr); dw[i++] = upper_32_bits(batch_addr);
...@@ -202,9 +202,9 @@ static void __emit_job_gen12_video(struct xe_sched_job *job, struct xe_lrc *lrc, ...@@ -202,9 +202,9 @@ static void __emit_job_gen12_video(struct xe_sched_job *job, struct xe_lrc *lrc,
/* Wa_1809175790 */ /* Wa_1809175790 */
if (!xe->info.has_flat_ccs) { if (!xe->info.has_flat_ccs) {
if (decode) if (decode)
i = emit_aux_table_inv(gt, GEN12_VD0_AUX_INV.reg, dw, i); i = emit_aux_table_inv(gt, VD0_AUX_INV.reg, dw, i);
else else
i = emit_aux_table_inv(gt, GEN12_VE0_AUX_INV.reg, dw, i); i = emit_aux_table_inv(gt, VE0_AUX_INV.reg, dw, i);
} }
dw[i++] = preparser_disable(false); dw[i++] = preparser_disable(false);
...@@ -246,7 +246,7 @@ static void __emit_job_gen12_render_compute(struct xe_sched_job *job, ...@@ -246,7 +246,7 @@ static void __emit_job_gen12_render_compute(struct xe_sched_job *job,
i = emit_pipe_invalidate(mask_flags, dw, i); i = emit_pipe_invalidate(mask_flags, dw, i);
/* Wa_1809175790 */ /* Wa_1809175790 */
if (!xe->info.has_flat_ccs) if (!xe->info.has_flat_ccs)
i = emit_aux_table_inv(gt, GEN12_CCS_AUX_INV.reg, dw, i); i = emit_aux_table_inv(gt, CCS_AUX_INV.reg, dw, i);
dw[i++] = preparser_disable(false); dw[i++] = preparser_disable(false);
i = emit_store_imm_ggtt(xe_lrc_start_seqno_ggtt_addr(lrc), i = emit_store_imm_ggtt(xe_lrc_start_seqno_ggtt_addr(lrc),
......
drivers/gpu/drm/xe/xe_ttm_stolen_mgr.c
View file @ d9b79ad2
...@@ -65,7 +65,7 @@ static s64 detect_bar2_dgfx(struct xe_device *xe, struct xe_ttm_stolen_mgr *mgr) ...@@ -65,7 +65,7 @@ static s64 detect_bar2_dgfx(struct xe_device *xe, struct xe_ttm_stolen_mgr *mgr)
} }
/* Use DSM base address instead for stolen memory */ /* Use DSM base address instead for stolen memory */
mgr->stolen_base = xe_mmio_read64(gt, GEN12_DSMBASE.reg) & GEN12_BDSM_MASK; mgr->stolen_base = xe_mmio_read64(gt, DSMBASE.reg) & BDSM_MASK;
if (drm_WARN_ON(&xe->drm, vram_size < mgr->stolen_base)) if (drm_WARN_ON(&xe->drm, vram_size < mgr->stolen_base))
return 0; return 0;
......
drivers/gpu/drm/xe/xe_tuning.c
View file @ d9b79ad2
...@@ -33,7 +33,7 @@ static const struct xe_rtp_entry lrc_tunings[] = { ...@@ -33,7 +33,7 @@ static const struct xe_rtp_entry lrc_tunings[] = {
{ XE_RTP_NAME("Tuning: ganged timer, also known as 16011163337"), { XE_RTP_NAME("Tuning: ganged timer, also known as 16011163337"),
XE_RTP_RULES(GRAPHICS_VERSION_RANGE(1200, 1210)), XE_RTP_RULES(GRAPHICS_VERSION_RANGE(1200, 1210)),
/* read verification is ignored due to 1608008084. */ /* read verification is ignored due to 1608008084. */
XE_RTP_ACTIONS(FIELD_SET_NO_READ_MASK(GEN12_FF_MODE2, XE_RTP_ACTIONS(FIELD_SET_NO_READ_MASK(FF_MODE2,
FF_MODE2_GS_TIMER_MASK, FF_MODE2_GS_TIMER_MASK,
FF_MODE2_GS_TIMER_224)) FF_MODE2_GS_TIMER_224))
}, },
......
drivers/gpu/drm/xe/xe_wa.c
View file @ d9b79ad2
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7