* [Intel-gfx] [PATCH 0/2] Aux invalidation
@ 2023-03-20 19:41 Andi Shyti
2023-03-20 19:41 ` [Intel-gfx] [PATCH 1/2] drm/i915/gt: Ensure memory quiesced before invalidation Andi Shyti
` (5 more replies)
0 siblings, 6 replies; 8+ messages in thread
From: Andi Shyti @ 2023-03-20 19:41 UTC (permalink / raw)
To: intel-gfx, dri-devel, Jonathan Cavitt; +Cc: Andi Shyti, Nirmoy Das
Hi,
I'm just respinning these two aux invalidation patches from
Jonathan. They have been sent some times ago and need to be
reviewed.
Thanks,
Andi
Jonathan Cavitt (2):
drm/i915/gt: Ensure memory quiesced before invalidation
drm/i915/gt: Poll aux invalidation register bit on invalidation
drivers/gpu/drm/i915/gt/gen8_engine_cs.c | 24 ++++++++++++++++----
drivers/gpu/drm/i915/gt/intel_gpu_commands.h | 1 +
2 files changed, 21 insertions(+), 4 deletions(-)
--
2.39.2
^ permalink raw reply [flat|nested] 8+ messages in thread* [Intel-gfx] [PATCH 1/2] drm/i915/gt: Ensure memory quiesced before invalidation 2023-03-20 19:41 [Intel-gfx] [PATCH 0/2] Aux invalidation Andi Shyti @ 2023-03-20 19:41 ` Andi Shyti 2023-03-20 19:41 ` [Intel-gfx] [PATCH 2/2] drm/i915/gt: Poll aux invalidation register bit on invalidation Andi Shyti ` (4 subsequent siblings) 5 siblings, 0 replies; 8+ messages in thread From: Andi Shyti @ 2023-03-20 19:41 UTC (permalink / raw) To: intel-gfx, dri-devel, Jonathan Cavitt; +Cc: Andi Shyti, Nirmoy Das From: Jonathan Cavitt <jonathan.cavitt@intel.com> All memory traffic must be quiesced before requesting an aux invalidation on platforms that use Aux CCS. Signed-off-by: Jonathan Cavitt <jonathan.cavitt@intel.com> Signed-off-by: Andi Shyti <andi.shyti@linux.intel.com> --- drivers/gpu/drm/i915/gt/gen8_engine_cs.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/drivers/gpu/drm/i915/gt/gen8_engine_cs.c b/drivers/gpu/drm/i915/gt/gen8_engine_cs.c index e1c76e5bfa827..6f830f80eb0f8 100644 --- a/drivers/gpu/drm/i915/gt/gen8_engine_cs.c +++ b/drivers/gpu/drm/i915/gt/gen8_engine_cs.c @@ -181,6 +181,13 @@ int gen12_emit_flush_rcs(struct i915_request *rq, u32 mode) { struct intel_engine_cs *engine = rq->engine; + /* + * Aux invalidations on Aux CCS platforms require + * memory traffic is quiesced prior. + */ + if (!HAS_FLAT_CCS(engine->i915)) + mode |= EMIT_FLUSH; + if (mode & EMIT_FLUSH) { u32 flags = 0; u32 *cs; -- 2.39.2 ^ permalink raw reply related [flat|nested] 8+ messages in thread
* [Intel-gfx] [PATCH 2/2] drm/i915/gt: Poll aux invalidation register bit on invalidation 2023-03-20 19:41 [Intel-gfx] [PATCH 0/2] Aux invalidation Andi Shyti 2023-03-20 19:41 ` [Intel-gfx] [PATCH 1/2] drm/i915/gt: Ensure memory quiesced before invalidation Andi Shyti @ 2023-03-20 19:41 ` Andi Shyti 2023-03-21 7:38 ` [Intel-gfx] ✗ Fi.CI.SPARSE: warning for Aux invalidation Patchwork ` (3 subsequent siblings) 5 siblings, 0 replies; 8+ messages in thread From: Andi Shyti @ 2023-03-20 19:41 UTC (permalink / raw) To: intel-gfx, dri-devel, Jonathan Cavitt; +Cc: Andi Shyti, Nirmoy Das From: Jonathan Cavitt <jonathan.cavitt@intel.com> For platforms that use Aux CCS, we must wait for aux invalidation to complete by checking the aux invalidation register bit is cleared. Signed-off-by: Jonathan Cavitt <jonathan.cavitt@intel.com> Signed-off-by: Andi Shyti <andi.shyti@linux.intel.com> --- drivers/gpu/drm/i915/gt/gen8_engine_cs.c | 17 +++++++++++++---- drivers/gpu/drm/i915/gt/intel_gpu_commands.h | 1 + 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/drm/i915/gt/gen8_engine_cs.c b/drivers/gpu/drm/i915/gt/gen8_engine_cs.c index 6f830f80eb0f8..d93484211abdb 100644 --- a/drivers/gpu/drm/i915/gt/gen8_engine_cs.c +++ b/drivers/gpu/drm/i915/gt/gen8_engine_cs.c @@ -174,6 +174,16 @@ u32 *gen12_emit_aux_table_inv(struct intel_gt *gt, u32 *cs, const i915_reg_t inv *cs++ = AUX_INV; *cs++ = MI_NOOP; + *cs++ = MI_SEMAPHORE_WAIT_TOKEN | + MI_SEMAPHORE_REGISTER_POLL | + MI_SEMAPHORE_POLL | + MI_SEMAPHORE_SAD_EQ_SDD; + *cs++ = 0; + *cs++ = i915_mmio_reg_offset(inv_reg) + gsi_offset; + *cs++ = 0; + *cs++ = 0; + *cs++ = MI_NOOP; + return cs; } @@ -243,10 +253,9 @@ int gen12_emit_flush_rcs(struct i915_request *rq, u32 mode) else if (engine->class == COMPUTE_CLASS) flags &= ~PIPE_CONTROL_3D_ENGINE_FLAGS; + count = 8; if (!HAS_FLAT_CCS(rq->engine->i915)) - count = 8 + 4; - else - count = 8; + count += 10; cs = intel_ring_begin(rq, count); if (IS_ERR(cs)) @@ -289,7 +298,7 @@ int gen12_emit_flush_xcs(struct i915_request *rq, u32 mode) aux_inv = rq->engine->mask & ~GENMASK(_BCS(I915_MAX_BCS - 1), BCS0); if (aux_inv) - cmd += 4; + cmd += 10; } } diff --git a/drivers/gpu/drm/i915/gt/intel_gpu_commands.h b/drivers/gpu/drm/i915/gt/intel_gpu_commands.h index e10507fa71ce6..8026b6a891923 100644 --- a/drivers/gpu/drm/i915/gt/intel_gpu_commands.h +++ b/drivers/gpu/drm/i915/gt/intel_gpu_commands.h @@ -121,6 +121,7 @@ #define MI_SEMAPHORE_TARGET(engine) ((engine)<<15) #define MI_SEMAPHORE_WAIT MI_INSTR(0x1c, 2) /* GEN8+ */ #define MI_SEMAPHORE_WAIT_TOKEN MI_INSTR(0x1c, 3) /* GEN12+ */ +#define MI_SEMAPHORE_REGISTER_POLL (1 << 16) #define MI_SEMAPHORE_POLL (1 << 15) #define MI_SEMAPHORE_SAD_GT_SDD (0 << 12) #define MI_SEMAPHORE_SAD_GTE_SDD (1 << 12) -- 2.39.2 ^ permalink raw reply related [flat|nested] 8+ messages in thread
* [Intel-gfx] ✗ Fi.CI.SPARSE: warning for Aux invalidation 2023-03-20 19:41 [Intel-gfx] [PATCH 0/2] Aux invalidation Andi Shyti 2023-03-20 19:41 ` [Intel-gfx] [PATCH 1/2] drm/i915/gt: Ensure memory quiesced before invalidation Andi Shyti 2023-03-20 19:41 ` [Intel-gfx] [PATCH 2/2] drm/i915/gt: Poll aux invalidation register bit on invalidation Andi Shyti @ 2023-03-21 7:38 ` Patchwork 2023-03-21 7:38 ` [Intel-gfx] ✗ Fi.CI.DOCS: " Patchwork ` (2 subsequent siblings) 5 siblings, 0 replies; 8+ messages in thread From: Patchwork @ 2023-03-21 7:38 UTC (permalink / raw) To: Andi Shyti; +Cc: intel-gfx == Series Details == Series: Aux invalidation URL : https://patchwork.freedesktop.org/series/115417/ State : warning == Summary == Error: git fetch origin failed ^ permalink raw reply [flat|nested] 8+ messages in thread
* [Intel-gfx] ✗ Fi.CI.DOCS: warning for Aux invalidation 2023-03-20 19:41 [Intel-gfx] [PATCH 0/2] Aux invalidation Andi Shyti ` (2 preceding siblings ...) 2023-03-21 7:38 ` [Intel-gfx] ✗ Fi.CI.SPARSE: warning for Aux invalidation Patchwork @ 2023-03-21 7:38 ` Patchwork 2023-03-21 7:52 ` [Intel-gfx] ✓ Fi.CI.BAT: success " Patchwork 2023-03-21 11:39 ` [Intel-gfx] ✓ Fi.CI.IGT: " Patchwork 5 siblings, 0 replies; 8+ messages in thread From: Patchwork @ 2023-03-21 7:38 UTC (permalink / raw) To: Andi Shyti; +Cc: intel-gfx == Series Details == Series: Aux invalidation URL : https://patchwork.freedesktop.org/series/115417/ State : warning == Summary == Error: git fetch origin failed ^ permalink raw reply [flat|nested] 8+ messages in thread
* [Intel-gfx] ✓ Fi.CI.BAT: success for Aux invalidation 2023-03-20 19:41 [Intel-gfx] [PATCH 0/2] Aux invalidation Andi Shyti ` (3 preceding siblings ...) 2023-03-21 7:38 ` [Intel-gfx] ✗ Fi.CI.DOCS: " Patchwork @ 2023-03-21 7:52 ` Patchwork 2023-03-21 11:39 ` [Intel-gfx] ✓ Fi.CI.IGT: " Patchwork 5 siblings, 0 replies; 8+ messages in thread From: Patchwork @ 2023-03-21 7:52 UTC (permalink / raw) To: Andi Shyti; +Cc: intel-gfx [-- Attachment #1: Type: text/plain, Size: 4844 bytes --] == Series Details == Series: Aux invalidation URL : https://patchwork.freedesktop.org/series/115417/ State : success == Summary == CI Bug Log - changes from CI_DRM_12884 -> Patchwork_115417v1 ==================================================== Summary ------- **SUCCESS** No regressions found. External URL: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_115417v1/index.html Participating hosts (35 -> 34) ------------------------------ Missing (1): bat-atsm-1 Known issues ------------ Here are the changes found in Patchwork_115417v1 that come from known issues: ### IGT changes ### #### Issues hit #### * igt@i915_selftest@live@mman: - bat-rpls-1: [PASS][1] -> [TIMEOUT][2] ([i915#6794]) [1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12884/bat-rpls-1/igt@i915_selftest@live@mman.html [2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_115417v1/bat-rpls-1/igt@i915_selftest@live@mman.html * igt@kms_chamelium_hpd@common-hpd-after-suspend: - bat-dg1-6: NOTRUN -> [SKIP][3] ([i915#7828]) [3]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_115417v1/bat-dg1-6/igt@kms_chamelium_hpd@common-hpd-after-suspend.html - bat-rpls-1: NOTRUN -> [SKIP][4] ([i915#7828]) [4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_115417v1/bat-rpls-1/igt@kms_chamelium_hpd@common-hpd-after-suspend.html * igt@kms_pipe_crc_basic@suspend-read-crc: - bat-rpls-1: NOTRUN -> [SKIP][5] ([i915#1845]) [5]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_115417v1/bat-rpls-1/igt@kms_pipe_crc_basic@suspend-read-crc.html #### Possible fixes #### * igt@i915_pm_rpm@module-reload: - bat-dg1-6: [ABORT][6] -> [PASS][7] [6]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12884/bat-dg1-6/igt@i915_pm_rpm@module-reload.html [7]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_115417v1/bat-dg1-6/igt@i915_pm_rpm@module-reload.html #### Warnings #### * igt@kms_setmode@basic-clone-single-crtc: - bat-dg1-6: [SKIP][8] ([i915#3555]) -> [SKIP][9] ([i915#3555] / [i915#4579]) [8]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12884/bat-dg1-6/igt@kms_setmode@basic-clone-single-crtc.html [9]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_115417v1/bat-dg1-6/igt@kms_setmode@basic-clone-single-crtc.html - fi-rkl-11600: [SKIP][10] ([i915#3555] / [i915#4098]) -> [SKIP][11] ([i915#3555] / [i915#4098] / [i915#4579]) [10]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12884/fi-rkl-11600/igt@kms_setmode@basic-clone-single-crtc.html [11]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_115417v1/fi-rkl-11600/igt@kms_setmode@basic-clone-single-crtc.html - bat-dg1-5: [SKIP][12] ([i915#3555]) -> [SKIP][13] ([i915#3555] / [i915#4579]) [12]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12884/bat-dg1-5/igt@kms_setmode@basic-clone-single-crtc.html [13]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_115417v1/bat-dg1-5/igt@kms_setmode@basic-clone-single-crtc.html - fi-tgl-1115g4: [SKIP][14] ([i915#3555]) -> [SKIP][15] ([i915#3555] / [i915#4579]) [14]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12884/fi-tgl-1115g4/igt@kms_setmode@basic-clone-single-crtc.html [15]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_115417v1/fi-tgl-1115g4/igt@kms_setmode@basic-clone-single-crtc.html - bat-dg1-7: [SKIP][16] ([i915#3555]) -> [SKIP][17] ([i915#3555] / [i915#4579]) [16]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12884/bat-dg1-7/igt@kms_setmode@basic-clone-single-crtc.html [17]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_115417v1/bat-dg1-7/igt@kms_setmode@basic-clone-single-crtc.html [i915#1845]: https://gitlab.freedesktop.org/drm/intel/issues/1845 [i915#3555]: https://gitlab.freedesktop.org/drm/intel/issues/3555 [i915#4098]: https://gitlab.freedesktop.org/drm/intel/issues/4098 [i915#4579]: https://gitlab.freedesktop.org/drm/intel/issues/4579 [i915#6794]: https://gitlab.freedesktop.org/drm/intel/issues/6794 [i915#7828]: https://gitlab.freedesktop.org/drm/intel/issues/7828 Build changes ------------- * Linux: CI_DRM_12884 -> Patchwork_115417v1 CI-20190529: 20190529 CI_DRM_12884: 1d4054731cfcb1cb9810d309b70535ae0b90ecf0 @ git://anongit.freedesktop.org/gfx-ci/linux IGT_7208: f327c5d77b6ea6adff1ef6d08f21f232dfe093e3 @ https://gitlab.freedesktop.org/drm/igt-gpu-tools.git Patchwork_115417v1: 1d4054731cfcb1cb9810d309b70535ae0b90ecf0 @ git://anongit.freedesktop.org/gfx-ci/linux ### Linux commits cd588cf04b9d drm/i915/gt: Poll aux invalidation register bit on invalidation 013c9af58824 drm/i915/gt: Ensure memory quiesced before invalidation == Logs == For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_115417v1/index.html [-- Attachment #2: Type: text/html, Size: 6629 bytes --] ^ permalink raw reply [flat|nested] 8+ messages in thread
* [Intel-gfx] ✓ Fi.CI.IGT: success for Aux invalidation 2023-03-20 19:41 [Intel-gfx] [PATCH 0/2] Aux invalidation Andi Shyti ` (4 preceding siblings ...) 2023-03-21 7:52 ` [Intel-gfx] ✓ Fi.CI.BAT: success " Patchwork @ 2023-03-21 11:39 ` Patchwork 5 siblings, 0 replies; 8+ messages in thread From: Patchwork @ 2023-03-21 11:39 UTC (permalink / raw) To: Andi Shyti; +Cc: intel-gfx [-- Attachment #1: Type: text/plain, Size: 21893 bytes --] == Series Details == Series: Aux invalidation URL : https://patchwork.freedesktop.org/series/115417/ State : success == Summary == CI Bug Log - changes from CI_DRM_12884_full -> Patchwork_115417v1_full ==================================================== Summary ------- **SUCCESS** No regressions found. Participating hosts (8 -> 8) ------------------------------ No changes in participating hosts Possible new issues ------------------- Here are the unknown changes that may have been introduced in Patchwork_115417v1_full: ### IGT changes ### #### Suppressed #### The following results come from untrusted machines, tests, or statuses. They do not affect the overall result. * igt@kms_plane@plane-panning-bottom-right-suspend: - {shard-tglu}: NOTRUN -> [SKIP][1] +1 similar issue [1]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_115417v1/shard-tglu-10/igt@kms_plane@plane-panning-bottom-right-suspend.html Known issues ------------ Here are the changes found in Patchwork_115417v1_full that come from known issues: ### IGT changes ### #### Issues hit #### * igt@gen9_exec_parse@allowed-single: - shard-apl: [PASS][2] -> [ABORT][3] ([i915#5566]) [2]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12884/shard-apl2/igt@gen9_exec_parse@allowed-single.html [3]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_115417v1/shard-apl1/igt@gen9_exec_parse@allowed-single.html * igt@kms_cursor_legacy@flip-vs-cursor-atomic-transitions: - shard-glk: [PASS][4] -> [FAIL][5] ([i915#2346]) [4]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12884/shard-glk2/igt@kms_cursor_legacy@flip-vs-cursor-atomic-transitions.html [5]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_115417v1/shard-glk8/igt@kms_cursor_legacy@flip-vs-cursor-atomic-transitions.html * igt@kms_cursor_legacy@flip-vs-cursor-atomic-transitions-varying-size: - shard-apl: [PASS][6] -> [FAIL][7] ([i915#2346]) +1 similar issue [6]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12884/shard-apl3/igt@kms_cursor_legacy@flip-vs-cursor-atomic-transitions-varying-size.html [7]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_115417v1/shard-apl6/igt@kms_cursor_legacy@flip-vs-cursor-atomic-transitions-varying-size.html * igt@perf@stress-open-close: - shard-glk: [PASS][8] -> [ABORT][9] ([i915#5213]) [8]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12884/shard-glk2/igt@perf@stress-open-close.html [9]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_115417v1/shard-glk6/igt@perf@stress-open-close.html #### Possible fixes #### * igt@device_reset@unbind-reset-rebind: - {shard-rkl}: [FAIL][10] ([i915#4778]) -> [PASS][11] [10]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12884/shard-rkl-5/igt@device_reset@unbind-reset-rebind.html [11]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_115417v1/shard-rkl-6/igt@device_reset@unbind-reset-rebind.html * igt@fbdev@write: - {shard-tglu}: [SKIP][12] ([i915#2582]) -> [PASS][13] [12]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12884/shard-tglu-9/igt@fbdev@write.html [13]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_115417v1/shard-tglu-7/igt@fbdev@write.html * {igt@gem_barrier_race@remote-request@rcs0}: - {shard-tglu}: [ABORT][14] ([i915#8211]) -> [PASS][15] [14]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12884/shard-tglu-9/igt@gem_barrier_race@remote-request@rcs0.html [15]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_115417v1/shard-tglu-7/igt@gem_barrier_race@remote-request@rcs0.html * igt@gem_ctx_persistence@smoketest: - {shard-tglu}: [FAIL][16] ([i915#5099]) -> [PASS][17] [16]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12884/shard-tglu-6/igt@gem_ctx_persistence@smoketest.html [17]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_115417v1/shard-tglu-8/igt@gem_ctx_persistence@smoketest.html * igt@gem_exec_balancer@fairslice: - {shard-rkl}: [SKIP][18] ([i915#6259]) -> [PASS][19] [18]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12884/shard-rkl-5/igt@gem_exec_balancer@fairslice.html [19]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_115417v1/shard-rkl-6/igt@gem_exec_balancer@fairslice.html * igt@gem_exec_fair@basic-pace@rcs0: - {shard-rkl}: [FAIL][20] ([i915#2842]) -> [PASS][21] +1 similar issue [20]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12884/shard-rkl-6/igt@gem_exec_fair@basic-pace@rcs0.html [21]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_115417v1/shard-rkl-5/igt@gem_exec_fair@basic-pace@rcs0.html * igt@gem_exec_reloc@basic-gtt-read-noreloc: - {shard-rkl}: [SKIP][22] ([i915#3281]) -> [PASS][23] +10 similar issues [22]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12884/shard-rkl-4/igt@gem_exec_reloc@basic-gtt-read-noreloc.html [23]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_115417v1/shard-rkl-5/igt@gem_exec_reloc@basic-gtt-read-noreloc.html * igt@gem_exec_suspend@basic-s4-devices@smem: - {shard-tglu}: [ABORT][24] ([i915#7975]) -> [PASS][25] [24]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12884/shard-tglu-10/igt@gem_exec_suspend@basic-s4-devices@smem.html [25]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_115417v1/shard-tglu-9/igt@gem_exec_suspend@basic-s4-devices@smem.html * igt@gem_partial_pwrite_pread@write-snoop: - {shard-rkl}: [SKIP][26] ([i915#3282]) -> [PASS][27] +2 similar issues [26]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12884/shard-rkl-6/igt@gem_partial_pwrite_pread@write-snoop.html [27]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_115417v1/shard-rkl-5/igt@gem_partial_pwrite_pread@write-snoop.html * igt@gen9_exec_parse@bb-start-out: - {shard-rkl}: [SKIP][28] ([i915#2527]) -> [PASS][29] +3 similar issues [28]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12884/shard-rkl-6/igt@gen9_exec_parse@bb-start-out.html [29]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_115417v1/shard-rkl-5/igt@gen9_exec_parse@bb-start-out.html * igt@i915_pm_rpm@dpms-lpsp: - {shard-tglu}: [SKIP][30] ([i915#1397]) -> [PASS][31] [30]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12884/shard-tglu-9/igt@i915_pm_rpm@dpms-lpsp.html [31]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_115417v1/shard-tglu-4/igt@i915_pm_rpm@dpms-lpsp.html * igt@i915_pm_rpm@i2c: - {shard-tglu}: [SKIP][32] ([i915#3547]) -> [PASS][33] [32]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12884/shard-tglu-9/igt@i915_pm_rpm@i2c.html [33]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_115417v1/shard-tglu-4/igt@i915_pm_rpm@i2c.html * igt@i915_pm_rpm@system-suspend-modeset: - {shard-rkl}: [SKIP][34] ([fdo#109308]) -> [PASS][35] [34]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12884/shard-rkl-2/igt@i915_pm_rpm@system-suspend-modeset.html [35]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_115417v1/shard-rkl-6/igt@i915_pm_rpm@system-suspend-modeset.html * igt@i915_pm_sseu@full-enable: - {shard-rkl}: [SKIP][36] ([i915#4387]) -> [PASS][37] [36]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12884/shard-rkl-4/igt@i915_pm_sseu@full-enable.html [37]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_115417v1/shard-rkl-5/igt@i915_pm_sseu@full-enable.html * igt@kms_big_fb@x-tiled-32bpp-rotate-0: - {shard-rkl}: [SKIP][38] ([i915#1845] / [i915#4098]) -> [PASS][39] +15 similar issues [38]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12884/shard-rkl-2/igt@kms_big_fb@x-tiled-32bpp-rotate-0.html [39]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_115417v1/shard-rkl-6/igt@kms_big_fb@x-tiled-32bpp-rotate-0.html * igt@kms_ccs@pipe-c-crc-primary-rotation-180-y_tiled_gen12_rc_ccs: - {shard-tglu}: [SKIP][40] ([i915#1845]) -> [PASS][41] +20 similar issues [40]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12884/shard-tglu-10/igt@kms_ccs@pipe-c-crc-primary-rotation-180-y_tiled_gen12_rc_ccs.html [41]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_115417v1/shard-tglu-6/igt@kms_ccs@pipe-c-crc-primary-rotation-180-y_tiled_gen12_rc_ccs.html * igt@kms_ccs@pipe-d-bad-pixel-format-y_tiled_gen12_rc_ccs: - {shard-tglu}: [SKIP][42] ([i915#1845] / [i915#7651]) -> [PASS][43] +26 similar issues [42]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12884/shard-tglu-9/igt@kms_ccs@pipe-d-bad-pixel-format-y_tiled_gen12_rc_ccs.html [43]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_115417v1/shard-tglu-7/igt@kms_ccs@pipe-d-bad-pixel-format-y_tiled_gen12_rc_ccs.html * igt@kms_frontbuffer_tracking@fbc-1p-primscrn-indfb-plflip-blt: - {shard-tglu}: [SKIP][44] ([i915#1849]) -> [PASS][45] +6 similar issues [44]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12884/shard-tglu-10/igt@kms_frontbuffer_tracking@fbc-1p-primscrn-indfb-plflip-blt.html [45]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_115417v1/shard-tglu-6/igt@kms_frontbuffer_tracking@fbc-1p-primscrn-indfb-plflip-blt.html * igt@kms_frontbuffer_tracking@psr-modesetfrombusy: - {shard-rkl}: [SKIP][46] ([fdo#109315]) -> [PASS][47] +3 similar issues [46]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12884/shard-rkl-5/igt@kms_frontbuffer_tracking@psr-modesetfrombusy.html [47]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_115417v1/shard-rkl-6/igt@kms_frontbuffer_tracking@psr-modesetfrombusy.html * igt@kms_frontbuffer_tracking@psr-rgb565-draw-render: - {shard-rkl}: [SKIP][48] ([i915#1849] / [i915#4098]) -> [PASS][49] +6 similar issues [48]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12884/shard-rkl-2/igt@kms_frontbuffer_tracking@psr-rgb565-draw-render.html [49]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_115417v1/shard-rkl-6/igt@kms_frontbuffer_tracking@psr-rgb565-draw-render.html * {igt@kms_plane@invalid-pixel-format-settings}: - {shard-tglu}: [SKIP][50] ([i915#8152]) -> [PASS][51] [50]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12884/shard-tglu-9/igt@kms_plane@invalid-pixel-format-settings.html [51]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_115417v1/shard-tglu-4/igt@kms_plane@invalid-pixel-format-settings.html * igt@kms_psr@primary_mmap_gtt: - {shard-rkl}: [SKIP][52] ([i915#1072]) -> [PASS][53] [52]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12884/shard-rkl-5/igt@kms_psr@primary_mmap_gtt.html [53]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_115417v1/shard-rkl-6/igt@kms_psr@primary_mmap_gtt.html * igt@perf@polling-small-buf: - {shard-rkl}: [FAIL][54] ([i915#1722]) -> [PASS][55] [54]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12884/shard-rkl-4/igt@perf@polling-small-buf.html [55]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_115417v1/shard-rkl-5/igt@perf@polling-small-buf.html * igt@perf_pmu@idle@rcs0: - {shard-rkl}: [FAIL][56] ([i915#4349]) -> [PASS][57] [56]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12884/shard-rkl-4/igt@perf_pmu@idle@rcs0.html [57]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_115417v1/shard-rkl-5/igt@perf_pmu@idle@rcs0.html * igt@prime_vgem@basic-fence-flip: - {shard-rkl}: [SKIP][58] ([fdo#109295] / [i915#3708] / [i915#4098]) -> [PASS][59] [58]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12884/shard-rkl-2/igt@prime_vgem@basic-fence-flip.html [59]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_115417v1/shard-rkl-6/igt@prime_vgem@basic-fence-flip.html * igt@prime_vgem@coherency-gtt: - {shard-rkl}: [SKIP][60] ([fdo#109295] / [fdo#111656] / [i915#3708]) -> [PASS][61] [60]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12884/shard-rkl-6/igt@prime_vgem@coherency-gtt.html [61]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_115417v1/shard-rkl-5/igt@prime_vgem@coherency-gtt.html * igt@syncobj_timeline@invalid-multi-wait-all-unsubmitted-submitted-signaled: - {shard-rkl}: [SKIP][62] ([i915#2575]) -> [PASS][63] +1 similar issue [62]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12884/shard-rkl-5/igt@syncobj_timeline@invalid-multi-wait-all-unsubmitted-submitted-signaled.html [63]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_115417v1/shard-rkl-6/igt@syncobj_timeline@invalid-multi-wait-all-unsubmitted-submitted-signaled.html * igt@sysfs_heartbeat_interval@precise@vcs1: - {shard-dg1}: [FAIL][64] ([i915#1755]) -> [PASS][65] [64]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12884/shard-dg1-15/igt@sysfs_heartbeat_interval@precise@vcs1.html [65]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_115417v1/shard-dg1-15/igt@sysfs_heartbeat_interval@precise@vcs1.html {name}: This element is suppressed. This means it is ignored when computing the status of the difference (SUCCESS, WARNING, or FAILURE). [fdo#103375]: https://bugs.freedesktop.org/show_bug.cgi?id=103375 [fdo#109274]: https://bugs.freedesktop.org/show_bug.cgi?id=109274 [fdo#109279]: https://bugs.freedesktop.org/show_bug.cgi?id=109279 [fdo#109280]: https://bugs.freedesktop.org/show_bug.cgi?id=109280 [fdo#109289]: https://bugs.freedesktop.org/show_bug.cgi?id=109289 [fdo#109295]: https://bugs.freedesktop.org/show_bug.cgi?id=109295 [fdo#109308]: https://bugs.freedesktop.org/show_bug.cgi?id=109308 [fdo#109315]: https://bugs.freedesktop.org/show_bug.cgi?id=109315 [fdo#110189]: https://bugs.freedesktop.org/show_bug.cgi?id=110189 [fdo#110723]: https://bugs.freedesktop.org/show_bug.cgi?id=110723 [fdo#111068]: https://bugs.freedesktop.org/show_bug.cgi?id=111068 [fdo#111614]: https://bugs.freedesktop.org/show_bug.cgi?id=111614 [fdo#111615]: https://bugs.freedesktop.org/show_bug.cgi?id=111615 [fdo#111656]: https://bugs.freedesktop.org/show_bug.cgi?id=111656 [fdo#111825]: https://bugs.freedesktop.org/show_bug.cgi?id=111825 [fdo#111827]: https://bugs.freedesktop.org/show_bug.cgi?id=111827 [fdo#112283]: https://bugs.freedesktop.org/show_bug.cgi?id=112283 [i915#1072]: https://gitlab.freedesktop.org/drm/intel/issues/1072 [i915#132]: https://gitlab.freedesktop.org/drm/intel/issues/132 [i915#1397]: https://gitlab.freedesktop.org/drm/intel/issues/1397 [i915#1722]: https://gitlab.freedesktop.org/drm/intel/issues/1722 [i915#1755]: https://gitlab.freedesktop.org/drm/intel/issues/1755 [i915#1825]: https://gitlab.freedesktop.org/drm/intel/issues/1825 [i915#1845]: https://gitlab.freedesktop.org/drm/intel/issues/1845 [i915#1849]: https://gitlab.freedesktop.org/drm/intel/issues/1849 [i915#2346]: https://gitlab.freedesktop.org/drm/intel/issues/2346 [i915#2435]: https://gitlab.freedesktop.org/drm/intel/issues/2435 [i915#2436]: https://gitlab.freedesktop.org/drm/intel/issues/2436 [i915#2527]: https://gitlab.freedesktop.org/drm/intel/issues/2527 [i915#2575]: https://gitlab.freedesktop.org/drm/intel/issues/2575 [i915#2582]: https://gitlab.freedesktop.org/drm/intel/issues/2582 [i915#2587]: https://gitlab.freedesktop.org/drm/intel/issues/2587 [i915#2672]: https://gitlab.freedesktop.org/drm/intel/issues/2672 [i915#2842]: https://gitlab.freedesktop.org/drm/intel/issues/2842 [i915#2920]: https://gitlab.freedesktop.org/drm/intel/issues/2920 [i915#3116]: https://gitlab.freedesktop.org/drm/intel/issues/3116 [i915#315]: https://gitlab.freedesktop.org/drm/intel/issues/315 [i915#3281]: https://gitlab.freedesktop.org/drm/intel/issues/3281 [i915#3282]: https://gitlab.freedesktop.org/drm/intel/issues/3282 [i915#3291]: https://gitlab.freedesktop.org/drm/intel/issues/3291 [i915#3297]: https://gitlab.freedesktop.org/drm/intel/issues/3297 [i915#3299]: https://gitlab.freedesktop.org/drm/intel/issues/3299 [i915#3359]: https://gitlab.freedesktop.org/drm/intel/issues/3359 [i915#3458]: https://gitlab.freedesktop.org/drm/intel/issues/3458 [i915#3546]: https://gitlab.freedesktop.org/drm/intel/issues/3546 [i915#3547]: https://gitlab.freedesktop.org/drm/intel/issues/3547 [i915#3555]: https://gitlab.freedesktop.org/drm/intel/issues/3555 [i915#3637]: https://gitlab.freedesktop.org/drm/intel/issues/3637 [i915#3638]: https://gitlab.freedesktop.org/drm/intel/issues/3638 [i915#3639]: https://gitlab.freedesktop.org/drm/intel/issues/3639 [i915#3689]: https://gitlab.freedesktop.org/drm/intel/issues/3689 [i915#3708]: https://gitlab.freedesktop.org/drm/intel/issues/3708 [i915#3734]: https://gitlab.freedesktop.org/drm/intel/issues/3734 [i915#3778]: https://gitlab.freedesktop.org/drm/intel/issues/3778 [i915#3840]: https://gitlab.freedesktop.org/drm/intel/issues/3840 [i915#3886]: https://gitlab.freedesktop.org/drm/intel/issues/3886 [i915#4070]: https://gitlab.freedesktop.org/drm/intel/issues/4070 [i915#4077]: https://gitlab.freedesktop.org/drm/intel/issues/4077 [i915#4078]: https://gitlab.freedesktop.org/drm/intel/issues/4078 [i915#4079]: https://gitlab.freedesktop.org/drm/intel/issues/4079 [i915#4083]: https://gitlab.freedesktop.org/drm/intel/issues/4083 [i915#4098]: https://gitlab.freedesktop.org/drm/intel/issues/4098 [i915#4103]: https://gitlab.freedesktop.org/drm/intel/issues/4103 [i915#4258]: https://gitlab.freedesktop.org/drm/intel/issues/4258 [i915#4270]: https://gitlab.freedesktop.org/drm/intel/issues/4270 [i915#4349]: https://gitlab.freedesktop.org/drm/intel/issues/4349 [i915#4387]: https://gitlab.freedesktop.org/drm/intel/issues/4387 [i915#4525]: https://gitlab.freedesktop.org/drm/intel/issues/4525 [i915#4538]: https://gitlab.freedesktop.org/drm/intel/issues/4538 [i915#4579]: https://gitlab.freedesktop.org/drm/intel/issues/4579 [i915#4778]: https://gitlab.freedesktop.org/drm/intel/issues/4778 [i915#4833]: https://gitlab.freedesktop.org/drm/intel/issues/4833 [i915#5099]: https://gitlab.freedesktop.org/drm/intel/issues/5099 [i915#5176]: https://gitlab.freedesktop.org/drm/intel/issues/5176 [i915#5213]: https://gitlab.freedesktop.org/drm/intel/issues/5213 [i915#5235]: https://gitlab.freedesktop.org/drm/intel/issues/5235 [i915#5286]: https://gitlab.freedesktop.org/drm/intel/issues/5286 [i915#5289]: https://gitlab.freedesktop.org/drm/intel/issues/5289 [i915#5325]: https://gitlab.freedesktop.org/drm/intel/issues/5325 [i915#533]: https://gitlab.freedesktop.org/drm/intel/issues/533 [i915#5354]: https://gitlab.freedesktop.org/drm/intel/issues/5354 [i915#5439]: https://gitlab.freedesktop.org/drm/intel/issues/5439 [i915#5563]: https://gitlab.freedesktop.org/drm/intel/issues/5563 [i915#5566]: https://gitlab.freedesktop.org/drm/intel/issues/5566 [i915#5608]: https://gitlab.freedesktop.org/drm/intel/issues/5608 [i915#5723]: https://gitlab.freedesktop.org/drm/intel/issues/5723 [i915#5784]: https://gitlab.freedesktop.org/drm/intel/issues/5784 [i915#6095]: https://gitlab.freedesktop.org/drm/intel/issues/6095 [i915#6247]: https://gitlab.freedesktop.org/drm/intel/issues/6247 [i915#6248]: https://gitlab.freedesktop.org/drm/intel/issues/6248 [i915#6258]: https://gitlab.freedesktop.org/drm/intel/issues/6258 [i915#6259]: https://gitlab.freedesktop.org/drm/intel/issues/6259 [i915#6301]: https://gitlab.freedesktop.org/drm/intel/issues/6301 [i915#6334]: https://gitlab.freedesktop.org/drm/intel/issues/6334 [i915#6433]: https://gitlab.freedesktop.org/drm/intel/issues/6433 [i915#6497]: https://gitlab.freedesktop.org/drm/intel/issues/6497 [i915#6524]: https://gitlab.freedesktop.org/drm/intel/issues/6524 [i915#658]: https://gitlab.freedesktop.org/drm/intel/issues/658 [i915#6621]: https://gitlab.freedesktop.org/drm/intel/issues/6621 [i915#6768]: https://gitlab.freedesktop.org/drm/intel/issues/6768 [i915#6944]: https://gitlab.freedesktop.org/drm/intel/issues/6944 [i915#6946]: https://gitlab.freedesktop.org/drm/intel/issues/6946 [i915#6953]: https://gitlab.freedesktop.org/drm/intel/issues/6953 [i915#7116]: https://gitlab.freedesktop.org/drm/intel/issues/7116 [i915#7118]: https://gitlab.freedesktop.org/drm/intel/issues/7118 [i915#7128]: https://gitlab.freedesktop.org/drm/intel/issues/7128 [i915#7294]: https://gitlab.freedesktop.org/drm/intel/issues/7294 [i915#7651]: https://gitlab.freedesktop.org/drm/intel/issues/7651 [i915#7697]: https://gitlab.freedesktop.org/drm/intel/issues/7697 [i915#7711]: https://gitlab.freedesktop.org/drm/intel/issues/7711 [i915#7811]: https://gitlab.freedesktop.org/drm/intel/issues/7811 [i915#7828]: https://gitlab.freedesktop.org/drm/intel/issues/7828 [i915#7949]: https://gitlab.freedesktop.org/drm/intel/issues/7949 [i915#7957]: https://gitlab.freedesktop.org/drm/intel/issues/7957 [i915#7975]: https://gitlab.freedesktop.org/drm/intel/issues/7975 [i915#8152]: https://gitlab.freedesktop.org/drm/intel/issues/8152 [i915#8154]: https://gitlab.freedesktop.org/drm/intel/issues/8154 [i915#8211]: https://gitlab.freedesktop.org/drm/intel/issues/8211 [i915#8228]: https://gitlab.freedesktop.org/drm/intel/issues/8228 [i915#8282]: https://gitlab.freedesktop.org/drm/intel/issues/8282 [i915#8292]: https://gitlab.freedesktop.org/drm/intel/issues/8292 Build changes ------------- * Linux: CI_DRM_12884 -> Patchwork_115417v1 CI-20190529: 20190529 CI_DRM_12884: 1d4054731cfcb1cb9810d309b70535ae0b90ecf0 @ git://anongit.freedesktop.org/gfx-ci/linux IGT_7208: f327c5d77b6ea6adff1ef6d08f21f232dfe093e3 @ https://gitlab.freedesktop.org/drm/igt-gpu-tools.git Patchwork_115417v1: 1d4054731cfcb1cb9810d309b70535ae0b90ecf0 @ git://anongit.freedesktop.org/gfx-ci/linux piglit_4509: fdc5a4ca11124ab8413c7988896eec4c97336694 @ git://anongit.freedesktop.org/piglit == Logs == For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_115417v1/index.html [-- Attachment #2: Type: text/html, Size: 17725 bytes --] ^ permalink raw reply [flat|nested] 8+ messages in thread
* [Intel-gfx] [PATCH 1/2] drm/i915/gt: Ensure memory quiesced before invalidation @ 2023-02-21 22:13 Jonathan Cavitt 2023-02-21 22:13 ` [Intel-gfx] [PATCH 2/2] drm/i915/gt: Poll aux invalidation register bit on invalidation Jonathan Cavitt 0 siblings, 1 reply; 8+ messages in thread From: Jonathan Cavitt @ 2023-02-21 22:13 UTC (permalink / raw) To: intel-gfx Cc: jonathan.cavitt, gregory.f.germano, saurabhg.gupta, chris.p.wilson All memory traffic must be quiesced before requesting an aux invalidation on platforms that use Aux CCS. Signed-off-by: Jonathan Cavitt <jonathan.cavitt@intel.com> --- drivers/gpu/drm/i915/gt/gen8_engine_cs.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/drivers/gpu/drm/i915/gt/gen8_engine_cs.c b/drivers/gpu/drm/i915/gt/gen8_engine_cs.c index e1c76e5bfa82..6f830f80eb0f 100644 --- a/drivers/gpu/drm/i915/gt/gen8_engine_cs.c +++ b/drivers/gpu/drm/i915/gt/gen8_engine_cs.c @@ -181,6 +181,13 @@ int gen12_emit_flush_rcs(struct i915_request *rq, u32 mode) { struct intel_engine_cs *engine = rq->engine; + /* + * Aux invalidations on Aux CCS platforms require + * memory traffic is quiesced prior. + */ + if (!HAS_FLAT_CCS(engine->i915)) + mode |= EMIT_FLUSH; + if (mode & EMIT_FLUSH) { u32 flags = 0; u32 *cs; -- 2.25.1 ^ permalink raw reply related [flat|nested] 8+ messages in thread
* [Intel-gfx] [PATCH 2/2] drm/i915/gt: Poll aux invalidation register bit on invalidation 2023-02-21 22:13 [Intel-gfx] [PATCH 1/2] drm/i915/gt: Ensure memory quiesced before invalidation Jonathan Cavitt @ 2023-02-21 22:13 ` Jonathan Cavitt 0 siblings, 0 replies; 8+ messages in thread From: Jonathan Cavitt @ 2023-02-21 22:13 UTC (permalink / raw) To: intel-gfx Cc: jonathan.cavitt, gregory.f.germano, saurabhg.gupta, chris.p.wilson For platforms that use Aux CCS, we must wait for aux invalidation to complete by checking the aux invalidation register bit is cleared. Signed-off-by: Jonathan Cavitt <jonathan.cavitt@intel.com> --- drivers/gpu/drm/i915/gt/gen8_engine_cs.c | 17 +++++++++++++---- drivers/gpu/drm/i915/gt/intel_gpu_commands.h | 1 + 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/drm/i915/gt/gen8_engine_cs.c b/drivers/gpu/drm/i915/gt/gen8_engine_cs.c index 6f830f80eb0f..d93484211abd 100644 --- a/drivers/gpu/drm/i915/gt/gen8_engine_cs.c +++ b/drivers/gpu/drm/i915/gt/gen8_engine_cs.c @@ -174,6 +174,16 @@ u32 *gen12_emit_aux_table_inv(struct intel_gt *gt, u32 *cs, const i915_reg_t inv *cs++ = AUX_INV; *cs++ = MI_NOOP; + *cs++ = MI_SEMAPHORE_WAIT_TOKEN | + MI_SEMAPHORE_REGISTER_POLL | + MI_SEMAPHORE_POLL | + MI_SEMAPHORE_SAD_EQ_SDD; + *cs++ = 0; + *cs++ = i915_mmio_reg_offset(inv_reg) + gsi_offset; + *cs++ = 0; + *cs++ = 0; + *cs++ = MI_NOOP; + return cs; } @@ -243,10 +253,9 @@ int gen12_emit_flush_rcs(struct i915_request *rq, u32 mode) else if (engine->class == COMPUTE_CLASS) flags &= ~PIPE_CONTROL_3D_ENGINE_FLAGS; + count = 8; if (!HAS_FLAT_CCS(rq->engine->i915)) - count = 8 + 4; - else - count = 8; + count += 10; cs = intel_ring_begin(rq, count); if (IS_ERR(cs)) @@ -289,7 +298,7 @@ int gen12_emit_flush_xcs(struct i915_request *rq, u32 mode) aux_inv = rq->engine->mask & ~GENMASK(_BCS(I915_MAX_BCS - 1), BCS0); if (aux_inv) - cmd += 4; + cmd += 10; } } diff --git a/drivers/gpu/drm/i915/gt/intel_gpu_commands.h b/drivers/gpu/drm/i915/gt/intel_gpu_commands.h index e10507fa71ce..8026b6a89192 100644 --- a/drivers/gpu/drm/i915/gt/intel_gpu_commands.h +++ b/drivers/gpu/drm/i915/gt/intel_gpu_commands.h @@ -121,6 +121,7 @@ #define MI_SEMAPHORE_TARGET(engine) ((engine)<<15) #define MI_SEMAPHORE_WAIT MI_INSTR(0x1c, 2) /* GEN8+ */ #define MI_SEMAPHORE_WAIT_TOKEN MI_INSTR(0x1c, 3) /* GEN12+ */ +#define MI_SEMAPHORE_REGISTER_POLL (1 << 16) #define MI_SEMAPHORE_POLL (1 << 15) #define MI_SEMAPHORE_SAD_GT_SDD (0 << 12) #define MI_SEMAPHORE_SAD_GTE_SDD (1 << 12) -- 2.25.1 ^ permalink raw reply related [flat|nested] 8+ messages in thread
end of thread, other threads:[~2023-03-21 11:39 UTC | newest] Thread overview: 8+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2023-03-20 19:41 [Intel-gfx] [PATCH 0/2] Aux invalidation Andi Shyti 2023-03-20 19:41 ` [Intel-gfx] [PATCH 1/2] drm/i915/gt: Ensure memory quiesced before invalidation Andi Shyti 2023-03-20 19:41 ` [Intel-gfx] [PATCH 2/2] drm/i915/gt: Poll aux invalidation register bit on invalidation Andi Shyti 2023-03-21 7:38 ` [Intel-gfx] ✗ Fi.CI.SPARSE: warning for Aux invalidation Patchwork 2023-03-21 7:38 ` [Intel-gfx] ✗ Fi.CI.DOCS: " Patchwork 2023-03-21 7:52 ` [Intel-gfx] ✓ Fi.CI.BAT: success " Patchwork 2023-03-21 11:39 ` [Intel-gfx] ✓ Fi.CI.IGT: " Patchwork -- strict thread matches above, loose matches on Subject: below -- 2023-02-21 22:13 [Intel-gfx] [PATCH 1/2] drm/i915/gt: Ensure memory quiesced before invalidation Jonathan Cavitt 2023-02-21 22:13 ` [Intel-gfx] [PATCH 2/2] drm/i915/gt: Poll aux invalidation register bit on invalidation Jonathan Cavitt
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox