Skip to content

Commit 7b9005c

Browse files
committed
drm/i915: Add WaInsertDummyPushConstP for bxt and kbl
Add this workaround for both bxt and kbl up to until rev B0. References: HSD#2136703 Signed-off-by: Mika Kuoppala <mika.kuoppala@intel.com> Reviewed-by: Matthew Auld <matthew.auld@intel.com> Link: http://patchwork.freedesktop.org/patch/msgid/1465309159-30531-16-git-send-email-mika.kuoppala@intel.com (cherry picked from commit ad2bdb4) Signed-off-by: Mika Kuoppala <mika.kuoppala@intel.com>
1 parent b904204 commit 7b9005c

File tree

2 files changed

+11
-0
lines changed

2 files changed

+11
-0
lines changed

drivers/gpu/drm/i915/i915_reg.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6084,6 +6084,7 @@ enum skl_disp_power_wells {
60846084
# define GEN7_CSC1_RHWO_OPT_DISABLE_IN_RCC ((1<<10) | (1<<26))
60856085
# define GEN9_RHWO_OPTIMIZATION_DISABLE (1<<14)
60866086
#define COMMON_SLICE_CHICKEN2 _MMIO(0x7014)
6087+
# define GEN8_SBE_DISABLE_REPLAY_BUF_OPTIMIZATION (1<<8)
60876088
# define GEN8_CSC2_SBE_VUE_CACHE_CONSERVATIVE (1<<0)
60886089

60896090
#define HIZ_CHICKEN _MMIO(0x7018)

drivers/gpu/drm/i915/intel_ringbuffer.c

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1186,6 +1186,11 @@ static int bxt_init_workarounds(struct intel_engine_cs *engine)
11861186
return ret;
11871187
}
11881188

1189+
/* WaInsertDummyPushConstPs:bxt */
1190+
if (IS_BXT_REVID(dev_priv, 0, BXT_REVID_B0))
1191+
WA_SET_BIT_MASKED(COMMON_SLICE_CHICKEN2,
1192+
GEN8_SBE_DISABLE_REPLAY_BUF_OPTIMIZATION);
1193+
11891194
return 0;
11901195
}
11911196

@@ -1220,6 +1225,11 @@ static int kbl_init_workarounds(struct intel_engine_cs *engine)
12201225
I915_WRITE(GEN8_L3SQCREG4, I915_READ(GEN8_L3SQCREG4) |
12211226
GEN8_LQSC_RO_PERF_DIS);
12221227

1228+
/* WaInsertDummyPushConstPs:kbl */
1229+
if (IS_KBL_REVID(dev_priv, 0, KBL_REVID_B0))
1230+
WA_SET_BIT_MASKED(COMMON_SLICE_CHICKEN2,
1231+
GEN8_SBE_DISABLE_REPLAY_BUF_OPTIMIZATION);
1232+
12231233
/* WaDisableLSQCROPERFforOCL:kbl */
12241234
ret = wa_ring_whitelist_reg(engine, GEN8_L3SQCREG4);
12251235
if (ret)

0 commit comments

Comments
 (0)