Skip to content

Commit 0ddae02

Browse files
committed
drm/i915: Disable compression tricks on JSL
Bspec asks us to disable some compression trick on JSL. While the bspec description is pretty vague it looks like this is some extra trick for 10bpc+ CCS which presumably the ICL derived display engine doesn't support. Note that we aren't currently exposing 10bpc CCS scanout support, but once that gets added this presumably becomes an issue. Signed-off-by: Ville Syrjälä <[email protected]> Link: https://patchwork.freedesktop.org/patch/msgid/[email protected] Reviewed-by: Juha-Pekka Heikkila <[email protected]>
1 parent d92df66 commit 0ddae02

File tree

2 files changed

+10
-0
lines changed

2 files changed

+10
-0
lines changed

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -432,6 +432,7 @@
432432
#define XEHPG_INSTDONE_GEOM_SVG MCR_REG(0x666c)
433433

434434
#define CACHE_MODE_0_GEN7 _MMIO(0x7000) /* IVB+ */
435+
#define DISABLE_REPACKING_FOR_COMPRESSION REG_BIT(15) /* jsl+ */
435436
#define RC_OP_FLUSH_ENABLE (1 << 0)
436437
#define HIZ_RAW_STALL_OPT_DISABLE (1 << 2)
437438
#define CACHE_MODE_1 _MMIO(0x7004) /* IVB+ */

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

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2299,6 +2299,15 @@ rcs_engine_wa_init(struct intel_engine_cs *engine, struct i915_wa_list *wal)
22992299
GEN8_RC_SEMA_IDLE_MSG_DISABLE);
23002300
}
23012301

2302+
if (IS_JASPERLAKE(i915) || IS_ELKHARTLAKE(i915)) {
2303+
/*
2304+
* "Disable Repacking for Compression (masked R/W access)
2305+
* before rendering compressed surfaces for display."
2306+
*/
2307+
wa_masked_en(wal, CACHE_MODE_0_GEN7,
2308+
DISABLE_REPACKING_FOR_COMPRESSION);
2309+
}
2310+
23022311
if (GRAPHICS_VER(i915) == 11) {
23032312
/* This is not an Wa. Enable for better image quality */
23042313
wa_masked_en(wal,

0 commit comments

Comments
 (0)