* Re: [Intel-gfx] [PATCH] drm/i915/gt: skip WA verfication for GEN7_MISCCPCTL on DG2
2023-09-12 7:35 [Intel-gfx] [PATCH] drm/i915/gt: skip WA verfication for GEN7_MISCCPCTL on DG2 Andrzej Hajda
@ 2023-09-12 8:04 ` Andrzej Hajda
2023-09-12 16:14 ` [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for " Patchwork
` (4 subsequent siblings)
5 siblings, 0 replies; 8+ messages in thread
From: Andrzej Hajda @ 2023-09-12 8:04 UTC (permalink / raw)
To: intel-gfx; +Cc: Nirmoy Das
On 12.09.2023 09:35, Andrzej Hajda wrote:
> Some DG2 firmware locks this register for modification. Using wa_add
> with read_mask 0 allows to skip checks of such registers.
>
> Signed-off-by: Andrzej Hajda <andrzej.hajda@intel.com>
Forgot to add tag:
Closes: https://gitlab.freedesktop.org/drm/intel/-/issues/8945
Regards
Andrzej
> ---
> drivers/gpu/drm/i915/gt/intel_workarounds.c | 7 +++++--
> 1 file changed, 5 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/gt/intel_workarounds.c b/drivers/gpu/drm/i915/gt/intel_workarounds.c
> index 70071ead0659cc..1d1474ad945e0c 100644
> --- a/drivers/gpu/drm/i915/gt/intel_workarounds.c
> +++ b/drivers/gpu/drm/i915/gt/intel_workarounds.c
> @@ -1597,8 +1597,11 @@ dg2_gt_workarounds_init(struct intel_gt *gt, struct i915_wa_list *wal)
> /* Wa_14014830051:dg2 */
> wa_mcr_write_clr(wal, SARB_CHICKEN1, COMP_CKN_IN);
>
> - /* Wa_14015795083 */
> - wa_write_clr(wal, GEN7_MISCCPCTL, GEN12_DOP_CLOCK_GATE_RENDER_ENABLE);
> + /* Wa_14015795083
> + * Skip verification for possibly locked register.
> + */
> + wa_add(wal, GEN7_MISCCPCTL, GEN12_DOP_CLOCK_GATE_RENDER_ENABLE,
> + 0, 0, false);
>
> /* Wa_18018781329 */
> wa_mcr_write_or(wal, RENDER_MOD_CTRL, FORCE_MISS_FTLB);
^ permalink raw reply [flat|nested] 8+ messages in thread* [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for drm/i915/gt: skip WA verfication for GEN7_MISCCPCTL on DG2
2023-09-12 7:35 [Intel-gfx] [PATCH] drm/i915/gt: skip WA verfication for GEN7_MISCCPCTL on DG2 Andrzej Hajda
2023-09-12 8:04 ` Andrzej Hajda
@ 2023-09-12 16:14 ` Patchwork
2023-09-12 16:32 ` [Intel-gfx] ✗ Fi.CI.BAT: failure " Patchwork
` (3 subsequent siblings)
5 siblings, 0 replies; 8+ messages in thread
From: Patchwork @ 2023-09-12 16:14 UTC (permalink / raw)
To: Andrzej Hajda; +Cc: intel-gfx
== Series Details ==
Series: drm/i915/gt: skip WA verfication for GEN7_MISCCPCTL on DG2
URL : https://patchwork.freedesktop.org/series/123583/
State : warning
== Summary ==
Error: dim checkpatch failed
cd1b67e90fe1 drm/i915/gt: skip WA verfication for GEN7_MISCCPCTL on DG2
-:4: WARNING:TYPO_SPELLING: 'verfication' may be misspelled - perhaps 'verification'?
#4:
Subject: [PATCH] drm/i915/gt: skip WA verfication for GEN7_MISCCPCTL on DG2
^^^^^^^^^^^
total: 0 errors, 1 warnings, 0 checks, 13 lines checked
^ permalink raw reply [flat|nested] 8+ messages in thread* [Intel-gfx] ✗ Fi.CI.BAT: failure for drm/i915/gt: skip WA verfication for GEN7_MISCCPCTL on DG2
2023-09-12 7:35 [Intel-gfx] [PATCH] drm/i915/gt: skip WA verfication for GEN7_MISCCPCTL on DG2 Andrzej Hajda
2023-09-12 8:04 ` Andrzej Hajda
2023-09-12 16:14 ` [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for " Patchwork
@ 2023-09-12 16:32 ` Patchwork
2023-09-12 20:08 ` [Intel-gfx] [PATCH] " Nirmoy Das
` (2 subsequent siblings)
5 siblings, 0 replies; 8+ messages in thread
From: Patchwork @ 2023-09-12 16:32 UTC (permalink / raw)
To: Andrzej Hajda; +Cc: intel-gfx
[-- Attachment #1: Type: text/plain, Size: 10389 bytes --]
== Series Details ==
Series: drm/i915/gt: skip WA verfication for GEN7_MISCCPCTL on DG2
URL : https://patchwork.freedesktop.org/series/123583/
State : failure
== Summary ==
CI Bug Log - changes from CI_DRM_13623 -> Patchwork_123583v1
====================================================
Summary
-------
**FAILURE**
Serious unknown changes coming with Patchwork_123583v1 absolutely need to be
verified manually.
If you think the reported changes have nothing to do with the changes
introduced in Patchwork_123583v1, please notify your bug team (lgci.bug.filing@intel.com) 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_123583v1/index.html
Participating hosts (39 -> 40)
------------------------------
Additional (2): bat-adlm-1 bat-adlp-11
Missing (1): fi-snb-2520m
Possible new issues
-------------------
Here are the unknown changes that may have been introduced in Patchwork_123583v1:
### IGT changes ###
#### Possible regressions ####
* igt@debugfs_test@basic-hwmon:
- bat-adlm-1: NOTRUN -> [SKIP][1]
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_123583v1/bat-adlm-1/igt@debugfs_test@basic-hwmon.html
* igt@gem_exec_suspend@basic-s0@smem:
- fi-cfl-8109u: [PASS][2] -> [ABORT][3]
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13623/fi-cfl-8109u/igt@gem_exec_suspend@basic-s0@smem.html
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_123583v1/fi-cfl-8109u/igt@gem_exec_suspend@basic-s0@smem.html
* igt@i915_selftest@live@ring_submission:
- bat-jsl-3: [PASS][4] -> [INCOMPLETE][5]
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13623/bat-jsl-3/igt@i915_selftest@live@ring_submission.html
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_123583v1/bat-jsl-3/igt@i915_selftest@live@ring_submission.html
Known issues
------------
Here are the changes found in Patchwork_123583v1 that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@debugfs_test@basic-hwmon:
- bat-adlp-11: NOTRUN -> [SKIP][6] ([i915#9318])
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_123583v1/bat-adlp-11/igt@debugfs_test@basic-hwmon.html
* igt@fbdev@eof:
- bat-adlm-1: NOTRUN -> [SKIP][7] ([i915#2582]) +3 other tests skip
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_123583v1/bat-adlm-1/igt@fbdev@eof.html
* igt@fbdev@info:
- bat-adlm-1: NOTRUN -> [SKIP][8] ([i915#1849] / [i915#2582])
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_123583v1/bat-adlm-1/igt@fbdev@info.html
* igt@gem_lmem_swapping@parallel-random-engines:
- bat-adlm-1: NOTRUN -> [SKIP][9] ([i915#4613]) +3 other tests skip
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_123583v1/bat-adlm-1/igt@gem_lmem_swapping@parallel-random-engines.html
* igt@gem_tiled_pread_basic:
- bat-adlm-1: NOTRUN -> [SKIP][10] ([i915#3282])
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_123583v1/bat-adlm-1/igt@gem_tiled_pread_basic.html
- bat-adlp-11: NOTRUN -> [SKIP][11] ([i915#3282])
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_123583v1/bat-adlp-11/igt@gem_tiled_pread_basic.html
* igt@i915_pm_rps@basic-api:
- bat-adlm-1: NOTRUN -> [SKIP][12] ([i915#6621])
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_123583v1/bat-adlm-1/igt@i915_pm_rps@basic-api.html
* igt@i915_selftest@live@hangcheck:
- bat-dg2-11: [PASS][13] -> [ABORT][14] ([i915#7913])
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13623/bat-dg2-11/igt@i915_selftest@live@hangcheck.html
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_123583v1/bat-dg2-11/igt@i915_selftest@live@hangcheck.html
* igt@i915_selftest@live@slpc:
- fi-kbl-soraka: [PASS][15] -> [ABORT][16] ([i915#7913])
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13623/fi-kbl-soraka/igt@i915_selftest@live@slpc.html
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_123583v1/fi-kbl-soraka/igt@i915_selftest@live@slpc.html
* igt@kms_cursor_legacy@basic-busy-flip-before-cursor-legacy:
- bat-adlp-11: NOTRUN -> [SKIP][17] ([i915#4103]) +1 other test skip
[17]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_123583v1/bat-adlp-11/igt@kms_cursor_legacy@basic-busy-flip-before-cursor-legacy.html
* igt@kms_cursor_legacy@basic-flip-after-cursor-varying-size:
- bat-adlm-1: NOTRUN -> [SKIP][18] ([i915#1845]) +16 other tests skip
[18]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_123583v1/bat-adlm-1/igt@kms_cursor_legacy@basic-flip-after-cursor-varying-size.html
* igt@kms_flip@basic-plain-flip:
- bat-adlm-1: NOTRUN -> [SKIP][19] ([i915#3637]) +3 other tests skip
[19]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_123583v1/bat-adlm-1/igt@kms_flip@basic-plain-flip.html
* igt@kms_force_connector_basic@force-load-detect:
- bat-adlm-1: NOTRUN -> [SKIP][20] ([fdo#109285])
[20]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_123583v1/bat-adlm-1/igt@kms_force_connector_basic@force-load-detect.html
* igt@kms_force_connector_basic@prune-stale-modes:
- bat-adlp-11: NOTRUN -> [SKIP][21] ([i915#4093]) +3 other tests skip
[21]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_123583v1/bat-adlp-11/igt@kms_force_connector_basic@prune-stale-modes.html
* igt@kms_frontbuffer_tracking@basic:
- bat-adlm-1: NOTRUN -> [SKIP][22] ([i915#1849])
[22]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_123583v1/bat-adlm-1/igt@kms_frontbuffer_tracking@basic.html
* igt@kms_hdmi_inject@inject-audio:
- bat-adlp-11: NOTRUN -> [SKIP][23] ([i915#4369])
[23]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_123583v1/bat-adlp-11/igt@kms_hdmi_inject@inject-audio.html
* igt@kms_psr@cursor_plane_move:
- bat-adlm-1: NOTRUN -> [SKIP][24] ([i915#1072]) +3 other tests skip
[24]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_123583v1/bat-adlm-1/igt@kms_psr@cursor_plane_move.html
* igt@kms_psr@primary_page_flip:
- bat-adlp-11: NOTRUN -> [SKIP][25] ([i915#1072]) +3 other tests skip
[25]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_123583v1/bat-adlp-11/igt@kms_psr@primary_page_flip.html
* igt@kms_setmode@basic-clone-single-crtc:
- bat-adlp-11: NOTRUN -> [ABORT][26] ([i915#8260] / [i915#8668])
[26]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_123583v1/bat-adlp-11/igt@kms_setmode@basic-clone-single-crtc.html
- bat-adlm-1: NOTRUN -> [SKIP][27] ([i915#3555])
[27]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_123583v1/bat-adlm-1/igt@kms_setmode@basic-clone-single-crtc.html
* igt@prime_vgem@basic-fence-flip:
- bat-adlm-1: NOTRUN -> [SKIP][28] ([i915#1845] / [i915#3708])
[28]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_123583v1/bat-adlm-1/igt@prime_vgem@basic-fence-flip.html
* igt@prime_vgem@basic-write:
- bat-adlm-1: NOTRUN -> [SKIP][29] ([i915#3708]) +2 other tests skip
[29]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_123583v1/bat-adlm-1/igt@prime_vgem@basic-write.html
#### Possible fixes ####
* igt@i915_selftest@live@gt_heartbeat:
- fi-apl-guc: [DMESG-FAIL][30] ([i915#5334]) -> [PASS][31]
[30]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13623/fi-apl-guc/igt@i915_selftest@live@gt_heartbeat.html
[31]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_123583v1/fi-apl-guc/igt@i915_selftest@live@gt_heartbeat.html
* igt@i915_selftest@live@hugepages:
- bat-mtlp-8: [DMESG-WARN][32] ([i915#9121]) -> [PASS][33]
[32]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13623/bat-mtlp-8/igt@i915_selftest@live@hugepages.html
[33]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_123583v1/bat-mtlp-8/igt@i915_selftest@live@hugepages.html
{name}: This element is suppressed. This means it is ignored when computing
the status of the difference (SUCCESS, WARNING, or FAILURE).
[fdo#109285]: https://bugs.freedesktop.org/show_bug.cgi?id=109285
[i915#1072]: https://gitlab.freedesktop.org/drm/intel/issues/1072
[i915#1845]: https://gitlab.freedesktop.org/drm/intel/issues/1845
[i915#1849]: https://gitlab.freedesktop.org/drm/intel/issues/1849
[i915#2582]: https://gitlab.freedesktop.org/drm/intel/issues/2582
[i915#3282]: https://gitlab.freedesktop.org/drm/intel/issues/3282
[i915#3546]: https://gitlab.freedesktop.org/drm/intel/issues/3546
[i915#3555]: https://gitlab.freedesktop.org/drm/intel/issues/3555
[i915#3637]: https://gitlab.freedesktop.org/drm/intel/issues/3637
[i915#3708]: https://gitlab.freedesktop.org/drm/intel/issues/3708
[i915#4093]: https://gitlab.freedesktop.org/drm/intel/issues/4093
[i915#4103]: https://gitlab.freedesktop.org/drm/intel/issues/4103
[i915#4369]: https://gitlab.freedesktop.org/drm/intel/issues/4369
[i915#4613]: https://gitlab.freedesktop.org/drm/intel/issues/4613
[i915#5334]: https://gitlab.freedesktop.org/drm/intel/issues/5334
[i915#5354]: https://gitlab.freedesktop.org/drm/intel/issues/5354
[i915#6621]: https://gitlab.freedesktop.org/drm/intel/issues/6621
[i915#7913]: https://gitlab.freedesktop.org/drm/intel/issues/7913
[i915#7952]: https://gitlab.freedesktop.org/drm/intel/issues/7952
[i915#8260]: https://gitlab.freedesktop.org/drm/intel/issues/8260
[i915#8668]: https://gitlab.freedesktop.org/drm/intel/issues/8668
[i915#9121]: https://gitlab.freedesktop.org/drm/intel/issues/9121
[i915#9318]: https://gitlab.freedesktop.org/drm/intel/issues/9318
Build changes
-------------
* Linux: CI_DRM_13623 -> Patchwork_123583v1
CI-20190529: 20190529
CI_DRM_13623: eb35627e1c4a3781c161cd04944e403ce6df3e1c @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_7480: a8d38db9ac258d7fd71b2cf7607e259a864f95be @ https://gitlab.freedesktop.org/drm/igt-gpu-tools.git
Patchwork_123583v1: eb35627e1c4a3781c161cd04944e403ce6df3e1c @ git://anongit.freedesktop.org/gfx-ci/linux
### Linux commits
64570d11016f drm/i915/gt: skip WA verfication for GEN7_MISCCPCTL on DG2
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_123583v1/index.html
[-- Attachment #2: Type: text/html, Size: 11977 bytes --]
^ permalink raw reply [flat|nested] 8+ messages in thread* Re: [Intel-gfx] [PATCH] drm/i915/gt: skip WA verfication for GEN7_MISCCPCTL on DG2
2023-09-12 7:35 [Intel-gfx] [PATCH] drm/i915/gt: skip WA verfication for GEN7_MISCCPCTL on DG2 Andrzej Hajda
` (2 preceding siblings ...)
2023-09-12 16:32 ` [Intel-gfx] ✗ Fi.CI.BAT: failure " Patchwork
@ 2023-09-12 20:08 ` Nirmoy Das
2023-09-12 21:05 ` Matt Roper
2023-09-18 16:56 ` Andi Shyti
5 siblings, 0 replies; 8+ messages in thread
From: Nirmoy Das @ 2023-09-12 20:08 UTC (permalink / raw)
To: Andrzej Hajda, intel-gfx; +Cc: Nirmoy Das
On 9/12/2023 9:35 AM, Andrzej Hajda wrote:
> Some DG2 firmware locks this register for modification. Using wa_add
> with read_mask 0 allows to skip checks of such registers.
>
> Signed-off-by: Andrzej Hajda <andrzej.hajda@intel.com>
Reviewed-by: Nirmoy Das <nirmoy.das@intel.com>
> ---
> drivers/gpu/drm/i915/gt/intel_workarounds.c | 7 +++++--
> 1 file changed, 5 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/gt/intel_workarounds.c b/drivers/gpu/drm/i915/gt/intel_workarounds.c
> index 70071ead0659cc..1d1474ad945e0c 100644
> --- a/drivers/gpu/drm/i915/gt/intel_workarounds.c
> +++ b/drivers/gpu/drm/i915/gt/intel_workarounds.c
> @@ -1597,8 +1597,11 @@ dg2_gt_workarounds_init(struct intel_gt *gt, struct i915_wa_list *wal)
> /* Wa_14014830051:dg2 */
> wa_mcr_write_clr(wal, SARB_CHICKEN1, COMP_CKN_IN);
>
> - /* Wa_14015795083 */
> - wa_write_clr(wal, GEN7_MISCCPCTL, GEN12_DOP_CLOCK_GATE_RENDER_ENABLE);
> + /* Wa_14015795083
> + * Skip verification for possibly locked register.
> + */
> + wa_add(wal, GEN7_MISCCPCTL, GEN12_DOP_CLOCK_GATE_RENDER_ENABLE,
> + 0, 0, false);
>
> /* Wa_18018781329 */
> wa_mcr_write_or(wal, RENDER_MOD_CTRL, FORCE_MISS_FTLB);
^ permalink raw reply [flat|nested] 8+ messages in thread* Re: [Intel-gfx] [PATCH] drm/i915/gt: skip WA verfication for GEN7_MISCCPCTL on DG2
2023-09-12 7:35 [Intel-gfx] [PATCH] drm/i915/gt: skip WA verfication for GEN7_MISCCPCTL on DG2 Andrzej Hajda
` (3 preceding siblings ...)
2023-09-12 20:08 ` [Intel-gfx] [PATCH] " Nirmoy Das
@ 2023-09-12 21:05 ` Matt Roper
2023-09-13 10:21 ` Andrzej Hajda
2023-09-18 16:56 ` Andi Shyti
5 siblings, 1 reply; 8+ messages in thread
From: Matt Roper @ 2023-09-12 21:05 UTC (permalink / raw)
To: Andrzej Hajda; +Cc: intel-gfx, Nirmoy Das
On Tue, Sep 12, 2023 at 09:35:21AM +0200, Andrzej Hajda wrote:
> Some DG2 firmware locks this register for modification. Using wa_add
> with read_mask 0 allows to skip checks of such registers.
>
> Signed-off-by: Andrzej Hajda <andrzej.hajda@intel.com>
> ---
> drivers/gpu/drm/i915/gt/intel_workarounds.c | 7 +++++--
> 1 file changed, 5 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/gt/intel_workarounds.c b/drivers/gpu/drm/i915/gt/intel_workarounds.c
> index 70071ead0659cc..1d1474ad945e0c 100644
> --- a/drivers/gpu/drm/i915/gt/intel_workarounds.c
> +++ b/drivers/gpu/drm/i915/gt/intel_workarounds.c
> @@ -1597,8 +1597,11 @@ dg2_gt_workarounds_init(struct intel_gt *gt, struct i915_wa_list *wal)
> /* Wa_14014830051:dg2 */
> wa_mcr_write_clr(wal, SARB_CHICKEN1, COMP_CKN_IN);
>
> - /* Wa_14015795083 */
> - wa_write_clr(wal, GEN7_MISCCPCTL, GEN12_DOP_CLOCK_GATE_RENDER_ENABLE);
> + /* Wa_14015795083
Minor nitpick: kernel coding style says that "/*" should be on a line
by itself for multi-line comments. Aside from that,
Reviewed-by: Matt Roper <matthew.d.roper@intel.com>
Matt
> + * Skip verification for possibly locked register.
> + */
> + wa_add(wal, GEN7_MISCCPCTL, GEN12_DOP_CLOCK_GATE_RENDER_ENABLE,
> + 0, 0, false);
>
> /* Wa_18018781329 */
> wa_mcr_write_or(wal, RENDER_MOD_CTRL, FORCE_MISS_FTLB);
> --
> 2.34.1
>
--
Matt Roper
Graphics Software Engineer
Linux GPU Platform Enablement
Intel Corporation
^ permalink raw reply [flat|nested] 8+ messages in thread* Re: [Intel-gfx] [PATCH] drm/i915/gt: skip WA verfication for GEN7_MISCCPCTL on DG2
2023-09-12 21:05 ` Matt Roper
@ 2023-09-13 10:21 ` Andrzej Hajda
0 siblings, 0 replies; 8+ messages in thread
From: Andrzej Hajda @ 2023-09-13 10:21 UTC (permalink / raw)
To: Matt Roper; +Cc: intel-gfx, Nirmoy Das
On 12.09.2023 23:05, Matt Roper wrote:
> On Tue, Sep 12, 2023 at 09:35:21AM +0200, Andrzej Hajda wrote:
>> Some DG2 firmware locks this register for modification. Using wa_add
>> with read_mask 0 allows to skip checks of such registers.
>>
>> Signed-off-by: Andrzej Hajda <andrzej.hajda@intel.com>
>> ---
>> drivers/gpu/drm/i915/gt/intel_workarounds.c | 7 +++++--
>> 1 file changed, 5 insertions(+), 2 deletions(-)
>>
>> diff --git a/drivers/gpu/drm/i915/gt/intel_workarounds.c b/drivers/gpu/drm/i915/gt/intel_workarounds.c
>> index 70071ead0659cc..1d1474ad945e0c 100644
>> --- a/drivers/gpu/drm/i915/gt/intel_workarounds.c
>> +++ b/drivers/gpu/drm/i915/gt/intel_workarounds.c
>> @@ -1597,8 +1597,11 @@ dg2_gt_workarounds_init(struct intel_gt *gt, struct i915_wa_list *wal)
>> /* Wa_14014830051:dg2 */
>> wa_mcr_write_clr(wal, SARB_CHICKEN1, COMP_CKN_IN);
>>
>> - /* Wa_14015795083 */
>> - wa_write_clr(wal, GEN7_MISCCPCTL, GEN12_DOP_CLOCK_GATE_RENDER_ENABLE);
>> + /* Wa_14015795083
>
> Minor nitpick: kernel coding style says that "/*" should be on a line
> by itself for multi-line comments. Aside from that,
>
> Reviewed-by: Matt Roper <matthew.d.roper@intel.com>
Thanks for both r-b.
Pushed with adjusted comment.
Regards
Andrzej
>
>
> Matt
>
>> + * Skip verification for possibly locked register.
>> + */
>> + wa_add(wal, GEN7_MISCCPCTL, GEN12_DOP_CLOCK_GATE_RENDER_ENABLE,
>> + 0, 0, false);
>>
>> /* Wa_18018781329 */
>> wa_mcr_write_or(wal, RENDER_MOD_CTRL, FORCE_MISS_FTLB);
>> --
>> 2.34.1
>>
>
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [Intel-gfx] [PATCH] drm/i915/gt: skip WA verfication for GEN7_MISCCPCTL on DG2
2023-09-12 7:35 [Intel-gfx] [PATCH] drm/i915/gt: skip WA verfication for GEN7_MISCCPCTL on DG2 Andrzej Hajda
` (4 preceding siblings ...)
2023-09-12 21:05 ` Matt Roper
@ 2023-09-18 16:56 ` Andi Shyti
5 siblings, 0 replies; 8+ messages in thread
From: Andi Shyti @ 2023-09-18 16:56 UTC (permalink / raw)
To: Andrzej Hajda; +Cc: intel-gfx, Nirmoy Das
Hi Andrzej,
On Tue, Sep 12, 2023 at 09:35:21AM +0200, Andrzej Hajda wrote:
> Some DG2 firmware locks this register for modification. Using wa_add
> with read_mask 0 allows to skip checks of such registers.
>
> Signed-off-by: Andrzej Hajda <andrzej.hajda@intel.com>
Reviewed-by: Andi Shyti <andi.shyti@linux.intel.com>
Andi
> ---
> drivers/gpu/drm/i915/gt/intel_workarounds.c | 7 +++++--
> 1 file changed, 5 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/gt/intel_workarounds.c b/drivers/gpu/drm/i915/gt/intel_workarounds.c
> index 70071ead0659cc..1d1474ad945e0c 100644
> --- a/drivers/gpu/drm/i915/gt/intel_workarounds.c
> +++ b/drivers/gpu/drm/i915/gt/intel_workarounds.c
> @@ -1597,8 +1597,11 @@ dg2_gt_workarounds_init(struct intel_gt *gt, struct i915_wa_list *wal)
> /* Wa_14014830051:dg2 */
> wa_mcr_write_clr(wal, SARB_CHICKEN1, COMP_CKN_IN);
>
> - /* Wa_14015795083 */
> - wa_write_clr(wal, GEN7_MISCCPCTL, GEN12_DOP_CLOCK_GATE_RENDER_ENABLE);
> + /* Wa_14015795083
> + * Skip verification for possibly locked register.
> + */
> + wa_add(wal, GEN7_MISCCPCTL, GEN12_DOP_CLOCK_GATE_RENDER_ENABLE,
> + 0, 0, false);
>
> /* Wa_18018781329 */
> wa_mcr_write_or(wal, RENDER_MOD_CTRL, FORCE_MISS_FTLB);
> --
> 2.34.1
^ permalink raw reply [flat|nested] 8+ messages in thread