drm/i915/gt: Convert PSS_MODE2 to multicast register
Subsystems (2)
PATCH 1/1 drm/i915/gt: Convert PSS_MODE2 to multicast register
That register became a multicast register as of Xe_HP and it is currently used only for DG2. Use a proper prefix since there could be usage of the same register for previous platforms in the future, which would require a different definition (i.e. using _MMIO).
--- drivers/gpu/drm/i915/gt/intel_gt_regs.h | 2 +- drivers/gpu/drm/i915/gt/intel_workarounds.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-)
drivers/gpu/drm/i915/gt/intel_gt_regs.h +1 -1
@@ -464,7 +464,7 @@#define GEN8_L3CNTLREG _MMIO(0x7034)#define GEN8_ERRDETBCTRL (1 << 9) -#define PSS_MODE2 _MMIO(0x703c) +#define XEHP_PSS_MODE2 MCR_REG(0x703c)#define SCOREBOARD_STALL_FLUSH_CONTROL REG_BIT(5)#define GEN7_SC_INSTDONE _MMIO(0x7100)
drivers/gpu/drm/i915/gt/intel_workarounds.c +2 -2
@@ -793,7 +793,7 @@ static void dg2_ctx_workarounds_init(struct intel_engine_cs *engine,/* Wa_18018764978:dg2 */ if (IS_DG2_GRAPHICS_STEP (engine->i915,G10 ,STEP_C0 ,STEP_FOREVER ) ||IS_DG2_G11 (engine->i915) ||IS_DG2_G12 (engine->i915)) -wa_masked_en (wal,PSS_MODE2 ,SCOREBOARD_STALL_FLUSH_CONTROL ); +wa_mcr_masked_en (wal,XEHP_PSS_MODE2 ,SCOREBOARD_STALL_FLUSH_CONTROL );/* Wa_15010599737:dg2 */ wa_mcr_masked_en (wal,CHICKEN_RASTER_1 ,DIS_SF_ROUND_NEAREST_EVEN );
@@ -821,7 +821,7 @@ static void mtl_ctx_workarounds_init(struct intel_engine_cs *engine,wa_mcr_masked_en (wal,VFLSKPD ,VF_PREFETCH_TLB_DIS );/* Wa_18018764978 */ -wa_masked_en (wal,PSS_MODE2 ,SCOREBOARD_STALL_FLUSH_CONTROL ); +wa_mcr_masked_en (wal,XEHP_PSS_MODE2 ,SCOREBOARD_STALL_FLUSH_CONTROL ); }/* Wa_18019271663 */
Signature · 1 line
2.39.0
Quoted 4 lines · Gustavo Sousa
That register became a multicast register as of
Xe_HPand it is currently used only for DG2. Use a proper prefix since there could be usage of the same register for previous platforms in the future, which would require a different definition (i.e. using_MMIO).
It might be worth including a quick note here that this oversight doesn't actually cause any functional problems on DG2 because the workaround-only usage of the register will still wind up happening in a multicast manner regardless. The fix is mostly just for consistency and future-proofing the code.
Aside from that,
Quoted 48 lines
Signed-off-by Gustavo Sousa <[email protected]>Cc Matt Roper <[email protected]>Cc Matthew Atwood <[email protected]>Fixes 468a4e630c7d ("drm/i915/dg2: Introduce Wa_18018764978")--- drivers/gpu/drm/i915/gt/intel_gt_regs.h | 2 +- drivers/gpu/drm/i915/gt/intel_workarounds.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-)drivers/gpu/drm/i915/gt/intel_gt_regs.h +1
-1@@ -464,7 +464,7 @@#define GEN8_L3CNTLREG _MMIO(0x7034)#define GEN8_ERRDETBCTRL (1 << 9) -#define PSS_MODE2 _MMIO(0x703c) +#define XEHP_PSS_MODE2 MCR_REG(0x703c)#define SCOREBOARD_STALL_FLUSH_CONTROL REG_BIT(5)#define GEN7_SC_INSTDONE _MMIO(0x7100)drivers/gpu/drm/i915/gt/intel_workarounds.c +2
-2@@ -793,7 +793,7 @@ static void dg2_ctx_workarounds_init(struct intel_engine_cs *engine,/* Wa_18018764978:dg2 */ if (IS_DG2_GRAPHICS_STEP (engine->i915,G10 ,STEP_C0 ,STEP_FOREVER ) ||IS_DG2_G11 (engine->i915) ||IS_DG2_G12 (engine->i915)) -wa_masked_en (wal,PSS_MODE2 ,SCOREBOARD_STALL_FLUSH_CONTROL ); +wa_mcr_masked_en (wal,XEHP_PSS_MODE2 ,SCOREBOARD_STALL_FLUSH_CONTROL );/* Wa_15010599737:dg2 */ wa_mcr_masked_en (wal,CHICKEN_RASTER_1 ,DIS_SF_ROUND_NEAREST_EVEN );@@ -821,7 +821,7 @@ static void mtl_ctx_workarounds_init(struct intel_engine_cs *engine,wa_mcr_masked_en (wal,VFLSKPD ,VF_PREFETCH_TLB_DIS );/* Wa_18018764978 */ -wa_masked_en (wal,PSS_MODE2 ,SCOREBOARD_STALL_FLUSH_CONTROL ); +wa_mcr_masked_en (wal,XEHP_PSS_MODE2 ,SCOREBOARD_STALL_FLUSH_CONTROL ); }/* Wa_18019271663 */ Signature · 1 line
2.39.0
Signature · 4 lines
Matt Roper Graphics Software Engineer Linux GPU Platform Enablement Intel Corporation
Quoted 12 lines · Matt Roper
Quoted 4 lines · Gustavo Sousa
That register became a multicast register as of
Xe_HPand it is currently used only for DG2. Use a proper prefix since there could be usage of the same register for previous platforms in the future, which would require a different definition (i.e. using_MMIO).It might be worth including a quick note here that this oversight doesn't actually cause any functional problems on DG2 because the workaround-only usage of the register will still wind up happening in a multicast manner regardless. The fix is mostly just for consistency and future-proofing the code.
Quoted 3 lines
Aside from that,
Reviewed-by Matt Roper <[email protected]>
Thanks for the review, Matt! Just sent a v2.
Quoted 55 lines
Quoted 49 lines
Signed-off-by Gustavo Sousa <[email protected]>Cc Matt Roper <[email protected]>Cc Matthew Atwood <[email protected]>Fixes 468a4e630c7d ("drm/i915/dg2: Introduce Wa_18018764978")--- drivers/gpu/drm/i915/gt/intel_gt_regs.h | 2 +- drivers/gpu/drm/i915/gt/intel_workarounds.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-)drivers/gpu/drm/i915/gt/intel_gt_regs.h +1
-1@@ -464,7 +464,7 @@#define GEN8_L3CNTLREG _MMIO(0x7034)#define GEN8_ERRDETBCTRL (1 << 9) -#define PSS_MODE2 _MMIO(0x703c) +#define XEHP_PSS_MODE2 MCR_REG(0x703c)#define SCOREBOARD_STALL_FLUSH_CONTROL REG_BIT(5)#define GEN7_SC_INSTDONE _MMIO(0x7100)drivers/gpu/drm/i915/gt/intel_workarounds.c +2
-2@@ -793,7 +793,7 @@ static void dg2_ctx_workarounds_init(struct intel_engine_cs *engine,/* Wa_18018764978:dg2 */ if (IS_DG2_GRAPHICS_STEP (engine->i915,G10 ,STEP_C0 ,STEP_FOREVER ) ||IS_DG2_G11 (engine->i915) ||IS_DG2_G12 (engine->i915)) -wa_masked_en (wal,PSS_MODE2 ,SCOREBOARD_STALL_FLUSH_CONTROL ); +wa_mcr_masked_en (wal,XEHP_PSS_MODE2 ,SCOREBOARD_STALL_FLUSH_CONTROL );/* Wa_15010599737:dg2 */ wa_mcr_masked_en (wal,CHICKEN_RASTER_1 ,DIS_SF_ROUND_NEAREST_EVEN );@@ -821,7 +821,7 @@ static void mtl_ctx_workarounds_init(struct intel_engine_cs *engine,wa_mcr_masked_en (wal,VFLSKPD ,VF_PREFETCH_TLB_DIS );/* Wa_18018764978 */ -wa_masked_en (wal,PSS_MODE2 ,SCOREBOARD_STALL_FLUSH_CONTROL ); +wa_mcr_masked_en (wal,XEHP_PSS_MODE2 ,SCOREBOARD_STALL_FLUSH_CONTROL ); }/* Wa_18019271663 */ Signature · 1 line
2.39.0Signature · 4 lines
Matt Roper Graphics Software Engineer Linux GPU Platform Enablement Intel Corporation