* [Intel-gfx] [PATCH 1/2] drm/i915/gt: Do not suspend bonded requests if one hangs
@ 2021-01-20 12:17 Chris Wilson
2021-01-20 12:17 ` [Intel-gfx] [PATCH 2/2] drm/i915/gt: Skip over completed active execlists, again Chris Wilson
` (3 more replies)
0 siblings, 4 replies; 7+ messages in thread
From: Chris Wilson @ 2021-01-20 12:17 UTC (permalink / raw)
To: intel-gfx; +Cc: Chris Wilson
Treat the dependency between bonded requests as weak and leave the
remainder of the pair on the GPU if one hangs.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
---
drivers/gpu/drm/i915/gt/intel_execlists_submission.c | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/drivers/gpu/drm/i915/gt/intel_execlists_submission.c b/drivers/gpu/drm/i915/gt/intel_execlists_submission.c
index 740ff05fd692..524c8b54d220 100644
--- a/drivers/gpu/drm/i915/gt/intel_execlists_submission.c
+++ b/drivers/gpu/drm/i915/gt/intel_execlists_submission.c
@@ -1990,6 +1990,9 @@ static void __execlists_hold(struct i915_request *rq)
struct i915_request *w =
container_of(p->waiter, typeof(*w), sched);
+ if (p->flags & I915_DEPENDENCY_WEAK)
+ continue;
+
/* Leave semaphores spinning on the other engines */
if (w->engine != rq->engine)
continue;
@@ -2088,6 +2091,9 @@ static void __execlists_unhold(struct i915_request *rq)
struct i915_request *w =
container_of(p->waiter, typeof(*w), sched);
+ if (p->flags & I915_DEPENDENCY_WEAK)
+ continue;
+
/* Propagate any change in error status */
if (rq->fence.error)
i915_request_set_error_once(w, rq->fence.error);
--
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] 7+ messages in thread
* [Intel-gfx] [PATCH 2/2] drm/i915/gt: Skip over completed active execlists, again
2021-01-20 12:17 [Intel-gfx] [PATCH 1/2] drm/i915/gt: Do not suspend bonded requests if one hangs Chris Wilson
@ 2021-01-20 12:17 ` Chris Wilson
2021-01-21 11:47 ` Mika Kuoppala
2021-01-20 19:16 ` [Intel-gfx] ✓ Fi.CI.BAT: success for series starting with [1/2] drm/i915/gt: Do not suspend bonded requests if one hangs Patchwork
` (2 subsequent siblings)
3 siblings, 1 reply; 7+ messages in thread
From: Chris Wilson @ 2021-01-20 12:17 UTC (permalink / raw)
To: intel-gfx; +Cc: Chris Wilson
Now that we are careful to always force-restore contexts upon rewinding
(where necessary), we can restore our optimisation to skip over
completed active execlists when dequeuing.
Referenecs: 35f3fd8182ba ("drm/i915/execlists: Workaround switching back to a completed context")
References: 8ab3a3812aa9 ("drm/i915/gt: Incrementally check for rewinding")
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Mika Kuoppala <mika.kuoppala@linux.intel.com>
---
.../drm/i915/gt/intel_execlists_submission.c | 34 +++++++++----------
1 file changed, 16 insertions(+), 18 deletions(-)
diff --git a/drivers/gpu/drm/i915/gt/intel_execlists_submission.c b/drivers/gpu/drm/i915/gt/intel_execlists_submission.c
index 524c8b54d220..ac1be7a632d3 100644
--- a/drivers/gpu/drm/i915/gt/intel_execlists_submission.c
+++ b/drivers/gpu/drm/i915/gt/intel_execlists_submission.c
@@ -1224,12 +1224,20 @@ static void set_preempt_timeout(struct intel_engine_cs *engine,
active_preempt_timeout(engine, rq));
}
+static bool completed(const struct i915_request *rq)
+{
+ if (i915_request_has_sentinel(rq))
+ return false;
+
+ return __i915_request_is_complete(rq);
+}
+
static void execlists_dequeue(struct intel_engine_cs *engine)
{
struct intel_engine_execlists * const execlists = &engine->execlists;
struct i915_request **port = execlists->pending;
struct i915_request ** const last_port = port + execlists->port_mask;
- struct i915_request *last = *execlists->active;
+ struct i915_request *last, * const *active;
struct virtual_engine *ve;
struct rb_node *rb;
bool submit = false;
@@ -1266,21 +1274,13 @@ static void execlists_dequeue(struct intel_engine_cs *engine)
* i.e. we will retrigger preemption following the ack in case
* of trouble.
*
- * In theory we can skip over completed contexts that have not
- * yet been processed by events (as those events are in flight):
- *
- * while ((last = *active) && i915_request_completed(last))
- * active++;
- *
- * However, the GPU cannot handle this as it will ultimately
- * find itself trying to jump back into a context it has just
- * completed and barf.
*/
+ active = execlists->active;
+ while ((last = *active) && completed(last))
+ active++;
if (last) {
- if (__i915_request_is_complete(last)) {
- goto check_secondary;
- } else if (need_preempt(engine, last)) {
+ if (need_preempt(engine, last)) {
ENGINE_TRACE(engine,
"preempting last=%llx:%lld, prio=%d, hint=%d\n",
last->fence.context,
@@ -1359,9 +1359,7 @@ static void execlists_dequeue(struct intel_engine_cs *engine)
* we hopefully coalesce several updates into a single
* submission.
*/
-check_secondary:
- if (!list_is_last(&last->sched.link,
- &engine->active.requests)) {
+ if (active[1]) {
/*
* Even if ELSP[1] is occupied and not worthy
* of timeslices, our queue might be.
@@ -1562,7 +1560,7 @@ static void execlists_dequeue(struct intel_engine_cs *engine)
* of ordered contexts.
*/
if (submit &&
- memcmp(execlists->active,
+ memcmp(active,
execlists->pending,
(port - execlists->pending) * sizeof(*port))) {
*port = NULL;
@@ -1570,7 +1568,7 @@ static void execlists_dequeue(struct intel_engine_cs *engine)
execlists_schedule_in(*port, port - execlists->pending);
WRITE_ONCE(execlists->yield, -1);
- set_preempt_timeout(engine, *execlists->active);
+ set_preempt_timeout(engine, *active);
execlists_submit_ports(engine);
} else {
ring_set_paused(engine, 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] 7+ messages in thread
* [Intel-gfx] ✓ Fi.CI.BAT: success for series starting with [1/2] drm/i915/gt: Do not suspend bonded requests if one hangs
2021-01-20 12:17 [Intel-gfx] [PATCH 1/2] drm/i915/gt: Do not suspend bonded requests if one hangs Chris Wilson
2021-01-20 12:17 ` [Intel-gfx] [PATCH 2/2] drm/i915/gt: Skip over completed active execlists, again Chris Wilson
@ 2021-01-20 19:16 ` Patchwork
2021-01-20 22:12 ` [Intel-gfx] ✓ Fi.CI.IGT: " Patchwork
2021-01-21 11:32 ` [Intel-gfx] [PATCH 1/2] " Mika Kuoppala
3 siblings, 0 replies; 7+ messages in thread
From: Patchwork @ 2021-01-20 19:16 UTC (permalink / raw)
To: Chris Wilson; +Cc: intel-gfx
[-- Attachment #1.1: Type: text/plain, Size: 4088 bytes --]
== Series Details ==
Series: series starting with [1/2] drm/i915/gt: Do not suspend bonded requests if one hangs
URL : https://patchwork.freedesktop.org/series/86087/
State : success
== Summary ==
CI Bug Log - changes from CI_DRM_9650 -> Patchwork_19426
====================================================
Summary
-------
**SUCCESS**
No regressions found.
External URL: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19426/index.html
Known issues
------------
Here are the changes found in Patchwork_19426 that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@amdgpu/amd_prime@i915-to-amd:
- fi-snb-2520m: NOTRUN -> [SKIP][1] ([fdo#109271]) +17 similar issues
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19426/fi-snb-2520m/igt@amdgpu/amd_prime@i915-to-amd.html
* igt@kms_addfb_basic@addfb25-y-tiled-small-legacy:
- fi-snb-2600: NOTRUN -> [SKIP][2] ([fdo#109271]) +30 similar issues
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19426/fi-snb-2600/igt@kms_addfb_basic@addfb25-y-tiled-small-legacy.html
* igt@kms_chamelium@hdmi-crc-fast:
- fi-snb-2600: NOTRUN -> [SKIP][3] ([fdo#109271] / [fdo#111827]) +8 similar issues
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19426/fi-snb-2600/igt@kms_chamelium@hdmi-crc-fast.html
* igt@vgem_basic@create:
- fi-tgl-y: [PASS][4] -> [DMESG-WARN][5] ([i915#402])
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9650/fi-tgl-y/igt@vgem_basic@create.html
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19426/fi-tgl-y/igt@vgem_basic@create.html
#### Possible fixes ####
* igt@gem_exec_suspend@basic-s3:
- fi-snb-2600: [DMESG-WARN][6] ([i915#2772]) -> [PASS][7]
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9650/fi-snb-2600/igt@gem_exec_suspend@basic-s3.html
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19426/fi-snb-2600/igt@gem_exec_suspend@basic-s3.html
* igt@i915_selftest@live@hangcheck:
- fi-snb-2520m: [INCOMPLETE][8] -> [PASS][9]
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9650/fi-snb-2520m/igt@i915_selftest@live@hangcheck.html
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19426/fi-snb-2520m/igt@i915_selftest@live@hangcheck.html
* igt@prime_self_import@basic-with_one_bo_two_files:
- fi-tgl-y: [DMESG-WARN][10] ([i915#402]) -> [PASS][11]
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9650/fi-tgl-y/igt@prime_self_import@basic-with_one_bo_two_files.html
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19426/fi-tgl-y/igt@prime_self_import@basic-with_one_bo_two_files.html
{name}: This element is suppressed. This means it is ignored when computing
the status of the difference (SUCCESS, WARNING, or FAILURE).
[fdo#109271]: https://bugs.freedesktop.org/show_bug.cgi?id=109271
[fdo#109315]: https://bugs.freedesktop.org/show_bug.cgi?id=109315
[fdo#111827]: https://bugs.freedesktop.org/show_bug.cgi?id=111827
[i915#2575]: https://gitlab.freedesktop.org/drm/intel/issues/2575
[i915#2772]: https://gitlab.freedesktop.org/drm/intel/issues/2772
[i915#402]: https://gitlab.freedesktop.org/drm/intel/issues/402
Participating hosts (43 -> 38)
------------------------------
Missing (5): fi-ilk-m540 fi-hsw-4200u fi-bsw-cyan fi-ctg-p8600 fi-bdw-samus
Build changes
-------------
* Linux: CI_DRM_9650 -> Patchwork_19426
CI-20190529: 20190529
CI_DRM_9650: 3f989d1bb4cfd91e25549f9fd7a750412581dcc4 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_5960: ace82fcd5f3623f8dde7c220a825873dc53dfae4 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_19426: 63e0ca6b8dc8f97bb9e2509ce1f4d091c3985cde @ git://anongit.freedesktop.org/gfx-ci/linux
== Linux commits ==
63e0ca6b8dc8 drm/i915/gt: Skip over completed active execlists, again
69e82f4a4b40 drm/i915/gt: Do not suspend bonded requests if one hangs
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19426/index.html
[-- Attachment #1.2: Type: text/html, Size: 4942 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] 7+ messages in thread
* [Intel-gfx] ✓ Fi.CI.IGT: success for series starting with [1/2] drm/i915/gt: Do not suspend bonded requests if one hangs
2021-01-20 12:17 [Intel-gfx] [PATCH 1/2] drm/i915/gt: Do not suspend bonded requests if one hangs Chris Wilson
2021-01-20 12:17 ` [Intel-gfx] [PATCH 2/2] drm/i915/gt: Skip over completed active execlists, again Chris Wilson
2021-01-20 19:16 ` [Intel-gfx] ✓ Fi.CI.BAT: success for series starting with [1/2] drm/i915/gt: Do not suspend bonded requests if one hangs Patchwork
@ 2021-01-20 22:12 ` Patchwork
2021-01-21 11:32 ` [Intel-gfx] [PATCH 1/2] " Mika Kuoppala
3 siblings, 0 replies; 7+ messages in thread
From: Patchwork @ 2021-01-20 22:12 UTC (permalink / raw)
To: Chris Wilson; +Cc: intel-gfx
[-- Attachment #1.1: Type: text/plain, Size: 23598 bytes --]
== Series Details ==
Series: series starting with [1/2] drm/i915/gt: Do not suspend bonded requests if one hangs
URL : https://patchwork.freedesktop.org/series/86087/
State : success
== Summary ==
CI Bug Log - changes from CI_DRM_9650_full -> Patchwork_19426_full
====================================================
Summary
-------
**SUCCESS**
No regressions found.
Known issues
------------
Here are the changes found in Patchwork_19426_full that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@gem_ctx_persistence@engines-mixed:
- shard-hsw: NOTRUN -> [SKIP][1] ([fdo#109271] / [i915#1099]) +1 similar issue
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19426/shard-hsw6/igt@gem_ctx_persistence@engines-mixed.html
* igt@gem_exec_fair@basic-none@vecs0:
- shard-apl: [PASS][2] -> [FAIL][3] ([i915#2842])
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9650/shard-apl2/igt@gem_exec_fair@basic-none@vecs0.html
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19426/shard-apl8/igt@gem_exec_fair@basic-none@vecs0.html
* igt@gem_exec_fair@basic-pace@vecs0:
- shard-tglb: [PASS][4] -> [FAIL][5] ([i915#2842])
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9650/shard-tglb8/igt@gem_exec_fair@basic-pace@vecs0.html
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19426/shard-tglb8/igt@gem_exec_fair@basic-pace@vecs0.html
* igt@gem_exec_reloc@basic-many-active@rcs0:
- shard-apl: [PASS][6] -> [FAIL][7] ([i915#2389])
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9650/shard-apl3/igt@gem_exec_reloc@basic-many-active@rcs0.html
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19426/shard-apl4/igt@gem_exec_reloc@basic-many-active@rcs0.html
* igt@gem_render_copy@y-tiled-to-vebox-linear:
- shard-hsw: NOTRUN -> [SKIP][8] ([fdo#109271]) +160 similar issues
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19426/shard-hsw6/igt@gem_render_copy@y-tiled-to-vebox-linear.html
* igt@gen3_mixed_blits:
- shard-kbl: NOTRUN -> [SKIP][9] ([fdo#109271]) +29 similar issues
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19426/shard-kbl6/igt@gen3_mixed_blits.html
* igt@i915_pm_dc@dc3co-vpb-simulation:
- shard-kbl: NOTRUN -> [SKIP][10] ([fdo#109271] / [i915#658])
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19426/shard-kbl6/igt@i915_pm_dc@dc3co-vpb-simulation.html
* igt@i915_selftest@live@hangcheck:
- shard-hsw: NOTRUN -> [INCOMPLETE][11] ([i915#2782])
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19426/shard-hsw7/igt@i915_selftest@live@hangcheck.html
* igt@kms_async_flips@alternate-sync-async-flip:
- shard-skl: [PASS][12] -> [FAIL][13] ([i915#2521])
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9650/shard-skl3/igt@kms_async_flips@alternate-sync-async-flip.html
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19426/shard-skl10/igt@kms_async_flips@alternate-sync-async-flip.html
* igt@kms_async_flips@test-time-stamp:
- shard-tglb: [PASS][14] -> [FAIL][15] ([i915#2597])
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9650/shard-tglb2/igt@kms_async_flips@test-time-stamp.html
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19426/shard-tglb2/igt@kms_async_flips@test-time-stamp.html
* igt@kms_atomic_transition@plane-all-transition-nonblocking-fencing:
- shard-snb: NOTRUN -> [SKIP][16] ([fdo#109271])
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19426/shard-snb2/igt@kms_atomic_transition@plane-all-transition-nonblocking-fencing.html
* igt@kms_chamelium@hdmi-hpd-with-enabled-mode:
- shard-kbl: NOTRUN -> [SKIP][17] ([fdo#109271] / [fdo#111827]) +3 similar issues
[17]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19426/shard-kbl6/igt@kms_chamelium@hdmi-hpd-with-enabled-mode.html
* igt@kms_chamelium@vga-frame-dump:
- shard-snb: NOTRUN -> [SKIP][18] ([fdo#109271] / [fdo#111827])
[18]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19426/shard-snb4/igt@kms_chamelium@vga-frame-dump.html
* igt@kms_color_chamelium@pipe-a-ctm-green-to-red:
- shard-glk: NOTRUN -> [SKIP][19] ([fdo#109271] / [fdo#111827]) +2 similar issues
[19]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19426/shard-glk2/igt@kms_color_chamelium@pipe-a-ctm-green-to-red.html
* igt@kms_color_chamelium@pipe-c-ctm-limited-range:
- shard-hsw: NOTRUN -> [SKIP][20] ([fdo#109271] / [fdo#111827]) +10 similar issues
[20]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19426/shard-hsw2/igt@kms_color_chamelium@pipe-c-ctm-limited-range.html
* igt@kms_color_chamelium@pipe-d-ctm-green-to-red:
- shard-skl: NOTRUN -> [SKIP][21] ([fdo#109271] / [fdo#111827]) +3 similar issues
[21]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19426/shard-skl2/igt@kms_color_chamelium@pipe-d-ctm-green-to-red.html
* igt@kms_cursor_crc@pipe-a-cursor-256x85-onscreen:
- shard-skl: NOTRUN -> [FAIL][22] ([i915#54]) +1 similar issue
[22]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19426/shard-skl2/igt@kms_cursor_crc@pipe-a-cursor-256x85-onscreen.html
* igt@kms_cursor_crc@pipe-c-cursor-64x21-random:
- shard-skl: [PASS][23] -> [FAIL][24] ([i915#54]) +9 similar issues
[23]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9650/shard-skl6/igt@kms_cursor_crc@pipe-c-cursor-64x21-random.html
[24]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19426/shard-skl8/igt@kms_cursor_crc@pipe-c-cursor-64x21-random.html
* igt@kms_flip@bo-too-big@a-hdmi-a1:
- shard-glk: [PASS][25] -> [DMESG-WARN][26] ([i915#118] / [i915#95])
[25]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9650/shard-glk8/igt@kms_flip@bo-too-big@a-hdmi-a1.html
[26]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19426/shard-glk4/igt@kms_flip@bo-too-big@a-hdmi-a1.html
* igt@kms_flip@flip-vs-expired-vblank-interruptible@c-hdmi-a1:
- shard-glk: [PASS][27] -> [FAIL][28] ([i915#79])
[27]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9650/shard-glk4/igt@kms_flip@flip-vs-expired-vblank-interruptible@c-hdmi-a1.html
[28]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19426/shard-glk6/igt@kms_flip@flip-vs-expired-vblank-interruptible@c-hdmi-a1.html
* igt@kms_flip@flip-vs-suspend@b-hdmi-a1:
- shard-hsw: [PASS][29] -> [INCOMPLETE][30] ([i915#2055] / [i915#2295])
[29]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9650/shard-hsw4/igt@kms_flip@flip-vs-suspend@b-hdmi-a1.html
[30]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19426/shard-hsw4/igt@kms_flip@flip-vs-suspend@b-hdmi-a1.html
* igt@kms_frontbuffer_tracking@fbcpsr-1p-primscrn-spr-indfb-draw-pwrite:
- shard-skl: NOTRUN -> [SKIP][31] ([fdo#109271]) +20 similar issues
[31]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19426/shard-skl8/igt@kms_frontbuffer_tracking@fbcpsr-1p-primscrn-spr-indfb-draw-pwrite.html
* igt@kms_frontbuffer_tracking@fbcpsr-2p-primscrn-shrfb-pgflip-blt:
- shard-glk: NOTRUN -> [SKIP][32] ([fdo#109271]) +11 similar issues
[32]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19426/shard-glk2/igt@kms_frontbuffer_tracking@fbcpsr-2p-primscrn-shrfb-pgflip-blt.html
* igt@kms_hdr@bpc-switch:
- shard-skl: [PASS][33] -> [FAIL][34] ([i915#1188])
[33]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9650/shard-skl7/igt@kms_hdr@bpc-switch.html
[34]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19426/shard-skl1/igt@kms_hdr@bpc-switch.html
* igt@kms_pipe_crc_basic@nonblocking-crc-pipe-d-frame-sequence:
- shard-skl: NOTRUN -> [SKIP][35] ([fdo#109271] / [i915#533])
[35]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19426/shard-skl1/igt@kms_pipe_crc_basic@nonblocking-crc-pipe-d-frame-sequence.html
* igt@kms_pipe_crc_basic@read-crc-pipe-a:
- shard-glk: [PASS][36] -> [FAIL][37] ([i915#53])
[36]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9650/shard-glk8/igt@kms_pipe_crc_basic@read-crc-pipe-a.html
[37]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19426/shard-glk4/igt@kms_pipe_crc_basic@read-crc-pipe-a.html
* igt@kms_plane_alpha_blend@pipe-a-constant-alpha-min:
- shard-skl: NOTRUN -> [FAIL][38] ([fdo#108145] / [i915#265])
[38]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19426/shard-skl2/igt@kms_plane_alpha_blend@pipe-a-constant-alpha-min.html
* igt@kms_plane_alpha_blend@pipe-a-coverage-7efc:
- shard-skl: [PASS][39] -> [FAIL][40] ([fdo#108145] / [i915#265])
[39]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9650/shard-skl9/igt@kms_plane_alpha_blend@pipe-a-coverage-7efc.html
[40]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19426/shard-skl6/igt@kms_plane_alpha_blend@pipe-a-coverage-7efc.html
* igt@kms_psr@cursor_render:
- shard-skl: [PASS][41] -> [DMESG-WARN][42] ([i915#1982])
[41]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9650/shard-skl6/igt@kms_psr@cursor_render.html
[42]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19426/shard-skl8/igt@kms_psr@cursor_render.html
* igt@kms_psr@psr2_sprite_plane_move:
- shard-iclb: [PASS][43] -> [SKIP][44] ([fdo#109441]) +1 similar issue
[43]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9650/shard-iclb2/igt@kms_psr@psr2_sprite_plane_move.html
[44]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19426/shard-iclb1/igt@kms_psr@psr2_sprite_plane_move.html
* igt@kms_universal_plane@universal-plane-pipe-a-functional:
- shard-snb: [PASS][45] -> [SKIP][46] ([fdo#109271]) +4 similar issues
[45]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9650/shard-snb7/igt@kms_universal_plane@universal-plane-pipe-a-functional.html
[46]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19426/shard-snb2/igt@kms_universal_plane@universal-plane-pipe-a-functional.html
* igt@kms_vblank@pipe-d-wait-idle:
- shard-kbl: NOTRUN -> [SKIP][47] ([fdo#109271] / [i915#533])
[47]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19426/shard-kbl6/igt@kms_vblank@pipe-d-wait-idle.html
* igt@perf@blocking:
- shard-skl: [PASS][48] -> [FAIL][49] ([i915#1542])
[48]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9650/shard-skl5/igt@perf@blocking.html
[49]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19426/shard-skl4/igt@perf@blocking.html
#### Possible fixes ####
* igt@drm_import_export@prime:
- shard-kbl: [INCOMPLETE][50] -> [PASS][51]
[50]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9650/shard-kbl7/igt@drm_import_export@prime.html
[51]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19426/shard-kbl6/igt@drm_import_export@prime.html
* igt@gem_exec_capture@pi@vecs0:
- shard-skl: [INCOMPLETE][52] ([i915#198] / [i915#2624]) -> [PASS][53]
[52]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9650/shard-skl3/igt@gem_exec_capture@pi@vecs0.html
[53]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19426/shard-skl10/igt@gem_exec_capture@pi@vecs0.html
* igt@gem_exec_fair@basic-none@vcs0:
- shard-apl: [FAIL][54] ([i915#2842]) -> [PASS][55]
[54]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9650/shard-apl2/igt@gem_exec_fair@basic-none@vcs0.html
[55]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19426/shard-apl8/igt@gem_exec_fair@basic-none@vcs0.html
* igt@gem_exec_fair@basic-pace@rcs0:
- shard-tglb: [FAIL][56] ([i915#2842]) -> [PASS][57] +1 similar issue
[56]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9650/shard-tglb8/igt@gem_exec_fair@basic-pace@rcs0.html
[57]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19426/shard-tglb8/igt@gem_exec_fair@basic-pace@rcs0.html
* igt@gem_exec_fair@basic-pace@vecs0:
- shard-kbl: [FAIL][58] ([i915#2842]) -> [PASS][59] +1 similar issue
[58]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9650/shard-kbl6/igt@gem_exec_fair@basic-pace@vecs0.html
[59]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19426/shard-kbl1/igt@gem_exec_fair@basic-pace@vecs0.html
* igt@gem_exec_schedule@u-fairslice@rcs0:
- shard-glk: [DMESG-WARN][60] ([i915#1610]) -> [PASS][61]
[60]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9650/shard-glk9/igt@gem_exec_schedule@u-fairslice@rcs0.html
[61]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19426/shard-glk2/igt@gem_exec_schedule@u-fairslice@rcs0.html
* igt@i915_module_load@reload-with-fault-injection:
- shard-snb: [INCOMPLETE][62] ([i915#2880]) -> [PASS][63]
[62]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9650/shard-snb7/igt@i915_module_load@reload-with-fault-injection.html
[63]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19426/shard-snb4/igt@i915_module_load@reload-with-fault-injection.html
* igt@i915_pm_dc@dc6-psr:
- shard-iclb: [FAIL][64] ([i915#454]) -> [PASS][65]
[64]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9650/shard-iclb4/igt@i915_pm_dc@dc6-psr.html
[65]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19426/shard-iclb8/igt@i915_pm_dc@dc6-psr.html
* igt@i915_suspend@sysfs-reader:
- shard-skl: [INCOMPLETE][66] ([i915#146] / [i915#198]) -> [PASS][67]
[66]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9650/shard-skl2/igt@i915_suspend@sysfs-reader.html
[67]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19426/shard-skl2/igt@i915_suspend@sysfs-reader.html
* igt@kms_cursor_crc@pipe-b-cursor-256x256-sliding:
- shard-skl: [FAIL][68] ([i915#54]) -> [PASS][69] +5 similar issues
[68]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9650/shard-skl9/igt@kms_cursor_crc@pipe-b-cursor-256x256-sliding.html
[69]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19426/shard-skl6/igt@kms_cursor_crc@pipe-b-cursor-256x256-sliding.html
* igt@kms_cursor_legacy@2x-long-cursor-vs-flip-atomic:
- shard-hsw: [FAIL][70] ([i915#96]) -> [PASS][71]
[70]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9650/shard-hsw8/igt@kms_cursor_legacy@2x-long-cursor-vs-flip-atomic.html
[71]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19426/shard-hsw6/igt@kms_cursor_legacy@2x-long-cursor-vs-flip-atomic.html
* igt@kms_cursor_legacy@flip-vs-cursor-atomic:
- shard-skl: [FAIL][72] ([i915#2346]) -> [PASS][73]
[72]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9650/shard-skl6/igt@kms_cursor_legacy@flip-vs-cursor-atomic.html
[73]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19426/shard-skl8/igt@kms_cursor_legacy@flip-vs-cursor-atomic.html
* igt@kms_cursor_legacy@flip-vs-cursor-atomic-transitions-varying-size:
- shard-skl: [FAIL][74] ([i915#2346] / [i915#533]) -> [PASS][75]
[74]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9650/shard-skl2/igt@kms_cursor_legacy@flip-vs-cursor-atomic-transitions-varying-size.html
[75]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19426/shard-skl9/igt@kms_cursor_legacy@flip-vs-cursor-atomic-transitions-varying-size.html
* igt@kms_flip@flip-vs-expired-vblank-interruptible@b-edp1:
- shard-skl: [FAIL][76] ([i915#79]) -> [PASS][77] +1 similar issue
[76]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9650/shard-skl10/igt@kms_flip@flip-vs-expired-vblank-interruptible@b-edp1.html
[77]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19426/shard-skl7/igt@kms_flip@flip-vs-expired-vblank-interruptible@b-edp1.html
* igt@kms_flip@plain-flip-fb-recreate@c-edp1:
- shard-skl: [FAIL][78] ([i915#2122]) -> [PASS][79] +2 similar issues
[78]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9650/shard-skl10/igt@kms_flip@plain-flip-fb-recreate@c-edp1.html
[79]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19426/shard-skl7/igt@kms_flip@plain-flip-fb-recreate@c-edp1.html
* igt@kms_frontbuffer_tracking@psr-1p-offscren-pri-shrfb-draw-mmap-cpu:
- shard-skl: [DMESG-WARN][80] ([i915#1982]) -> [PASS][81]
[80]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9650/shard-skl10/igt@kms_frontbuffer_tracking@psr-1p-offscren-pri-shrfb-draw-mmap-cpu.html
[81]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19426/shard-skl7/igt@kms_frontbuffer_tracking@psr-1p-offscren-pri-shrfb-draw-mmap-cpu.html
* igt@kms_plane_alpha_blend@pipe-b-coverage-7efc:
- shard-skl: [FAIL][82] ([fdo#108145] / [i915#265]) -> [PASS][83]
[82]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9650/shard-skl1/igt@kms_plane_alpha_blend@pipe-b-coverage-7efc.html
[83]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19426/shard-skl8/igt@kms_plane_alpha_blend@pipe-b-coverage-7efc.html
* igt@kms_psr2_su@frontbuffer:
- shard-iclb: [SKIP][84] ([fdo#109642] / [fdo#111068]) -> [PASS][85] +1 similar issue
[84]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9650/shard-iclb8/igt@kms_psr2_su@frontbuffer.html
[85]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19426/shard-iclb2/igt@kms_psr2_su@frontbuffer.html
* igt@kms_psr@psr2_cursor_blt:
- shard-iclb: [SKIP][86] ([fdo#109441]) -> [PASS][87]
[86]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9650/shard-iclb3/igt@kms_psr@psr2_cursor_blt.html
[87]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19426/shard-iclb2/igt@kms_psr@psr2_cursor_blt.html
#### Warnings ####
* igt@i915_pm_dc@dc3co-vpb-simulation:
- shard-iclb: [SKIP][88] ([i915#658]) -> [SKIP][89] ([i915#588])
[88]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9650/shard-iclb3/igt@i915_pm_dc@dc3co-vpb-simulation.html
[89]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19426/shard-iclb2/igt@i915_pm_dc@dc3co-vpb-simulation.html
* igt@kms_dp_dsc@basic-dsc-enable-edp:
- shard-iclb: [SKIP][90] ([fdo#109349]) -> [DMESG-WARN][91] ([i915#1226])
[90]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9650/shard-iclb3/igt@kms_dp_dsc@basic-dsc-enable-edp.html
[91]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19426/shard-iclb2/igt@kms_dp_dsc@basic-dsc-enable-edp.html
* igt@kms_psr2_sf@overlay-plane-update-sf-dmg-area-5:
- shard-iclb: [SKIP][92] ([i915#658]) -> [SKIP][93] ([i915#2920])
[92]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9650/shard-iclb8/igt@kms_psr2_sf@overlay-plane-update-sf-dmg-area-5.html
[93]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19426/shard-iclb2/igt@kms_psr2_sf@overlay-plane-update-sf-dmg-area-5.html
* igt@kms_psr2_sf@primary-plane-update-sf-dmg-area-4:
- shard-iclb: [SKIP][94] ([i915#2920]) -> [SKIP][95] ([i915#658]) +2 similar issues
[94]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9650/shard-iclb2/igt@kms_psr2_sf@primary-plane-update-sf-dmg-area-4.html
[95]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19426/shard-iclb1/igt@kms_psr2_sf@primary-plane-update-sf-dmg-area-4.html
* igt@runner@aborted:
- shard-kbl: ([FAIL][96], [FAIL][97]) ([i915#2295] / [i915#2505] / [i915#2722]) -> [FAIL][98] ([i915#2295])
[96]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9650/shard-kbl6/igt@runner@aborted.html
[97]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9650/shard-kbl7/igt@runner@aborted.html
[98]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19426/shard-kbl3/igt@runner@aborted.html
- shard-glk: ([FAIL][99], [FAIL][100]) ([i915#2295] / [i915#2426] / [k.org#202321]) -> [FAIL][101] ([i915#2295] / [k.org#202321])
[99]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9650/shard-glk4/igt@runner@aborted.html
[100]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9650/shard-glk9/igt@runner@aborted.html
[101]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19426/shard-glk9/igt@runner@aborted.html
[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#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#146]: https://gitlab.freedesktop.org/drm/intel/issues/146
[i915#1542]: https://gitlab.freedesktop.org/drm/intel/issues/1542
[i915#1610]: https://gitlab.freedesktop.org/drm/intel/issues/1610
[i915#198]: https://gitlab.freedesktop.org/drm/intel/issues/198
[i915#1982]: https://gitlab.freedesktop.org/drm/intel/issues/1982
[i915#2055]: https://gitlab.freedesktop.org/drm/intel/issues/2055
[i915#2122]: https://gitlab.freedesktop.org/drm/intel/issues/2122
[i915#2295]: https://gitlab.freedesktop.org/drm/intel/issues/2295
[i915#2346]: https://gitlab.freedesktop.org/drm/intel/issues/2346
[i915#2389]: https://gitlab.freedesktop.org/drm/intel/issues/2389
[i915#2426]: https://gitlab.freedesktop.org/drm/intel/issues/2426
[i915#2505]: https://gitlab.freedesktop.org/drm/intel/issues/2505
[i915#2521]: https://gitlab.freedesktop.org/drm/intel/issues/2521
[i915#2597]: https://gitlab.freedesktop.org/drm/intel/issues/2597
[i915#2624]: https://gitlab.freedesktop.org/drm/intel/issues/2624
[i915#265]: https://gitlab.freedesktop.org/drm/intel/issues/265
[i915#2722]: https://gitlab.freedesktop.org/drm/intel/issues/2722
[i915#2782]: https://gitlab.freedesktop.org/drm/intel/issues/2782
[i915#2842]: https://gitlab.freedesktop.org/drm/intel/issues/2842
[i915#2880]: https://gitlab.freedesktop.org/drm/intel/issues/2880
[i915#2920]: https://gitlab.freedesktop.org/drm/intel/issues/2920
[i915#454]: https://gitlab.freedesktop.org/drm/intel/issues/454
[i915#53]: https://gitlab.freedesktop.org/drm/intel/issues/53
[i915#533]: https://gitlab.freedesktop.org/drm/intel/issues/533
[i915#54]: https://gitlab.freedesktop.org/drm/intel/issues/54
[i915#588]: https://gitlab.freedesktop.org/drm/intel/issues/588
[i915#658]: https://gitlab.freedesktop.org/drm/intel/issues/658
[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
[k.org#202321]: https://bugzilla.kernel.org/show_bug.cgi?id=202321
Participating hosts (10 -> 10)
------------------------------
No changes in participating hosts
Build changes
-------------
* Linux: CI_DRM_9650 -> Patchwork_19426
CI-20190529: 20190529
CI_DRM_9650: 3f989d1bb4cfd91e25549f9fd7a750412581dcc4 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_5960: ace82fcd5f3623f8dde7c220a825873dc53dfae4 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_19426: 63e0ca6b8dc8f97bb9e2509ce1f4d091c3985cde @ 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_19426/index.html
[-- Attachment #1.2: Type: text/html, Size: 28521 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] 7+ messages in thread
* Re: [Intel-gfx] [PATCH 1/2] drm/i915/gt: Do not suspend bonded requests if one hangs
2021-01-20 12:17 [Intel-gfx] [PATCH 1/2] drm/i915/gt: Do not suspend bonded requests if one hangs Chris Wilson
` (2 preceding siblings ...)
2021-01-20 22:12 ` [Intel-gfx] ✓ Fi.CI.IGT: " Patchwork
@ 2021-01-21 11:32 ` Mika Kuoppala
3 siblings, 0 replies; 7+ messages in thread
From: Mika Kuoppala @ 2021-01-21 11:32 UTC (permalink / raw)
To: Chris Wilson, intel-gfx; +Cc: Chris Wilson
Chris Wilson <chris@chris-wilson.co.uk> writes:
> Treat the dependency between bonded requests as weak and leave the
> remainder of the pair on the GPU if one hangs.
>
> Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: Mika Kuoppala <mika.kuoppala@linux.intel.com>
> ---
> drivers/gpu/drm/i915/gt/intel_execlists_submission.c | 6 ++++++
> 1 file changed, 6 insertions(+)
>
> diff --git a/drivers/gpu/drm/i915/gt/intel_execlists_submission.c b/drivers/gpu/drm/i915/gt/intel_execlists_submission.c
> index 740ff05fd692..524c8b54d220 100644
> --- a/drivers/gpu/drm/i915/gt/intel_execlists_submission.c
> +++ b/drivers/gpu/drm/i915/gt/intel_execlists_submission.c
> @@ -1990,6 +1990,9 @@ static void __execlists_hold(struct i915_request *rq)
> struct i915_request *w =
> container_of(p->waiter, typeof(*w), sched);
>
> + if (p->flags & I915_DEPENDENCY_WEAK)
> + continue;
> +
> /* Leave semaphores spinning on the other engines */
> if (w->engine != rq->engine)
> continue;
> @@ -2088,6 +2091,9 @@ static void __execlists_unhold(struct i915_request *rq)
> struct i915_request *w =
> container_of(p->waiter, typeof(*w), sched);
>
> + if (p->flags & I915_DEPENDENCY_WEAK)
> + continue;
> +
> /* Propagate any change in error status */
> if (rq->fence.error)
> i915_request_set_error_once(w, rq->fence.error);
> --
> 2.20.1
>
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [Intel-gfx] [PATCH 2/2] drm/i915/gt: Skip over completed active execlists, again
2021-01-20 12:17 ` [Intel-gfx] [PATCH 2/2] drm/i915/gt: Skip over completed active execlists, again Chris Wilson
@ 2021-01-21 11:47 ` Mika Kuoppala
0 siblings, 0 replies; 7+ messages in thread
From: Mika Kuoppala @ 2021-01-21 11:47 UTC (permalink / raw)
To: Chris Wilson, intel-gfx; +Cc: Chris Wilson
Chris Wilson <chris@chris-wilson.co.uk> writes:
> Now that we are careful to always force-restore contexts upon rewinding
> (where necessary), we can restore our optimisation to skip over
> completed active execlists when dequeuing.
>
> Referenecs: 35f3fd8182ba ("drm/i915/execlists: Workaround switching back to a completed context")
> References: 8ab3a3812aa9 ("drm/i915/gt: Incrementally check for rewinding")
> Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
> Cc: Mika Kuoppala <mika.kuoppala@linux.intel.com>
Reviewed-by: Mika Kuoppala <mika.kuoppala@linux.intel.com>
> ---
> .../drm/i915/gt/intel_execlists_submission.c | 34 +++++++++----------
> 1 file changed, 16 insertions(+), 18 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/gt/intel_execlists_submission.c b/drivers/gpu/drm/i915/gt/intel_execlists_submission.c
> index 524c8b54d220..ac1be7a632d3 100644
> --- a/drivers/gpu/drm/i915/gt/intel_execlists_submission.c
> +++ b/drivers/gpu/drm/i915/gt/intel_execlists_submission.c
> @@ -1224,12 +1224,20 @@ static void set_preempt_timeout(struct intel_engine_cs *engine,
> active_preempt_timeout(engine, rq));
> }
>
> +static bool completed(const struct i915_request *rq)
> +{
> + if (i915_request_has_sentinel(rq))
> + return false;
> +
> + return __i915_request_is_complete(rq);
> +}
> +
> static void execlists_dequeue(struct intel_engine_cs *engine)
> {
> struct intel_engine_execlists * const execlists = &engine->execlists;
> struct i915_request **port = execlists->pending;
> struct i915_request ** const last_port = port + execlists->port_mask;
> - struct i915_request *last = *execlists->active;
> + struct i915_request *last, * const *active;
> struct virtual_engine *ve;
> struct rb_node *rb;
> bool submit = false;
> @@ -1266,21 +1274,13 @@ static void execlists_dequeue(struct intel_engine_cs *engine)
> * i.e. we will retrigger preemption following the ack in case
> * of trouble.
> *
> - * In theory we can skip over completed contexts that have not
> - * yet been processed by events (as those events are in flight):
> - *
> - * while ((last = *active) && i915_request_completed(last))
> - * active++;
> - *
> - * However, the GPU cannot handle this as it will ultimately
> - * find itself trying to jump back into a context it has just
> - * completed and barf.
> */
> + active = execlists->active;
> + while ((last = *active) && completed(last))
> + active++;
>
> if (last) {
> - if (__i915_request_is_complete(last)) {
> - goto check_secondary;
> - } else if (need_preempt(engine, last)) {
> + if (need_preempt(engine, last)) {
> ENGINE_TRACE(engine,
> "preempting last=%llx:%lld, prio=%d, hint=%d\n",
> last->fence.context,
> @@ -1359,9 +1359,7 @@ static void execlists_dequeue(struct intel_engine_cs *engine)
> * we hopefully coalesce several updates into a single
> * submission.
> */
> -check_secondary:
> - if (!list_is_last(&last->sched.link,
> - &engine->active.requests)) {
> + if (active[1]) {
> /*
> * Even if ELSP[1] is occupied and not worthy
> * of timeslices, our queue might be.
> @@ -1562,7 +1560,7 @@ static void execlists_dequeue(struct intel_engine_cs *engine)
> * of ordered contexts.
> */
> if (submit &&
> - memcmp(execlists->active,
> + memcmp(active,
> execlists->pending,
> (port - execlists->pending) * sizeof(*port))) {
> *port = NULL;
> @@ -1570,7 +1568,7 @@ static void execlists_dequeue(struct intel_engine_cs *engine)
> execlists_schedule_in(*port, port - execlists->pending);
>
> WRITE_ONCE(execlists->yield, -1);
> - set_preempt_timeout(engine, *execlists->active);
> + set_preempt_timeout(engine, *active);
> execlists_submit_ports(engine);
> } else {
> ring_set_paused(engine, 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] 7+ messages in thread
* [Intel-gfx] [PATCH 2/2] drm/i915/gt: Skip over completed active execlists, again
2021-01-18 12:43 Chris Wilson
@ 2021-01-18 12:43 ` Chris Wilson
0 siblings, 0 replies; 7+ messages in thread
From: Chris Wilson @ 2021-01-18 12:43 UTC (permalink / raw)
To: intel-gfx; +Cc: Chris Wilson
Now that we are careful to always force-restore contexts upon rewinding
(where necessary), we can restore our optimisation to skip over
completed active execlists when dequeuing.
Referenecs: 35f3fd8182ba ("drm/i915/execlists: Workaround switching back to a completed context")
References: 8ab3a3812aa9 ("drm/i915/gt: Incrementally check for rewinding")
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Mika Kuoppala <mika.kuoppala@linux.intel.com>
---
.../drm/i915/gt/intel_execlists_submission.c | 36 +++++++++----------
1 file changed, 18 insertions(+), 18 deletions(-)
diff --git a/drivers/gpu/drm/i915/gt/intel_execlists_submission.c b/drivers/gpu/drm/i915/gt/intel_execlists_submission.c
index 524c8b54d220..750e95aa904c 100644
--- a/drivers/gpu/drm/i915/gt/intel_execlists_submission.c
+++ b/drivers/gpu/drm/i915/gt/intel_execlists_submission.c
@@ -1224,12 +1224,20 @@ static void set_preempt_timeout(struct intel_engine_cs *engine,
active_preempt_timeout(engine, rq));
}
+static bool completed(const struct i915_request *rq)
+{
+ if (i915_request_has_sentinel(rq))
+ return false;
+
+ return __i915_request_is_complete(rq);
+}
+
static void execlists_dequeue(struct intel_engine_cs *engine)
{
struct intel_engine_execlists * const execlists = &engine->execlists;
struct i915_request **port = execlists->pending;
struct i915_request ** const last_port = port + execlists->port_mask;
- struct i915_request *last = *execlists->active;
+ struct i915_request *last, * const *active;
struct virtual_engine *ve;
struct rb_node *rb;
bool submit = false;
@@ -1266,21 +1274,15 @@ static void execlists_dequeue(struct intel_engine_cs *engine)
* i.e. we will retrigger preemption following the ack in case
* of trouble.
*
- * In theory we can skip over completed contexts that have not
- * yet been processed by events (as those events are in flight):
- *
- * while ((last = *active) && i915_request_completed(last))
- * active++;
- *
- * However, the GPU cannot handle this as it will ultimately
- * find itself trying to jump back into a context it has just
- * completed and barf.
*/
+ active = execlists->active;
+ while ((last = *active) && completed(last))
+ active++;
if (last) {
- if (__i915_request_is_complete(last)) {
- goto check_secondary;
- } else if (need_preempt(engine, last)) {
+ GEM_BUG_ON(!i915_request_is_active(last));
+
+ if (need_preempt(engine, last)) {
ENGINE_TRACE(engine,
"preempting last=%llx:%lld, prio=%d, hint=%d\n",
last->fence.context,
@@ -1359,9 +1361,7 @@ static void execlists_dequeue(struct intel_engine_cs *engine)
* we hopefully coalesce several updates into a single
* submission.
*/
-check_secondary:
- if (!list_is_last(&last->sched.link,
- &engine->active.requests)) {
+ if (active[1]) {
/*
* Even if ELSP[1] is occupied and not worthy
* of timeslices, our queue might be.
@@ -1562,7 +1562,7 @@ static void execlists_dequeue(struct intel_engine_cs *engine)
* of ordered contexts.
*/
if (submit &&
- memcmp(execlists->active,
+ memcmp(active,
execlists->pending,
(port - execlists->pending) * sizeof(*port))) {
*port = NULL;
@@ -1570,7 +1570,7 @@ static void execlists_dequeue(struct intel_engine_cs *engine)
execlists_schedule_in(*port, port - execlists->pending);
WRITE_ONCE(execlists->yield, -1);
- set_preempt_timeout(engine, *execlists->active);
+ set_preempt_timeout(engine, *active);
execlists_submit_ports(engine);
} else {
ring_set_paused(engine, 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] 7+ messages in thread
end of thread, other threads:[~2021-01-21 11:50 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-01-20 12:17 [Intel-gfx] [PATCH 1/2] drm/i915/gt: Do not suspend bonded requests if one hangs Chris Wilson
2021-01-20 12:17 ` [Intel-gfx] [PATCH 2/2] drm/i915/gt: Skip over completed active execlists, again Chris Wilson
2021-01-21 11:47 ` Mika Kuoppala
2021-01-20 19:16 ` [Intel-gfx] ✓ Fi.CI.BAT: success for series starting with [1/2] drm/i915/gt: Do not suspend bonded requests if one hangs Patchwork
2021-01-20 22:12 ` [Intel-gfx] ✓ Fi.CI.IGT: " Patchwork
2021-01-21 11:32 ` [Intel-gfx] [PATCH 1/2] " Mika Kuoppala
-- strict thread matches above, loose matches on Subject: below --
2021-01-18 12:43 Chris Wilson
2021-01-18 12:43 ` [Intel-gfx] [PATCH 2/2] drm/i915/gt: Skip over completed active execlists, again Chris Wilson
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.