Skip to contentSkip to conversation

drm/i915/xelp: Add Wa_1806527549

PATCH Superseded Gustavo Sousa 4 participants 5 messages Oct 19, 2022 – Oct 21, 2022

Subsystems (2)

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 drm/i915/xelp: Add Wa_1806527549

Workaround to be applied to platforms using XE_LP graphics.

BSpec: 52890

---
 drivers/gpu/drm/i915/gt/intel_gt_regs.h     | 1 +
 drivers/gpu/drm/i915/gt/intel_workarounds.c | 7 +++++++
 2 files changed, 8 insertions(+)
drivers/gpu/drm/i915/gt/intel_gt_regs.h +1 -0
index 36d95b79022c..23844ba7e824 100644
@@ -443,6 +443,7 @@
 #define HIZ_CHICKEN				_MMIO(0x7018)
 #define   CHV_HZ_8X8_MODE_IN_1X			REG_BIT(15)
 #define   DG1_HZ_READ_SUPPRESSION_OPTIMIZATION_DISABLE	REG_BIT(14)
+#define   HZ_DEPTH_TEST_LE_GE_OPT_DISABLE	REG_BIT(13)
 #define   BDW_HIZ_POWER_COMPILER_CLOCK_GATING_DISABLE	REG_BIT(3)
 
 #define GEN8_L3CNTLREG				_MMIO(0x7034)
