* [Intel-gfx] [PATCH] drm/i915/gt: Drain the breadcrumbs just once
@ 2020-12-17 9:15 Chris Wilson
2020-12-17 11:13 ` [Intel-gfx] ✓ Fi.CI.BAT: success for " Patchwork
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Chris Wilson @ 2020-12-17 9:15 UTC (permalink / raw)
To: intel-gfx; +Cc: Chris Wilson
Matthew Brost pointed out that the while-loop on a shared breadcrumb was
inherently fraught with danger as it competed with the other users of
the breadcrumbs. However, in order to completely drain the re-arming irq
worker, the while-loop is a necessity, despite my optimism that we could
force cancellation with a couple of irq_work invocations.
Given that we can't merely drop the while-loop, use an activity counter on
the breadcrumbs to detect when we are parking the breadcrumbs for the
last time.
Based on a patch by Matthew Brost.
Reported-by: Matthew Brost <matthew.brost@intel.com>
Suggested-by: Matthew Brost <matthew.brost@intel.com>
Fixes: 9d5612ca165a ("drm/i915/gt: Defer enabling the breadcrumb interrupt to after submission")
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Cc: Matthew Brost <matthew.brost@intel.com>
---
drivers/gpu/drm/i915/gt/intel_breadcrumbs.c | 10 ++++++----
drivers/gpu/drm/i915/gt/intel_breadcrumbs.h | 13 ++++++++++++-
drivers/gpu/drm/i915/gt/intel_breadcrumbs_types.h | 6 ++++--
drivers/gpu/drm/i915/gt/intel_engine_pm.c | 1 +
4 files changed, 23 insertions(+), 7 deletions(-)
diff --git a/drivers/gpu/drm/i915/gt/intel_breadcrumbs.c b/drivers/gpu/drm/i915/gt/intel_breadcrumbs.c
index 00918300f53f..3c62fd6daa76 100644
--- a/drivers/gpu/drm/i915/gt/intel_breadcrumbs.c
+++ b/drivers/gpu/drm/i915/gt/intel_breadcrumbs.c
@@ -332,17 +332,19 @@ void intel_breadcrumbs_reset(struct intel_breadcrumbs *b)
spin_unlock_irqrestore(&b->irq_lock, flags);
}
-void intel_breadcrumbs_park(struct intel_breadcrumbs *b)
+void __intel_breadcrumbs_park(struct intel_breadcrumbs *b)
{
- /* Kick the work once more to drain the signalers */
+ if (!READ_ONCE(b->irq_armed))
+ return;
+
+ /* Kick the work once more to drain the signalers, and disarm the irq */
irq_work_sync(&b->irq_work);
- while (unlikely(READ_ONCE(b->irq_armed))) {
+ while (READ_ONCE(b->irq_armed) && !atomic_read(&b->active)) {
local_irq_disable();
signal_irq_work(&b->irq_work);
local_irq_enable();
cond_resched();
}
- GEM_BUG_ON(!list_empty(&b->signalers));
}
void intel_breadcrumbs_free(struct intel_breadcrumbs *b)
diff --git a/drivers/gpu/drm/i915/gt/intel_breadcrumbs.h b/drivers/gpu/drm/i915/gt/intel_breadcrumbs.h
index ed3d1deabfbd..75cc9cff3ae3 100644
--- a/drivers/gpu/drm/i915/gt/intel_breadcrumbs.h
+++ b/drivers/gpu/drm/i915/gt/intel_breadcrumbs.h
@@ -19,7 +19,18 @@ intel_breadcrumbs_create(struct intel_engine_cs *irq_engine);
void intel_breadcrumbs_free(struct intel_breadcrumbs *b);
void intel_breadcrumbs_reset(struct intel_breadcrumbs *b);
-void intel_breadcrumbs_park(struct intel_breadcrumbs *b);
+void __intel_breadcrumbs_park(struct intel_breadcrumbs *b);
+
+static inline void intel_breadcrumbs_unpark(struct intel_breadcrumbs *b)
+{
+ atomic_inc(&b->active);
+}
+
+static inline void intel_breadcrumbs_park(struct intel_breadcrumbs *b)
+{
+ if (atomic_dec_and_test(&b->active))
+ __intel_breadcrumbs_park(b);
+}
static inline void
intel_engine_signal_breadcrumbs(struct intel_engine_cs *engine)
diff --git a/drivers/gpu/drm/i915/gt/intel_breadcrumbs_types.h b/drivers/gpu/drm/i915/gt/intel_breadcrumbs_types.h
index a74bb3062bd8..d85a6f74fb87 100644
--- a/drivers/gpu/drm/i915/gt/intel_breadcrumbs_types.h
+++ b/drivers/gpu/drm/i915/gt/intel_breadcrumbs_types.h
@@ -29,8 +29,7 @@
* the overhead of waking that client is much preferred.
*/
struct intel_breadcrumbs {
- /* Not all breadcrumbs are attached to physical HW */
- struct intel_engine_cs *irq_engine;
+ atomic_t active;
spinlock_t signalers_lock; /* protects the list of signalers */
struct list_head signalers;
@@ -40,6 +39,9 @@ struct intel_breadcrumbs {
struct irq_work irq_work; /* for use from inside irq_lock */
unsigned int irq_enabled;
bool irq_armed;
+
+ /* Not all breadcrumbs are attached to physical HW */
+ struct intel_engine_cs *irq_engine;
};
#endif /* __INTEL_BREADCRUMBS_TYPES__ */
diff --git a/drivers/gpu/drm/i915/gt/intel_engine_pm.c b/drivers/gpu/drm/i915/gt/intel_engine_pm.c
index 499b09cb4acf..d74e748f677a 100644
--- a/drivers/gpu/drm/i915/gt/intel_engine_pm.c
+++ b/drivers/gpu/drm/i915/gt/intel_engine_pm.c
@@ -65,6 +65,7 @@ static int __engine_unpark(struct intel_wakeref *wf)
if (engine->unpark)
engine->unpark(engine);
+ intel_breadcrumbs_unpark(engine->breadcrumbs);
intel_engine_unpark_heartbeat(engine);
return 0;
}
--
2.20.1
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [Intel-gfx] ✓ Fi.CI.BAT: success for drm/i915/gt: Drain the breadcrumbs just once
2020-12-17 9:15 [Intel-gfx] [PATCH] drm/i915/gt: Drain the breadcrumbs just once Chris Wilson
@ 2020-12-17 11:13 ` Patchwork
2020-12-17 13:15 ` [Intel-gfx] ✗ Fi.CI.IGT: failure " Patchwork
2020-12-17 18:47 ` [Intel-gfx] [PATCH] " Matthew Brost
2 siblings, 0 replies; 4+ messages in thread
From: Patchwork @ 2020-12-17 11:13 UTC (permalink / raw)
To: Chris Wilson; +Cc: intel-gfx
[-- Attachment #1.1: Type: text/plain, Size: 2653 bytes --]
== Series Details ==
Series: drm/i915/gt: Drain the breadcrumbs just once
URL : https://patchwork.freedesktop.org/series/85037/
State : success
== Summary ==
CI Bug Log - changes from CI_DRM_9496 -> Patchwork_19167
====================================================
Summary
-------
**SUCCESS**
No regressions found.
External URL: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19167/index.html
Known issues
------------
Here are the changes found in Patchwork_19167 that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@i915_selftest@live@gt_heartbeat:
- fi-bsw-n3050: [PASS][1] -> [DMESG-FAIL][2] ([i915#2675] / [i915#541])
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9496/fi-bsw-n3050/igt@i915_selftest@live@gt_heartbeat.html
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19167/fi-bsw-n3050/igt@i915_selftest@live@gt_heartbeat.html
* igt@prime_self_import@basic-with_one_bo_two_files:
- fi-tgl-y: [PASS][3] -> [DMESG-WARN][4] ([i915#402]) +1 similar issue
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9496/fi-tgl-y/igt@prime_self_import@basic-with_one_bo_two_files.html
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19167/fi-tgl-y/igt@prime_self_import@basic-with_one_bo_two_files.html
#### Possible fixes ####
* igt@i915_getparams_basic@basic-subslice-total:
- fi-tgl-y: [DMESG-WARN][5] ([i915#402]) -> [PASS][6] +2 similar issues
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9496/fi-tgl-y/igt@i915_getparams_basic@basic-subslice-total.html
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19167/fi-tgl-y/igt@i915_getparams_basic@basic-subslice-total.html
[i915#2675]: https://gitlab.freedesktop.org/drm/intel/issues/2675
[i915#402]: https://gitlab.freedesktop.org/drm/intel/issues/402
[i915#541]: https://gitlab.freedesktop.org/drm/intel/issues/541
Participating hosts (42 -> 39)
------------------------------
Missing (3): fi-bsw-cyan fi-bdw-samus fi-hsw-4200u
Build changes
-------------
* Linux: CI_DRM_9496 -> Patchwork_19167
CI-20190529: 20190529
CI_DRM_9496: c1bf99ceda83bcdd33f05515deb9efc3649d449e @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_5905: 3d0934900bddeb7a68f1abab4cd05077f0609e32 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_19167: 5fd3c4d2c8955af09fdf227412a2e5757f4d57fd @ git://anongit.freedesktop.org/gfx-ci/linux
== Linux commits ==
5fd3c4d2c895 drm/i915/gt: Drain the breadcrumbs just once
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19167/index.html
[-- Attachment #1.2: Type: text/html, Size: 3375 bytes --]
[-- Attachment #2: Type: text/plain, Size: 160 bytes --]
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 4+ messages in thread
* [Intel-gfx] ✗ Fi.CI.IGT: failure for drm/i915/gt: Drain the breadcrumbs just once
2020-12-17 9:15 [Intel-gfx] [PATCH] drm/i915/gt: Drain the breadcrumbs just once Chris Wilson
2020-12-17 11:13 ` [Intel-gfx] ✓ Fi.CI.BAT: success for " Patchwork
@ 2020-12-17 13:15 ` Patchwork
2020-12-17 18:47 ` [Intel-gfx] [PATCH] " Matthew Brost
2 siblings, 0 replies; 4+ messages in thread
From: Patchwork @ 2020-12-17 13:15 UTC (permalink / raw)
To: Chris Wilson; +Cc: intel-gfx
[-- Attachment #1.1: Type: text/plain, Size: 24924 bytes --]
== Series Details ==
Series: drm/i915/gt: Drain the breadcrumbs just once
URL : https://patchwork.freedesktop.org/series/85037/
State : failure
== Summary ==
CI Bug Log - changes from CI_DRM_9496_full -> Patchwork_19167_full
====================================================
Summary
-------
**FAILURE**
Serious unknown changes coming with Patchwork_19167_full absolutely need to be
verified manually.
If you think the reported changes have nothing to do with the changes
introduced in Patchwork_19167_full, please notify your bug team to allow them
to document this new failure mode, which will reduce false positives in CI.
Possible new issues
-------------------
Here are the unknown changes that may have been introduced in Patchwork_19167_full:
### IGT changes ###
#### Possible regressions ####
* igt@gem_userptr_blits@nohangcheck:
- shard-snb: [PASS][1] -> [INCOMPLETE][2]
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9496/shard-snb5/igt@gem_userptr_blits@nohangcheck.html
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19167/shard-snb2/igt@gem_userptr_blits@nohangcheck.html
* igt@kms_cursor_crc@pipe-b-cursor-suspend:
- shard-kbl: NOTRUN -> [DMESG-WARN][3]
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19167/shard-kbl3/igt@kms_cursor_crc@pipe-b-cursor-suspend.html
* igt@sysfs_heartbeat_interval@precise@vecs0:
- shard-apl: [PASS][4] -> [FAIL][5]
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9496/shard-apl7/igt@sysfs_heartbeat_interval@precise@vecs0.html
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19167/shard-apl8/igt@sysfs_heartbeat_interval@precise@vecs0.html
#### Suppressed ####
The following results come from untrusted machines, tests, or statuses.
They do not affect the overall result.
* {igt@gem_exec_schedule@u-fairslice-all}:
- shard-iclb: [PASS][6] -> [DMESG-WARN][7]
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9496/shard-iclb8/igt@gem_exec_schedule@u-fairslice-all.html
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19167/shard-iclb2/igt@gem_exec_schedule@u-fairslice-all.html
New tests
---------
New tests have been introduced between CI_DRM_9496_full and Patchwork_19167_full:
### New IGT tests (1) ###
* igt@kms_atomic_transition@modeset-transition-nonblocking-fencing:
- Statuses :
- Exec time: [None] s
Known issues
------------
Here are the changes found in Patchwork_19167_full that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@drm_mm@all@color_evict:
- shard-skl: NOTRUN -> [INCOMPLETE][8] ([i915#2485])
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19167/shard-skl10/igt@drm_mm@all@color_evict.html
* igt@gem_ctx_persistence@legacy-engines-queued:
- shard-snb: NOTRUN -> [SKIP][9] ([fdo#109271] / [i915#1099])
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19167/shard-snb7/igt@gem_ctx_persistence@legacy-engines-queued.html
* igt@gem_exec_reloc@basic-many-active@rcs0:
- shard-snb: NOTRUN -> [FAIL][10] ([i915#2389]) +2 similar issues
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19167/shard-snb7/igt@gem_exec_reloc@basic-many-active@rcs0.html
* igt@gem_pwrite@basic-exhaustion:
- shard-snb: NOTRUN -> [WARN][11] ([i915#2658])
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19167/shard-snb7/igt@gem_pwrite@basic-exhaustion.html
* igt@gen9_exec_parse@allowed-all:
- shard-kbl: [PASS][12] -> [DMESG-WARN][13] ([i915#1436] / [i915#716])
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9496/shard-kbl7/igt@gen9_exec_parse@allowed-all.html
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19167/shard-kbl1/igt@gen9_exec_parse@allowed-all.html
* igt@i915_pm_lpsp@kms-lpsp@kms-lpsp-dp:
- shard-kbl: NOTRUN -> [SKIP][14] ([fdo#109271] / [i915#1937])
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19167/shard-kbl3/igt@i915_pm_lpsp@kms-lpsp@kms-lpsp-dp.html
* igt@kms_async_flips@alternate-sync-async-flip:
- shard-skl: [PASS][15] -> [FAIL][16] ([i915#2521])
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9496/shard-skl8/igt@kms_async_flips@alternate-sync-async-flip.html
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19167/shard-skl1/igt@kms_async_flips@alternate-sync-async-flip.html
* igt@kms_big_joiner@basic:
- shard-kbl: NOTRUN -> [SKIP][17] ([fdo#109271] / [i915#2705])
[17]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19167/shard-kbl3/igt@kms_big_joiner@basic.html
* igt@kms_ccs@pipe-c-ccs-on-another-bo:
- shard-skl: NOTRUN -> [SKIP][18] ([fdo#109271] / [fdo#111304])
[18]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19167/shard-skl8/igt@kms_ccs@pipe-c-ccs-on-another-bo.html
* igt@kms_chamelium@dp-audio-edid:
- shard-skl: NOTRUN -> [SKIP][19] ([fdo#109271] / [fdo#111827]) +3 similar issues
[19]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19167/shard-skl8/igt@kms_chamelium@dp-audio-edid.html
* igt@kms_chamelium@hdmi-hpd-storm:
- shard-kbl: NOTRUN -> [SKIP][20] ([fdo#109271] / [fdo#111827]) +4 similar issues
[20]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19167/shard-kbl3/igt@kms_chamelium@hdmi-hpd-storm.html
* igt@kms_color@pipe-b-ctm-green-to-red:
- shard-skl: [PASS][21] -> [FAIL][22] ([i915#129])
[21]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9496/shard-skl6/igt@kms_color@pipe-b-ctm-green-to-red.html
[22]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19167/shard-skl7/igt@kms_color@pipe-b-ctm-green-to-red.html
* igt@kms_color_chamelium@pipe-a-ctm-blue-to-red:
- shard-snb: NOTRUN -> [SKIP][23] ([fdo#109271] / [fdo#111827]) +1 similar issue
[23]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19167/shard-snb7/igt@kms_color_chamelium@pipe-a-ctm-blue-to-red.html
* igt@kms_cursor_crc@pipe-c-cursor-128x42-sliding:
- shard-skl: [PASS][24] -> [FAIL][25] ([i915#54]) +3 similar issues
[24]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9496/shard-skl6/igt@kms_cursor_crc@pipe-c-cursor-128x42-sliding.html
[25]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19167/shard-skl6/igt@kms_cursor_crc@pipe-c-cursor-128x42-sliding.html
* igt@kms_cursor_legacy@pipe-d-torture-bo:
- shard-skl: NOTRUN -> [SKIP][26] ([fdo#109271] / [i915#533]) +1 similar issue
[26]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19167/shard-skl8/igt@kms_cursor_legacy@pipe-d-torture-bo.html
* igt@kms_flip@flip-vs-expired-vblank-interruptible@a-edp1:
- shard-tglb: [PASS][27] -> [FAIL][28] ([i915#2598])
[27]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9496/shard-tglb5/igt@kms_flip@flip-vs-expired-vblank-interruptible@a-edp1.html
[28]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19167/shard-tglb5/igt@kms_flip@flip-vs-expired-vblank-interruptible@a-edp1.html
* igt@kms_flip@flip-vs-expired-vblank@a-edp1:
- shard-skl: [PASS][29] -> [FAIL][30] ([i915#79]) +1 similar issue
[29]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9496/shard-skl4/igt@kms_flip@flip-vs-expired-vblank@a-edp1.html
[30]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19167/shard-skl5/igt@kms_flip@flip-vs-expired-vblank@a-edp1.html
* igt@kms_flip@flip-vs-suspend-interruptible@b-edp1:
- shard-skl: [PASS][31] -> [INCOMPLETE][32] ([i915#198])
[31]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9496/shard-skl6/igt@kms_flip@flip-vs-suspend-interruptible@b-edp1.html
[32]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19167/shard-skl1/igt@kms_flip@flip-vs-suspend-interruptible@b-edp1.html
* igt@kms_flip@plain-flip-ts-check@c-edp1:
- shard-skl: [PASS][33] -> [FAIL][34] ([i915#2122]) +1 similar issue
[33]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9496/shard-skl1/igt@kms_flip@plain-flip-ts-check@c-edp1.html
[34]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19167/shard-skl3/igt@kms_flip@plain-flip-ts-check@c-edp1.html
* igt@kms_pipe_b_c_ivb@pipe-b-double-modeset-then-modeset-pipe-c:
- shard-snb: NOTRUN -> [SKIP][35] ([fdo#109271]) +29 similar issues
[35]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19167/shard-snb7/igt@kms_pipe_b_c_ivb@pipe-b-double-modeset-then-modeset-pipe-c.html
* igt@kms_plane_alpha_blend@pipe-b-alpha-7efc:
- shard-kbl: NOTRUN -> [FAIL][36] ([fdo#108145] / [i915#265])
[36]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19167/shard-kbl3/igt@kms_plane_alpha_blend@pipe-b-alpha-7efc.html
* igt@kms_psr@psr2_sprite_plane_move:
- shard-iclb: [PASS][37] -> [SKIP][38] ([fdo#109441]) +2 similar issues
[37]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9496/shard-iclb2/igt@kms_psr@psr2_sprite_plane_move.html
[38]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19167/shard-iclb4/igt@kms_psr@psr2_sprite_plane_move.html
* igt@nouveau_crc@pipe-d-ctx-flip-detection:
- shard-skl: NOTRUN -> [SKIP][39] ([fdo#109271]) +30 similar issues
[39]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19167/shard-skl8/igt@nouveau_crc@pipe-d-ctx-flip-detection.html
* igt@perf@polling-parameterized:
- shard-tglb: [PASS][40] -> [FAIL][41] ([i915#1542])
[40]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9496/shard-tglb6/igt@perf@polling-parameterized.html
[41]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19167/shard-tglb6/igt@perf@polling-parameterized.html
* igt@prime_nv_pcopy@test2:
- shard-kbl: NOTRUN -> [SKIP][42] ([fdo#109271]) +28 similar issues
[42]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19167/shard-kbl3/igt@prime_nv_pcopy@test2.html
* igt@sysfs_heartbeat_interval@mixed@rcs0:
- shard-skl: [PASS][43] -> [FAIL][44] ([i915#1731])
[43]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9496/shard-skl2/igt@sysfs_heartbeat_interval@mixed@rcs0.html
[44]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19167/shard-skl8/igt@sysfs_heartbeat_interval@mixed@rcs0.html
* igt@sysfs_heartbeat_interval@nopreempt@rcs0:
- shard-skl: [PASS][45] -> [FAIL][46] ([i915#1778])
[45]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9496/shard-skl7/igt@sysfs_heartbeat_interval@nopreempt@rcs0.html
[46]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19167/shard-skl4/igt@sysfs_heartbeat_interval@nopreempt@rcs0.html
#### Possible fixes ####
* igt@drm_mm@all@insert_range:
- shard-skl: [INCOMPLETE][47] ([CI#80] / [i915#2485]) -> [PASS][48]
[47]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9496/shard-skl9/igt@drm_mm@all@insert_range.html
[48]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19167/shard-skl10/igt@drm_mm@all@insert_range.html
* {igt@gem_exec_balancer@fairslice}:
- shard-tglb: [FAIL][49] ([i915#2802]) -> [PASS][50]
[49]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9496/shard-tglb3/igt@gem_exec_balancer@fairslice.html
[50]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19167/shard-tglb8/igt@gem_exec_balancer@fairslice.html
* igt@gem_exec_parallel@fds@vecs0:
- shard-glk: [FAIL][51] -> [PASS][52]
[51]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9496/shard-glk5/igt@gem_exec_parallel@fds@vecs0.html
[52]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19167/shard-glk2/igt@gem_exec_parallel@fds@vecs0.html
* igt@gem_exec_whisper@basic-queues-all:
- shard-glk: [DMESG-WARN][53] ([i915#118] / [i915#95]) -> [PASS][54]
[53]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9496/shard-glk5/igt@gem_exec_whisper@basic-queues-all.html
[54]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19167/shard-glk6/igt@gem_exec_whisper@basic-queues-all.html
* igt@gem_huc_copy@huc-copy:
- shard-tglb: [SKIP][55] ([i915#2190]) -> [PASS][56]
[55]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9496/shard-tglb6/igt@gem_huc_copy@huc-copy.html
[56]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19167/shard-tglb2/igt@gem_huc_copy@huc-copy.html
* {igt@gem_vm_create@destroy-race}:
- shard-tglb: [FAIL][57] -> [PASS][58]
[57]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9496/shard-tglb1/igt@gem_vm_create@destroy-race.html
[58]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19167/shard-tglb3/igt@gem_vm_create@destroy-race.html
* igt@gem_workarounds@suspend-resume:
- shard-kbl: [DMESG-WARN][59] ([i915#180]) -> [PASS][60]
[59]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9496/shard-kbl7/igt@gem_workarounds@suspend-resume.html
[60]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19167/shard-kbl3/igt@gem_workarounds@suspend-resume.html
* igt@i915_suspend@fence-restore-untiled:
- shard-snb: [DMESG-WARN][61] -> [PASS][62]
[61]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9496/shard-snb6/igt@i915_suspend@fence-restore-untiled.html
[62]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19167/shard-snb7/igt@i915_suspend@fence-restore-untiled.html
* igt@kms_color@pipe-a-ctm-0-25:
- shard-skl: [DMESG-WARN][63] ([i915#1982]) -> [PASS][64]
[63]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9496/shard-skl3/igt@kms_color@pipe-a-ctm-0-25.html
[64]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19167/shard-skl2/igt@kms_color@pipe-a-ctm-0-25.html
* igt@kms_cursor_crc@pipe-c-cursor-64x21-offscreen:
- shard-skl: [FAIL][65] ([i915#54]) -> [PASS][66] +4 similar issues
[65]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9496/shard-skl2/igt@kms_cursor_crc@pipe-c-cursor-64x21-offscreen.html
[66]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19167/shard-skl3/igt@kms_cursor_crc@pipe-c-cursor-64x21-offscreen.html
* igt@kms_cursor_legacy@2x-long-cursor-vs-flip-atomic:
- shard-hsw: [FAIL][67] ([i915#96]) -> [PASS][68]
[67]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9496/shard-hsw1/igt@kms_cursor_legacy@2x-long-cursor-vs-flip-atomic.html
[68]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19167/shard-hsw7/igt@kms_cursor_legacy@2x-long-cursor-vs-flip-atomic.html
* igt@kms_cursor_legacy@cursor-vs-flip-toggle:
- shard-hsw: [FAIL][69] ([i915#2370]) -> [PASS][70]
[69]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9496/shard-hsw1/igt@kms_cursor_legacy@cursor-vs-flip-toggle.html
[70]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19167/shard-hsw1/igt@kms_cursor_legacy@cursor-vs-flip-toggle.html
* igt@kms_flip@flip-vs-expired-vblank-interruptible@a-edp1:
- shard-skl: [FAIL][71] ([i915#2122]) -> [PASS][72]
[71]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9496/shard-skl6/igt@kms_flip@flip-vs-expired-vblank-interruptible@a-edp1.html
[72]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19167/shard-skl1/igt@kms_flip@flip-vs-expired-vblank-interruptible@a-edp1.html
* igt@kms_hdr@bpc-switch:
- shard-skl: [FAIL][73] ([i915#1188]) -> [PASS][74]
[73]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9496/shard-skl7/igt@kms_hdr@bpc-switch.html
[74]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19167/shard-skl2/igt@kms_hdr@bpc-switch.html
* igt@kms_plane@plane-panning-bottom-right-suspend-pipe-c-planes:
- shard-skl: [INCOMPLETE][75] ([i915#198]) -> [PASS][76]
[75]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9496/shard-skl10/igt@kms_plane@plane-panning-bottom-right-suspend-pipe-c-planes.html
[76]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19167/shard-skl8/igt@kms_plane@plane-panning-bottom-right-suspend-pipe-c-planes.html
* igt@kms_plane_alpha_blend@pipe-b-coverage-7efc:
- shard-skl: [FAIL][77] ([fdo#108145] / [i915#265]) -> [PASS][78]
[77]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9496/shard-skl5/igt@kms_plane_alpha_blend@pipe-b-coverage-7efc.html
[78]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19167/shard-skl10/igt@kms_plane_alpha_blend@pipe-b-coverage-7efc.html
* igt@kms_psr2_su@page_flip:
- shard-iclb: [SKIP][79] ([fdo#109642] / [fdo#111068]) -> [PASS][80]
[79]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9496/shard-iclb8/igt@kms_psr2_su@page_flip.html
[80]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19167/shard-iclb2/igt@kms_psr2_su@page_flip.html
* igt@kms_psr@psr2_cursor_mmap_cpu:
- shard-iclb: [SKIP][81] ([fdo#109441]) -> [PASS][82] +3 similar issues
[81]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9496/shard-iclb1/igt@kms_psr@psr2_cursor_mmap_cpu.html
[82]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19167/shard-iclb2/igt@kms_psr@psr2_cursor_mmap_cpu.html
* igt@perf@blocking:
- shard-skl: [FAIL][83] ([i915#1542]) -> [PASS][84]
[83]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9496/shard-skl5/igt@perf@blocking.html
[84]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19167/shard-skl5/igt@perf@blocking.html
#### Warnings ####
* igt@i915_pm_rc6_residency@rc6-idle:
- shard-iclb: [WARN][85] ([i915#2681] / [i915#2684]) -> [WARN][86] ([i915#2684])
[85]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9496/shard-iclb1/igt@i915_pm_rc6_residency@rc6-idle.html
[86]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19167/shard-iclb5/igt@i915_pm_rc6_residency@rc6-idle.html
* igt@kms_dp_dsc@basic-dsc-enable-edp:
- shard-iclb: [SKIP][87] ([fdo#109349]) -> [DMESG-WARN][88] ([i915#1226])
[87]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9496/shard-iclb8/igt@kms_dp_dsc@basic-dsc-enable-edp.html
[88]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19167/shard-iclb2/igt@kms_dp_dsc@basic-dsc-enable-edp.html
* igt@runner@aborted:
- shard-kbl: ([FAIL][89], [FAIL][90]) ([i915#2295] / [i915#2722] / [i915#483]) -> ([FAIL][91], [FAIL][92], [FAIL][93]) ([fdo#109271] / [i915#1436] / [i915#1814] / [i915#2295] / [i915#2722] / [i915#483] / [i915#716])
[89]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9496/shard-kbl6/igt@runner@aborted.html
[90]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9496/shard-kbl7/igt@runner@aborted.html
[91]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19167/shard-kbl1/igt@runner@aborted.html
[92]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19167/shard-kbl2/igt@runner@aborted.html
[93]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19167/shard-kbl3/igt@runner@aborted.html
- shard-iclb: ([FAIL][94], [FAIL][95]) ([i915#1814] / [i915#2295] / [i915#2722] / [i915#2724] / [i915#483]) -> ([FAIL][96], [FAIL][97], [FAIL][98]) ([i915#1814] / [i915#2295] / [i915#2426] / [i915#2722] / [i915#2724] / [i915#483])
[94]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9496/shard-iclb2/igt@runner@aborted.html
[95]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9496/shard-iclb5/igt@runner@aborted.html
[96]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19167/shard-iclb4/igt@runner@aborted.html
[97]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19167/shard-iclb2/igt@runner@aborted.html
[98]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19167/shard-iclb1/igt@runner@aborted.html
- shard-tglb: ([FAIL][99], [FAIL][100]) ([i915#1602] / [i915#2295] / [i915#2722]) -> ([FAIL][101], [FAIL][102], [FAIL][103]) ([i915#1602] / [i915#2295] / [i915#2426] / [i915#2722])
[99]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9496/shard-tglb2/igt@runner@aborted.html
[100]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9496/shard-tglb5/igt@runner@aborted.html
[101]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19167/shard-tglb5/igt@runner@aborted.html
[102]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19167/shard-tglb6/igt@runner@aborted.html
[103]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19167/shard-tglb7/igt@runner@aborted.html
- shard-skl: [FAIL][104] ([i915#2295] / [i915#2722]) -> ([FAIL][105], [FAIL][106]) ([i915#1814] / [i915#2029] / [i915#2295] / [i915#2722] / [i915#483])
[104]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9496/shard-skl8/igt@runner@aborted.html
[105]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19167/shard-skl7/igt@runner@aborted.html
[106]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19167/shard-skl2/igt@runner@aborted.html
{name}: This element is suppressed. This means it is ignored when computing
the status of the difference (SUCCESS, WARNING, or FAILURE).
[CI#80]: https://gitlab.freedesktop.org/gfx-ci/i915-infra/issues/80
[fdo#108145]: https://bugs.freedesktop.org/show_bug.cgi?id=108145
[fdo#109271]: https://bugs.freedesktop.org/show_bug.cgi?id=109271
[fdo#109349]: https://bugs.freedesktop.org/show_bug.cgi?id=109349
[fdo#109441]: https://bugs.freedesktop.org/show_bug.cgi?id=109441
[fdo#109642]: https://bugs.freedesktop.org/show_bug.cgi?id=109642
[fdo#111068]: https://bugs.freedesktop.org/show_bug.cgi?id=111068
[fdo#111304]: https://bugs.freedesktop.org/show_bug.cgi?id=111304
[fdo#111827]: https://bugs.freedesktop.org/show_bug.cgi?id=111827
[i915#1099]: https://gitlab.freedesktop.org/drm/intel/issues/1099
[i915#118]: https://gitlab.freedesktop.org/drm/intel/issues/118
[i915#1188]: https://gitlab.freedesktop.org/drm/intel/issues/1188
[i915#1226]: https://gitlab.freedesktop.org/drm/intel/issues/1226
[i915#129]: https://gitlab.freedesktop.org/drm/intel/issues/129
[i915#1436]: https://gitlab.freedesktop.org/drm/intel/issues/1436
[i915#1542]: https://gitlab.freedesktop.org/drm/intel/issues/1542
[i915#1602]: https://gitlab.freedesktop.org/drm/intel/issues/1602
[i915#1731]: https://gitlab.freedesktop.org/drm/intel/issues/1731
[i915#1778]: https://gitlab.freedesktop.org/drm/intel/issues/1778
[i915#180]: https://gitlab.freedesktop.org/drm/intel/issues/180
[i915#1814]: https://gitlab.freedesktop.org/drm/intel/issues/1814
[i915#1937]: https://gitlab.freedesktop.org/drm/intel/issues/1937
[i915#198]: https://gitlab.freedesktop.org/drm/intel/issues/198
[i915#1982]: https://gitlab.freedesktop.org/drm/intel/issues/1982
[i915#2029]: https://gitlab.freedesktop.org/drm/intel/issues/2029
[i915#2122]: https://gitlab.freedesktop.org/drm/intel/issues/2122
[i915#2190]: https://gitlab.freedesktop.org/drm/intel/issues/2190
[i915#2295]: https://gitlab.freedesktop.org/drm/intel/issues/2295
[i915#2370]: https://gitlab.freedesktop.org/drm/intel/issues/2370
[i915#2389]: https://gitlab.freedesktop.org/drm/intel/issues/2389
[i915#2426]: https://gitlab.freedesktop.org/drm/intel/issues/2426
[i915#2485]: https://gitlab.freedesktop.org/drm/intel/issues/2485
[i915#2521]: https://gitlab.freedesktop.org/drm/intel/issues/2521
[i915#2598]: https://gitlab.freedesktop.org/drm/intel/issues/2598
[i915#265]: https://gitlab.freedesktop.org/drm/intel/issues/265
[i915#2658]: https://gitlab.freedesktop.org/drm/intel/issues/2658
[i915#2681]: https://gitlab.freedesktop.org/drm/intel/issues/2681
[i915#2684]: https://gitlab.freedesktop.org/drm/intel/issues/2684
[i915#2705]: https://gitlab.freedesktop.org/drm/intel/issues/2705
[i915#2722]: https://gitlab.freedesktop.org/drm/intel/issues/2722
[i915#2724]: https://gitlab.freedesktop.org/drm/intel/issues/2724
[i915#2802]: https://gitlab.freedesktop.org/drm/intel/issues/2802
[i915#2803]: https://gitlab.freedesktop.org/drm/intel/issues/2803
[i915#483]: https://gitlab.freedesktop.org/drm/intel/issues/483
[i915#533]: https://gitlab.freedesktop.org/drm/intel/issues/533
[i915#54]: https://gitlab.freedesktop.org/drm/intel/issues/54
[i915#716]: https://gitlab.freedesktop.org/drm/intel/issues/716
[i915#79]: https://gitlab.freedesktop.org/drm/intel/issues/79
[i915#95]: https://gitlab.freedesktop.org/drm/intel/issues/95
[i915#96]: https://gitlab.freedesktop.org/drm/intel/issues/96
Participating hosts (10 -> 10)
------------------------------
No changes in participating hosts
Build changes
-------------
* Linux: CI_DRM_9496 -> Patchwork_19167
CI-20190529: 20190529
CI_DRM_9496: c1bf99ceda83bcdd33f05515deb9efc3649d449e @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_5905: 3d0934900bddeb7a68f1abab4cd05077f0609e32 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_19167: 5fd3c4d2c8955af09fdf227412a2e5757f4d57fd @ 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_19167/index.html
[-- Attachment #1.2: Type: text/html, Size: 30403 bytes --]
[-- Attachment #2: Type: text/plain, Size: 160 bytes --]
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [Intel-gfx] [PATCH] drm/i915/gt: Drain the breadcrumbs just once
2020-12-17 9:15 [Intel-gfx] [PATCH] drm/i915/gt: Drain the breadcrumbs just once Chris Wilson
2020-12-17 11:13 ` [Intel-gfx] ✓ Fi.CI.BAT: success for " Patchwork
2020-12-17 13:15 ` [Intel-gfx] ✗ Fi.CI.IGT: failure " Patchwork
@ 2020-12-17 18:47 ` Matthew Brost
2 siblings, 0 replies; 4+ messages in thread
From: Matthew Brost @ 2020-12-17 18:47 UTC (permalink / raw)
To: Chris Wilson; +Cc: intel-gfx
On Thu, Dec 17, 2020 at 09:15:24AM +0000, Chris Wilson wrote:
> Matthew Brost pointed out that the while-loop on a shared breadcrumb was
> inherently fraught with danger as it competed with the other users of
> the breadcrumbs. However, in order to completely drain the re-arming irq
> worker, the while-loop is a necessity, despite my optimism that we could
> force cancellation with a couple of irq_work invocations.
>
> Given that we can't merely drop the while-loop, use an activity counter on
> the breadcrumbs to detect when we are parking the breadcrumbs for the
> last time.
>
> Based on a patch by Matthew Brost.
>
This was more or less exactly what I was going to suggest.
Reviewed-by: Matthew Brost <matthew.brost@intel.com>
> Reported-by: Matthew Brost <matthew.brost@intel.com>
> Suggested-by: Matthew Brost <matthew.brost@intel.com>
> Fixes: 9d5612ca165a ("drm/i915/gt: Defer enabling the breadcrumb interrupt to after submission")
> Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
> Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
> Cc: Matthew Brost <matthew.brost@intel.com>
> ---
> drivers/gpu/drm/i915/gt/intel_breadcrumbs.c | 10 ++++++----
> drivers/gpu/drm/i915/gt/intel_breadcrumbs.h | 13 ++++++++++++-
> drivers/gpu/drm/i915/gt/intel_breadcrumbs_types.h | 6 ++++--
> drivers/gpu/drm/i915/gt/intel_engine_pm.c | 1 +
> 4 files changed, 23 insertions(+), 7 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/gt/intel_breadcrumbs.c b/drivers/gpu/drm/i915/gt/intel_breadcrumbs.c
> index 00918300f53f..3c62fd6daa76 100644
> --- a/drivers/gpu/drm/i915/gt/intel_breadcrumbs.c
> +++ b/drivers/gpu/drm/i915/gt/intel_breadcrumbs.c
> @@ -332,17 +332,19 @@ void intel_breadcrumbs_reset(struct intel_breadcrumbs *b)
> spin_unlock_irqrestore(&b->irq_lock, flags);
> }
>
> -void intel_breadcrumbs_park(struct intel_breadcrumbs *b)
> +void __intel_breadcrumbs_park(struct intel_breadcrumbs *b)
> {
> - /* Kick the work once more to drain the signalers */
> + if (!READ_ONCE(b->irq_armed))
> + return;
> +
> + /* Kick the work once more to drain the signalers, and disarm the irq */
> irq_work_sync(&b->irq_work);
> - while (unlikely(READ_ONCE(b->irq_armed))) {
> + while (READ_ONCE(b->irq_armed) && !atomic_read(&b->active)) {
> local_irq_disable();
> signal_irq_work(&b->irq_work);
> local_irq_enable();
> cond_resched();
> }
> - GEM_BUG_ON(!list_empty(&b->signalers));
> }
>
> void intel_breadcrumbs_free(struct intel_breadcrumbs *b)
> diff --git a/drivers/gpu/drm/i915/gt/intel_breadcrumbs.h b/drivers/gpu/drm/i915/gt/intel_breadcrumbs.h
> index ed3d1deabfbd..75cc9cff3ae3 100644
> --- a/drivers/gpu/drm/i915/gt/intel_breadcrumbs.h
> +++ b/drivers/gpu/drm/i915/gt/intel_breadcrumbs.h
> @@ -19,7 +19,18 @@ intel_breadcrumbs_create(struct intel_engine_cs *irq_engine);
> void intel_breadcrumbs_free(struct intel_breadcrumbs *b);
>
> void intel_breadcrumbs_reset(struct intel_breadcrumbs *b);
> -void intel_breadcrumbs_park(struct intel_breadcrumbs *b);
> +void __intel_breadcrumbs_park(struct intel_breadcrumbs *b);
> +
> +static inline void intel_breadcrumbs_unpark(struct intel_breadcrumbs *b)
> +{
> + atomic_inc(&b->active);
> +}
> +
> +static inline void intel_breadcrumbs_park(struct intel_breadcrumbs *b)
> +{
> + if (atomic_dec_and_test(&b->active))
> + __intel_breadcrumbs_park(b);
> +}
>
> static inline void
> intel_engine_signal_breadcrumbs(struct intel_engine_cs *engine)
> diff --git a/drivers/gpu/drm/i915/gt/intel_breadcrumbs_types.h b/drivers/gpu/drm/i915/gt/intel_breadcrumbs_types.h
> index a74bb3062bd8..d85a6f74fb87 100644
> --- a/drivers/gpu/drm/i915/gt/intel_breadcrumbs_types.h
> +++ b/drivers/gpu/drm/i915/gt/intel_breadcrumbs_types.h
> @@ -29,8 +29,7 @@
> * the overhead of waking that client is much preferred.
> */
> struct intel_breadcrumbs {
> - /* Not all breadcrumbs are attached to physical HW */
> - struct intel_engine_cs *irq_engine;
> + atomic_t active;
>
> spinlock_t signalers_lock; /* protects the list of signalers */
> struct list_head signalers;
> @@ -40,6 +39,9 @@ struct intel_breadcrumbs {
> struct irq_work irq_work; /* for use from inside irq_lock */
> unsigned int irq_enabled;
> bool irq_armed;
> +
> + /* Not all breadcrumbs are attached to physical HW */
> + struct intel_engine_cs *irq_engine;
> };
>
> #endif /* __INTEL_BREADCRUMBS_TYPES__ */
> diff --git a/drivers/gpu/drm/i915/gt/intel_engine_pm.c b/drivers/gpu/drm/i915/gt/intel_engine_pm.c
> index 499b09cb4acf..d74e748f677a 100644
> --- a/drivers/gpu/drm/i915/gt/intel_engine_pm.c
> +++ b/drivers/gpu/drm/i915/gt/intel_engine_pm.c
> @@ -65,6 +65,7 @@ static int __engine_unpark(struct intel_wakeref *wf)
> if (engine->unpark)
> engine->unpark(engine);
>
> + intel_breadcrumbs_unpark(engine->breadcrumbs);
> intel_engine_unpark_heartbeat(engine);
> return 0;
> }
> --
> 2.20.1
>
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2020-12-17 18:52 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-12-17 9:15 [Intel-gfx] [PATCH] drm/i915/gt: Drain the breadcrumbs just once Chris Wilson
2020-12-17 11:13 ` [Intel-gfx] ✓ Fi.CI.BAT: success for " Patchwork
2020-12-17 13:15 ` [Intel-gfx] ✗ Fi.CI.IGT: failure " Patchwork
2020-12-17 18:47 ` [Intel-gfx] [PATCH] " Matthew Brost
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.