Skip to content

Commit 58fc14e

Browse files
guludorodrigovivi
authored andcommitted
drm/i915/gt: Cover rest of SVG unit MCR registers
CHICKEN_RASTER_{1,2} got overlooked with the move done in commit a9e6942 ("drm/i915: Define MCR registers explicitly"). Registers from the SVG unit became multicast as of Xe_HP graphics. BSpec: 66534 Fixes: a9e6942 ("drm/i915: Define MCR registers explicitly") Signed-off-by: Gustavo Sousa <[email protected]> Cc: Matt Roper <[email protected]> Reviewed-by: Matt Roper <[email protected]> Signed-off-by: Matt Roper <[email protected]> Link: https://patchwork.freedesktop.org/patch/msgid/[email protected] (cherry picked from commit 10903b0) Signed-off-by: Rodrigo Vivi <[email protected]>
1 parent d3de561 commit 58fc14e

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

drivers/gpu/drm/i915/gt/intel_gt_regs.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -406,10 +406,10 @@
406406
#define GEN9_WM_CHICKEN3 _MMIO(0x5588)
407407
#define GEN9_FACTOR_IN_CLR_VAL_HIZ (1 << 9)
408408

409-
#define CHICKEN_RASTER_1 _MMIO(0x6204)
409+
#define CHICKEN_RASTER_1 MCR_REG(0x6204)
410410
#define DIS_SF_ROUND_NEAREST_EVEN REG_BIT(8)
411411

412-
#define CHICKEN_RASTER_2 _MMIO(0x6208)
412+
#define CHICKEN_RASTER_2 MCR_REG(0x6208)
413413
#define TBIMR_FAST_CLIP REG_BIT(5)
414414

415415
#define VFLSKPD MCR_REG(0x62a8)

drivers/gpu/drm/i915/gt/intel_workarounds.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -645,7 +645,7 @@ static void icl_ctx_workarounds_init(struct intel_engine_cs *engine,
645645
static void dg2_ctx_gt_tuning_init(struct intel_engine_cs *engine,
646646
struct i915_wa_list *wal)
647647
{
648-
wa_masked_en(wal, CHICKEN_RASTER_2, TBIMR_FAST_CLIP);
648+
wa_mcr_masked_en(wal, CHICKEN_RASTER_2, TBIMR_FAST_CLIP);
649649
wa_mcr_write_clr_set(wal, XEHP_L3SQCREG5, L3_PWM_TIMER_INIT_VAL_MASK,
650650
REG_FIELD_PREP(L3_PWM_TIMER_INIT_VAL_MASK, 0x7f));
651651
wa_mcr_add(wal,
@@ -775,7 +775,7 @@ static void dg2_ctx_workarounds_init(struct intel_engine_cs *engine,
775775
wa_masked_field_set(wal, VF_PREEMPTION, PREEMPTION_VERTEX_COUNT, 0x4000);
776776

777777
/* Wa_15010599737:dg2 */
778-
wa_masked_en(wal, CHICKEN_RASTER_1, DIS_SF_ROUND_NEAREST_EVEN);
778+
wa_mcr_masked_en(wal, CHICKEN_RASTER_1, DIS_SF_ROUND_NEAREST_EVEN);
779779
}
780780

781781
static void fakewa_disable_nestedbb_mode(struct intel_engine_cs *engine,

0 commit comments

Comments
 (0)