drivers/gpu/drm/i915/gt/intel_workarounds.c +7 -0
index 63e1e6becf34..5cdec699ae04 100644
@@ -660,6 +660,8 @@ static void gen12_ctx_gt_tuning_init(struct intel_engine_cs *engine,
 static void gen12_ctx_workarounds_init(struct intel_engine_cs *engine,
 				       struct i915_wa_list *wal)
 {
+	struct drm_i915_private *i915 = engine->i915;
+
 	gen12_ctx_gt_tuning_init(engine, wal);
 
 	/*
@@ -693,6 +695,11 @@ static void gen12_ctx_workarounds_init(struct intel_engine_cs *engine,
 	       FF_MODE2_GS_TIMER_MASK,
 	       FF_MODE2_GS_TIMER_224,
 	       0, false);
+
+	if (!IS_DG1(i915))
+		/* Wa_1806527549 */
+		wa_masked_en(wal, HIZ_CHICKEN, HZ_DEPTH_TEST_LE_GE_OPT_DISABLE);
+
 }
 
 static void dg1_ctx_workarounds_init(struct intel_engine_cs *engine,
Signature · 1 line
2.38.0
#1 lore raw

[Intel-gfx] ✗ Fi.CI.BAT: failure for drm/i915/xelp: Add Wa_1806527549

== Series Details ==

== Series Details ==

Series: drm/i915/xelp: Add Wa_1806527549
URL : https://patchwork.freedesktop.org/series/109885/
State : failure

== Summary ==

CI Bug Log - changes from CI_DRM_12261 -> Patchwork_109885v1
====================================================

Summary
-------

**FAILURE**

Serious unknown changes coming with Patchwork_109885v1 absolutely need to be verified manually.

If you think the reported changes have nothing to do with the changes introduced in Patchwork_109885v1, please notify your bug team to allow them to document this new failure mode, which will reduce false positives in CI.

External URL: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_109885v1/index.html

Participating hosts (42 -> 42)
------------------------------

Additional (3): fi-rkl-11600 fi-icl-u2 fi-tgl-dsi
Missing (3): fi-kbl-soraka fi-hsw-4770 bat-adlp-6

Possible new issues
-------------------

Here are the unknown changes that may have been introduced in Patchwork_109885v1:

### IGT changes ###

#### Possible regressions ####

* igt@i915_selftest@live@gem_contexts:
- fi-kbl-7567u: [PASS][1] -> [DMESG-FAIL][2]
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12261/fi-kbl-7567u/igt@i915_selftest@live@gem_contexts.html
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_109885v1/fi-kbl-7567u/igt@i915_selftest@live@gem_contexts.html

Known issues
------------

Here are the changes found in Patchwork_109885v1 that come from known issues:

### IGT changes ###

#### Issues hit ####

* igt@gem_exec_suspend@basic-s3@smem:
- fi-bdw-5557u: NOTRUN -> [INCOMPLETE][3] ([i915#146])
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_109885v1/fi-bdw-5557u/igt@gem_exec_suspend@[email protected]

* igt@gem_huc_copy@huc-copy:
- fi-icl-u2: NOTRUN -> [SKIP][4] ([i915#2190])
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_109885v1/fi-icl-u2/igt@[email protected]
- fi-rkl-11600: NOTRUN -> [SKIP][5] ([i915#2190])
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_109885v1/fi-rkl-11600/igt@[email protected]

* igt@gem_lmem_swapping@basic:
- fi-rkl-11600: NOTRUN -> [SKIP][6] ([i915#4613]) +3 similar issues
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_109885v1/fi-rkl-11600/igt@[email protected]

* igt@gem_tiled_pread_basic:
- fi-rkl-11600: NOTRUN -> [SKIP][7] ([i915#3282])
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_109885v1/fi-rkl-11600/igt@gem_tiled_pread_basic.html

* igt@i915_pm_backlight@basic-brightness:
- fi-rkl-11600: NOTRUN -> [SKIP][8] ([i915#3012])
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_109885v1/fi-rkl-11600/igt@[email protected]

* igt@i915_suspend@basic-s3-without-i915:
- fi-rkl-11600: NOTRUN -> [INCOMPLETE][9] ([i915#5982])
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_109885v1/fi-rkl-11600/igt@[email protected]

* igt@kms_chamelium@common-hpd-after-suspend:
- fi-ivb-3770: NOTRUN -> [SKIP][10] ([fdo#109271] / [fdo#111827])
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_109885v1/fi-ivb-3770/igt@[email protected]

* igt@kms_chamelium@hdmi-edid-read:
- fi-rkl-11600: NOTRUN -> [SKIP][11] ([fdo#111827]) +7 similar issues
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_109885v1/fi-rkl-11600/igt@[email protected]

* igt@kms_chamelium@hdmi-hpd-fast:
- fi-icl-u2: NOTRUN -> [SKIP][12] ([fdo#111827]) +7 similar issues
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_109885v1/fi-icl-u2/igt@[email protected]

* igt@kms_cursor_legacy@basic-busy-flip-before-cursor:
- fi-rkl-11600: NOTRUN -> [SKIP][13] ([i915#4103])
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_109885v1/fi-rkl-11600/igt@[email protected]
- fi-icl-u2: NOTRUN -> [SKIP][14] ([i915#4103])
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_109885v1/fi-icl-u2/igt@[email protected]

* igt@kms_flip@basic-flip-vs-modeset@a-edp1:
- fi-icl-u2: NOTRUN -> [DMESG-WARN][15] ([i915#4890])
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_109885v1/fi-icl-u2/igt@kms_flip@[email protected]

* igt@kms_force_connector_basic@force-load-detect:
- fi-rkl-11600: NOTRUN -> [SKIP][16] ([fdo#109285] / [i915#4098])
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_109885v1/fi-rkl-11600/igt@[email protected]

* igt@kms_psr@primary_page_flip:
- fi-rkl-11600: NOTRUN -> [SKIP][17] ([i915#1072]) +3 similar issues
[17]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_109885v1/fi-rkl-11600/igt@kms_psr@primary_page_flip.html

* igt@kms_setmode@basic-clone-single-crtc:
- fi-rkl-11600: NOTRUN -> [SKIP][18] ([i915#3555] / [i915#4098])
[18]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_109885v1/fi-rkl-11600/igt@[email protected]

* igt@prime_vgem@basic-read:
- fi-rkl-11600: NOTRUN -> [SKIP][19] ([fdo#109295] / [i915#3291] / [i915#3708]) +2 similar issues
[19]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_109885v1/fi-rkl-11600/igt@[email protected]

* igt@prime_vgem@basic-userptr:
- fi-rkl-11600: NOTRUN -> [SKIP][20] ([fdo#109295] / [i915#3301] / [i915#3708])
[20]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_109885v1/fi-rkl-11600/igt@[email protected]

* igt@runner@aborted:
- fi-icl-u2: NOTRUN -> [FAIL][21] ([i915#4312])
[21]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_109885v1/fi-icl-u2/igt@[email protected]

#### Possible fixes ####

* igt@gem_exec_gttfill@basic:
- fi-pnv-d510: [SKIP][22] ([fdo#109271]) -> [PASS][23] +1 similar issue
[22]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12261/fi-pnv-d510/igt@[email protected]
[23]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_109885v1/fi-pnv-d510/igt@[email protected]

* igt@gem_exec_suspend@basic-s0@smem:
- {bat-adlm-1}: [DMESG-WARN][24] ([i915#2867]) -> [PASS][25] +1 similar issue
[24]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12261/bat-adlm-1/igt@gem_exec_suspend@[email protected]
[25]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_109885v1/bat-adlm-1/igt@gem_exec_suspend@[email protected]

* igt@gem_huc_copy@huc-copy:
- {bat-dg2-8}: [FAIL][26] ([i915#7029]) -> [PASS][27]
[26]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12261/bat-dg2-8/igt@[email protected]
[27]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_109885v1/bat-dg2-8/igt@[email protected]

* igt@i915_pm_rpm@basic-rte:
- {bat-rplp-1}: [DMESG-WARN][28] -> [PASS][29]
[28]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12261/bat-rplp-1/igt@[email protected]
[29]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_109885v1/bat-rplp-1/igt@[email protected]

* igt@i915_pm_rpm@module-reload:
- {bat-rpls-2}: [DMESG-WARN][30] ([i915#5537]) -> [PASS][31]
[30]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12261/bat-rpls-2/igt@[email protected]
[31]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_109885v1/bat-rpls-2/igt@[email protected]

* igt@i915_selftest@live@gem_contexts:
- fi-glk-j4005: [DMESG-FAIL][32] ([i915#7270]) -> [PASS][33]
[32]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12261/fi-glk-j4005/igt@i915_selftest@live@gem_contexts.html
[33]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_109885v1/fi-glk-j4005/igt@i915_selftest@live@gem_contexts.html
- fi-skl-guc: [DMESG-FAIL][34] ([i915#7270]) -> [PASS][35]
[34]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12261/fi-skl-guc/igt@i915_selftest@live@gem_contexts.html
[35]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_109885v1/fi-skl-guc/igt@i915_selftest@live@gem_contexts.html
- {bat-jsl-1}: [DMESG-FAIL][36] ([i915#7270]) -> [PASS][37]
[36]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12261/bat-jsl-1/igt@i915_selftest@live@gem_contexts.html
[37]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_109885v1/bat-jsl-1/igt@i915_selftest@live@gem_contexts.html
- {fi-jsl-1}: [DMESG-FAIL][38] ([i915#7270]) -> [PASS][39]
[38]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12261/fi-jsl-1/igt@i915_selftest@live@gem_contexts.html
[39]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_109885v1/fi-jsl-1/igt@i915_selftest@live@gem_contexts.html

* igt@i915_selftest@live@gt_heartbeat:
- {bat-jsl-1}: [DMESG-FAIL][40] -> [PASS][41]
[40]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12261/bat-jsl-1/igt@i915_selftest@live@gt_heartbeat.html
[41]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_109885v1/bat-jsl-1/igt@i915_selftest@live@gt_heartbeat.html

* igt@i915_selftest@live@hangcheck:
- fi-ivb-3770: [INCOMPLETE][42] ([i915#3303] / [i915#7122]) -> [PASS][43]
[42]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12261/fi-ivb-3770/igt@i915_selftest@[email protected]
[43]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_109885v1/fi-ivb-3770/igt@i915_selftest@[email protected]

* igt@i915_suspend@basic-s3-without-i915:
- fi-bdw-5557u: [INCOMPLETE][44] ([i915#146] / [i915#6712]) -> [PASS][45]
[44]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12261/fi-bdw-5557u/igt@[email protected]
[45]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_109885v1/fi-bdw-5557u/igt@[email protected]
- {bat-rpls-2}: [DMESG-WARN][46] ([i915#6434]) -> [PASS][47]
[46]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12261/bat-rpls-2/igt@[email protected]
[47]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_109885v1/bat-rpls-2/igt@[email protected]

{name}: This element is suppressed. This means it is ignored when computing
the status of the difference (SUCCESS, WARNING, or FAILURE).

[fdo#109271]: https://bugs.freedesktop.org/show_bug.cgi?id=109271
[fdo#109284]: https://bugs.freedesktop.org/show_bug.cgi?id=109284
[fdo#109285]: https://bugs.freedesktop.org/show_bug.cgi?id=109285
[fdo#109295]: https://bugs.freedesktop.org/show_bug.cgi?id=109295
[fdo#110189]: https://bugs.freedesktop.org/show_bug.cgi?id=110189
[fdo#111827]: https://bugs.freedesktop.org/show_bug.cgi?id=111827
[i915#1072]: https://gitlab.freedesktop.org/drm/intel/issues/1072
[i915#146]: https://gitlab.freedesktop.org/drm/intel/issues/146
[i915#1759]: https://gitlab.freedesktop.org/drm/intel/issues/1759
[i915#1845]: https://gitlab.freedesktop.org/drm/intel/issues/1845
[i915#2190]: https://gitlab.freedesktop.org/drm/intel/issues/2190
[i915#2867]: https://gitlab.freedesktop.org/drm/intel/issues/2867
[i915#3012]: https://gitlab.freedesktop.org/drm/intel/issues/3012
[i915#3282]: https://gitlab.freedesktop.org/drm/intel/issues/3282
[i915#3291]: https://gitlab.freedesktop.org/drm/intel/issues/3291
[i915#3301]: https://gitlab.freedesktop.org/drm/intel/issues/3301
[i915#3303]: https://gitlab.freedesktop.org/drm/intel/issues/3303
[i915#3555]: https://gitlab.freedesktop.org/drm/intel/issues/3555
[i915#3708]: https://gitlab.freedesktop.org/drm/intel/issues/3708
[i915#4098]: https://gitlab.freedesktop.org/drm/intel/issues/4098
[i915#4103]: https://gitlab.freedesktop.org/drm/intel/issues/4103
[i915#4312]: https://gitlab.freedesktop.org/drm/intel/issues/4312
[i915#4613]: https://gitlab.freedesktop.org/drm/intel/issues/4613
[i915#4890]: https://gitlab.freedesktop.org/drm/intel/issues/4890
[i915#5537]: https://gitlab.freedesktop.org/drm/intel/issues/5537
[i915#5982]: https://gitlab.freedesktop.org/drm/intel/issues/5982
[i915#6434]: https://gitlab.freedesktop.org/drm/intel/issues/6434
[i915#6480]: https://gitlab.freedesktop.org/drm/intel/issues/6480
[i915#6559]: https://gitlab.freedesktop.org/drm/intel/issues/6559
[i915#6621]: https://gitlab.freedesktop.org/drm/intel/issues/6621
[i915#6712]: https://gitlab.freedesktop.org/drm/intel/issues/6712
[i915#6794]: https://gitlab.freedesktop.org/drm/intel/issues/6794
[i915#6818]: https://gitlab.freedesktop.org/drm/intel/issues/6818
[i915#6939]: https://gitlab.freedesktop.org/drm/intel/issues/6939
[i915#7029]: https://gitlab.freedesktop.org/drm/intel/issues/7029
[i915#7122]: https://gitlab.freedesktop.org/drm/intel/issues/7122
[i915#7269]: https://gitlab.freedesktop.org/drm/intel/issues/7269
[i915#7270]: https://gitlab.freedesktop.org/drm/intel/issues/7270

Build changes
-------------

* Linux: CI_DRM_12261 -> Patchwork_109885v1

CI-20190529: 20190529
CI_DRM_12261: 41447224fdfbfbfd1e9ffa5fabc9d277f9c02f8a @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_7019: fdbafce2b74e84739bb1d81223ae6f01fb442980 @ https://gitlab.freedesktop.org/drm/igt-gpu-tools.git
Patchwork_109885v1: 41447224fdfbfbfd1e9ffa5fabc9d277f9c02f8a @ git://anongit.freedesktop.org/gfx-ci/linux

### Linux commits

8a620d05ef82 drm/i915/xelp: Add Wa_1806527549

== Logs ==

For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_109885v1/index.html

#2 lore raw
In reply to Gustavo Sousa
Quoted 35 lines · Gustavo Sousa

Workaround to be applied to platforms using XE_LP graphics.

BSpec: 52890

---
 drivers/gpu/drm/i915/gt/intel_gt_regs.h     | 1 +
 drivers/gpu/drm/i915/gt/intel_workarounds.c | 7 +++++++
 2 files changed, 8 insertions(+)
drivers/gpu/drm/i915/gt/intel_gt_regs.h +1 -0
index 36d95b79022c..23844ba7e824 100644
@@ -443,6 +443,7 @@
 #define HIZ_CHICKEN				_MMIO(0x7018)
 #define   CHV_HZ_8X8_MODE_IN_1X			REG_BIT(15)
 #define   DG1_HZ_READ_SUPPRESSION_OPTIMIZATION_DISABLE	REG_BIT(14)
+#define   HZ_DEPTH_TEST_LE_GE_OPT_DISABLE	REG_BIT(13)
 #define   BDW_HIZ_POWER_COMPILER_CLOCK_GATING_DISABLE	REG_BIT(3)
 
 #define GEN8_L3CNTLREG				_MMIO(0x7034)
drivers/gpu/drm/i915/gt/intel_workarounds.c +2 -0
index 63e1e6becf34..5cdec699ae04 100644
@@ -660,6 +660,8 @@ static void gen12_ctx_gt_tuning_init(struct intel_engine_cs *engine,
 static void gen12_ctx_workarounds_init(struct intel_engine_cs *engine,
 				       struct i915_wa_list *wal)
 {
+	struct drm_i915_private *i915 = engine->i915;
+
 	gen12_ctx_gt_tuning_init(engine, wal);
 
 	/*

drivers/gpu/drm/i915/gt/intel_workarounds.c static void gen12_ctx_workarounds_init(struct intel_engine_cs *engine, · line 702

Quoted 8 lines
drivers/gpu/drm/i915/gt/intel_workarounds.c +5 -0
@@ -693,6 +695,11 @@ static void gen12_ctx_workarounds_init(struct intel_engine_cs *engine,
 	       FF_MODE2_GS_TIMER_MASK,
 	       FF_MODE2_GS_TIMER_224,
 	       0, false);
+
+	if (!IS_DG1(i915))
+		/* Wa_1806527549 */
+		wa_masked_en(wal, HIZ_CHICKEN, HZ_DEPTH_TEST_LE_GE_OPT_DISABLE);
+

Just realized this extra blank line... I will sent a v2 without it.

Quoted 6 lines
drivers/gpu/drm/i915/gt/intel_workarounds.c +0 -0
 }
 
 static void dg1_ctx_workarounds_init(struct intel_engine_cs *engine,
Signature · 1 line
2.38.0
#3 lore raw
In reply to Gustavo Sousa
Quoted 41 lines · Gustavo Sousa

Workaround to be applied to platforms using XE_LP graphics.

BSpec: 52890

---
 drivers/gpu/drm/i915/gt/intel_gt_regs.h     | 1 +
 drivers/gpu/drm/i915/gt/intel_workarounds.c | 7 +++++++
 2 files changed, 8 insertions(+)
drivers/gpu/drm/i915/gt/intel_gt_regs.h +1 -0
index 36d95b79022c..23844ba7e824 100644
@@ -443,6 +443,7 @@
 #define HIZ_CHICKEN				_MMIO(0x7018)
 #define   CHV_HZ_8X8_MODE_IN_1X			REG_BIT(15)
 #define   DG1_HZ_READ_SUPPRESSION_OPTIMIZATION_DISABLE	REG_BIT
 (14)
+#define   HZ_DEPTH_TEST_LE_GE_OPT_DISABLE	REG_BIT(13)
 #define   BDW_HIZ_POWER_COMPILER_CLOCK_GATING_DISABLE	REG_BIT
 (3)

#define GEN8_L3CNTLREG _MMIO(0x7034)

drivers/gpu/drm/i915/gt/intel_workarounds.c +2 -0
index 63e1e6becf34..5cdec699ae04 100644
@@ -660,6 +660,8 @@ static void gen12_ctx_gt_tuning_init(struct
 intel_engine_cs *engine,
 static void gen12_ctx_workarounds_init(struct intel_engine_cs
 *engine,
 				       struct i915_wa_list *wal)
 {
+	struct drm_i915_private *i915 = engine->i915;
+
 	gen12_ctx_gt_tuning_init(engine, wal);
drivers/gpu/drm/i915/gt/intel_workarounds.c +0 -0
 	/*

drivers/gpu/drm/i915/gt/intel_workarounds.c static void gen12_ctx_workarounds_init(struct · line 700

Quoted 6 lines
drivers/gpu/drm/i915/gt/intel_workarounds.c +2 -0
@@ -693,6 +695,11 @@ static void gen12_ctx_workarounds_init(struct
 intel_engine_cs *engine,
 	       FF_MODE2_GS_TIMER_MASK,
 	       FF_MODE2_GS_TIMER_224,
 	       0, false);
+
+	if (!IS_DG1(i915))

My reading of the spec here is that we should be applying this to DG1 as well. Why are you removing it there?

Also, it looks like this is conditional on a specific depth buffer, do we need to take that into account here?

Thanks,
Stuart

Quoted 7 lines
drivers/gpu/drm/i915/gt/intel_workarounds.c +3 -0
+		/* Wa_1806527549 */
+		wa_masked_en(wal, HIZ_CHICKEN,
 HZ_DEPTH_TEST_LE_GE_OPT_DISABLE);
+
 }

static void dg1_ctx_workarounds_init(struct intel_engine_cs *engine,

#4 lore raw
Quoted 40 lines · Stuart Summers
Quoted 39 lines · Gustavo Sousa

Workaround to be applied to platforms using XE_LP graphics.

BSpec: 52890

---
 drivers/gpu/drm/i915/gt/intel_gt_regs.h     | 1 +
 drivers/gpu/drm/i915/gt/intel_workarounds.c | 7 +++++++
 2 files changed, 8 insertions(+)
drivers/gpu/drm/i915/gt/intel_gt_regs.h +1 -0
index 36d95b79022c..23844ba7e824 100644
@@ -443,6 +443,7 @@
 #define HIZ_CHICKEN				_MMIO(0x7018)
 #define   CHV_HZ_8X8_MODE_IN_1X			REG_BIT(15)
 #define   DG1_HZ_READ_SUPPRESSION_OPTIMIZATION_DISABLE	REG_BIT
 (14)
+#define   HZ_DEPTH_TEST_LE_GE_OPT_DISABLE	REG_BIT(13)
 #define   BDW_HIZ_POWER_COMPILER_CLOCK_GATING_DISABLE	REG_BIT
 (3)

#define GEN8_L3CNTLREG _MMIO(0x7034)

drivers/gpu/drm/i915/gt/intel_workarounds.c +2 -0
index 63e1e6becf34..5cdec699ae04 100644
@@ -660,6 +660,8 @@ static void gen12_ctx_gt_tuning_init(struct
 intel_engine_cs *engine,
 static void gen12_ctx_workarounds_init(struct intel_engine_cs
 *engine,
 				       struct i915_wa_list *wal)
 {
+	struct drm_i915_private *i915 = engine->i915;
+
 	gen12_ctx_gt_tuning_init(engine, wal);
Quoted 11 lines

drivers/gpu/drm/i915/gt/intel_workarounds.c static void gen12_ctx_workarounds_init(struct · line 700

Quoted 8 lines
drivers/gpu/drm/i915/gt/intel_workarounds.c +2 -0
 	/*
@@ -693,6 +695,11 @@ static void gen12_ctx_workarounds_init(struct
 intel_engine_cs *engine,
 	       FF_MODE2_GS_TIMER_MASK,
 	       FF_MODE2_GS_TIMER_224,
 	       0, false);
+
+	if (!IS_DG1(i915))

My reading of the spec here is that we should be applying this to DG1 as well. Why are you removing it there?

for me DG1 is marked as "no impact"

Quoted 2 lines

Also, it looks like this is conditional on a specific depth buffer, do we need to take that into account here?

it was agreed with mesa to do this unconditionally, so it can be done in i915 rather than in mesa as it doesn't appear to have side effects.

Lucas De Marchi

Quoted 11 lines

Thanks,
Stuart

Quoted 7 lines
drivers/gpu/drm/i915/gt/intel_workarounds.c +3 -0
+		/* Wa_1806527549 */
+		wa_masked_en(wal, HIZ_CHICKEN,
 HZ_DEPTH_TEST_LE_GE_OPT_DISABLE);
+
 }

static void dg1_ctx_workarounds_init(struct intel_engine_cs *engine,