Skip to content

Commit 081cb89

Browse files
guludomattrope
authored andcommitted
drm/xe/xe3: Add initial set of workarounds
Implement the initial set of workarounds for Xe3 IPs. Signed-off-by: Gustavo Sousa <[email protected]> Signed-off-by: Matt Atwood <[email protected]> Reviewed-by: Matt Roper <[email protected]> Signed-off-by: Matt Roper <[email protected]> Link: https://patchwork.freedesktop.org/patch/msgid/[email protected]
1 parent 7a7593e commit 081cb89

File tree

4 files changed

+52
-0
lines changed

4 files changed

+52
-0
lines changed

drivers/gpu/drm/xe/regs/xe_engine_regs.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -186,6 +186,7 @@
186186

187187
#define VDBOX_CGCTL3F10(base) XE_REG((base) + 0x3f10)
188188
#define IECPUNIT_CLKGATE_DIS REG_BIT(22)
189+
#define RAMDFTUNIT_CLKGATE_DIS REG_BIT(9)
189190

190191
#define VDBOX_CGCTL3F18(base) XE_REG((base) + 0x3f18)
191192
#define ALNUNIT_CLKGATE_DIS REG_BIT(13)

drivers/gpu/drm/xe/regs/xe_gt_regs.h

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -286,6 +286,9 @@
286286
#define GAMTLBVEBOX0_CLKGATE_DIS REG_BIT(16)
287287
#define LTCDD_CLKGATE_DIS REG_BIT(10)
288288

289+
#define UNSLCGCTL9454 XE_REG(0x9454)
290+
#define LSCFE_CLKGATE_DIS REG_BIT(4)
291+
289292
#define XEHP_SLICE_UNIT_LEVEL_CLKGATE XE_REG_MCR(0x94d4)
290293
#define L3_CR2X_CLKGATE_DIS REG_BIT(17)
291294
#define L3_CLKGATE_DIS REG_BIT(16)

drivers/gpu/drm/xe/xe_wa.c

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -252,6 +252,34 @@ static const struct xe_rtp_entry_sr gt_was[] = {
252252
XE_RTP_ENTRY_FLAG(FOREACH_ENGINE),
253253
},
254254

255+
/* Xe3_LPG */
256+
257+
{ XE_RTP_NAME("14021871409"),
258+
XE_RTP_RULES(GRAPHICS_VERSION(3000), GRAPHICS_STEP(A0, B0)),
259+
XE_RTP_ACTIONS(SET(UNSLCGCTL9454, LSCFE_CLKGATE_DIS))
260+
},
261+
262+
/* Xe3_LPM */
263+
264+
{ XE_RTP_NAME("16021867713"),
265+
XE_RTP_RULES(MEDIA_VERSION(3000),
266+
ENGINE_CLASS(VIDEO_DECODE)),
267+
XE_RTP_ACTIONS(SET(VDBOX_CGCTL3F1C(0), MFXPIPE_CLKGATE_DIS)),
268+
XE_RTP_ENTRY_FLAG(FOREACH_ENGINE),
269+
},
270+
{ XE_RTP_NAME("16021865536"),
271+
XE_RTP_RULES(MEDIA_VERSION(3000),
272+
ENGINE_CLASS(VIDEO_DECODE)),
273+
XE_RTP_ACTIONS(SET(VDBOX_CGCTL3F10(0), IECPUNIT_CLKGATE_DIS)),
274+
XE_RTP_ENTRY_FLAG(FOREACH_ENGINE),
275+
},
276+
{ XE_RTP_NAME("14021486841"),
277+
XE_RTP_RULES(MEDIA_VERSION(3000), MEDIA_STEP(A0, B0),
278+
ENGINE_CLASS(VIDEO_DECODE)),
279+
XE_RTP_ACTIONS(SET(VDBOX_CGCTL3F10(0), RAMDFTUNIT_CLKGATE_DIS)),
280+
XE_RTP_ENTRY_FLAG(FOREACH_ENGINE),
281+
},
282+
255283
{}
256284
};
257285

@@ -568,6 +596,13 @@ static const struct xe_rtp_entry_sr engine_was[] = {
568596
XE_RTP_ACTION_FLAG(ENGINE_BASE)))
569597
},
570598

599+
/* Xe3_LPG */
600+
601+
{ XE_RTP_NAME("14021402888"),
602+
XE_RTP_RULES(GRAPHICS_VERSION_RANGE(3000, 3001), FUNC(xe_rtp_match_first_render_or_compute)),
603+
XE_RTP_ACTIONS(SET(HALF_SLICE_CHICKEN7, CLEAR_OPTIMIZATION_DISABLE))
604+
},
605+
571606
{}
572607
};
573608

@@ -739,6 +774,18 @@ static const struct xe_rtp_entry_sr lrc_was[] = {
739774
XE_RTP_ACTIONS(SET(CHICKEN_RASTER_1, DIS_CLIP_NEGATIVE_BOUNDING_BOX))
740775
},
741776

777+
/* Xe3_LPG */
778+
{ XE_RTP_NAME("14021490052"),
779+
XE_RTP_RULES(GRAPHICS_VERSION(3000), GRAPHICS_STEP(A0, B0),
780+
ENGINE_CLASS(RENDER)),
781+
XE_RTP_ACTIONS(SET(FF_MODE,
782+
DIS_MESH_PARTIAL_AUTOSTRIP |
783+
DIS_MESH_AUTOSTRIP),
784+
SET(VFLSKPD,
785+
DIS_PARTIAL_AUTOSTRIP |
786+
DIS_AUTOSTRIP))
787+
},
788+
742789
{}
743790
};
744791

drivers/gpu/drm/xe/xe_wa_oob.rules

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333
GRAPHICS_VERSION(2004)
3434
22019338487 MEDIA_VERSION(2000)
3535
GRAPHICS_VERSION(2001)
36+
MEDIA_VERSION(3000), MEDIA_STEP(A0, B0)
3637
22019338487_display PLATFORM(LUNARLAKE)
3738
16023588340 GRAPHICS_VERSION(2001)
3839
14019789679 GRAPHICS_VERSION(1255)

0 commit comments

Comments
 (0)