* [PATCH] drm/i915/execlists: Always clear preempt status on cancelling all
2018-07-14 9:52 [PATCH] drm/i915/execlists: Always clear preempt status on cancelling all Chris Wilson
@ 2018-07-14 10:00 ` Chris Wilson
2018-07-14 10:02 ` ✗ Fi.CI.BAT: failure for drm/i915/execlists: Always clear preempt status on cancelling all (rev2) Patchwork
` (3 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: Chris Wilson @ 2018-07-14 10:00 UTC (permalink / raw)
To: intel-gfx
On reset/wedging, we cancel all pending replies from the HW and we also
want to cancel an outstanding preemption event. Since we use the same
function to cancel the pending replies for reset and for a preemption
event, we can simply clear the active tracking for all.
v2: Keep execlists_user_end() markup for wedging
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
---
drivers/gpu/drm/i915/intel_guc_submission.c | 2 --
drivers/gpu/drm/i915/intel_lrc.c | 6 ++----
2 files changed, 2 insertions(+), 6 deletions(-)
diff --git a/drivers/gpu/drm/i915/intel_guc_submission.c b/drivers/gpu/drm/i915/intel_guc_submission.c
index cc444dc5f3ad..94d0674ea3c6 100644
--- a/drivers/gpu/drm/i915/intel_guc_submission.c
+++ b/drivers/gpu/drm/i915/intel_guc_submission.c
@@ -633,8 +633,6 @@ static void complete_preempt_context(struct intel_engine_cs *engine)
wait_for_guc_preempt_report(engine);
intel_write_status_page(engine, I915_GEM_HWS_PREEMPT_INDEX, 0);
-
- execlists_clear_active(execlists, EXECLISTS_ACTIVE_PREEMPT);
}
/**
diff --git a/drivers/gpu/drm/i915/intel_lrc.c b/drivers/gpu/drm/i915/intel_lrc.c
index 05567e30efe0..33b65608600c 100644
--- a/drivers/gpu/drm/i915/intel_lrc.c
+++ b/drivers/gpu/drm/i915/intel_lrc.c
@@ -563,8 +563,6 @@ static void complete_preempt_context(struct intel_engine_execlists *execlists)
__unwind_incomplete_requests(container_of(execlists,
struct intel_engine_cs,
execlists));
-
- execlists_clear_active(execlists, EXECLISTS_ACTIVE_PREEMPT);
}
static void execlists_dequeue(struct intel_engine_cs *engine)
@@ -792,8 +790,7 @@ execlists_cancel_port_requests(struct intel_engine_execlists * const execlists)
port++;
}
- execlists_clear_active(execlists, EXECLISTS_ACTIVE_USER);
- execlists_user_end(execlists);
+ execlists->active = 0;
}
static void reset_csb_pointers(struct intel_engine_execlists *execlists)
@@ -839,6 +836,7 @@ static void execlists_cancel_requests(struct intel_engine_cs *engine)
/* Cancel the requests on the HW and clear the ELSP tracker. */
execlists_cancel_port_requests(execlists);
+ execlists_user_end(execlists);
/* Mark all executing requests as skipped. */
list_for_each_entry(rq, &engine->timeline.requests, link) {
--
2.18.0
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 6+ messages in thread* ✗ Fi.CI.BAT: failure for drm/i915/execlists: Always clear preempt status on cancelling all (rev2)
2018-07-14 9:52 [PATCH] drm/i915/execlists: Always clear preempt status on cancelling all Chris Wilson
2018-07-14 10:00 ` Chris Wilson
@ 2018-07-14 10:02 ` Patchwork
2018-07-14 10:11 ` [PATCH] drm/i915/execlists: Always clear preempt status on cancelling all Chris Wilson
` (2 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: Patchwork @ 2018-07-14 10:02 UTC (permalink / raw)
To: Chris Wilson; +Cc: intel-gfx
== Series Details ==
Series: drm/i915/execlists: Always clear preempt status on cancelling all (rev2)
URL : https://patchwork.freedesktop.org/series/46528/
State : failure
== Summary ==
Applying: drm/i915/execlists: Always clear preempt status on cancelling all
Using index info to reconstruct a base tree...
M drivers/gpu/drm/i915/intel_lrc.c
Falling back to patching base and 3-way merge...
Auto-merging drivers/gpu/drm/i915/intel_lrc.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_lrc.c
error: Failed to merge in the changes.
Patch failed at 0001 drm/i915/execlists: Always clear preempt status on cancelling all
Use 'git am --show-current-patch' to see the failed patch
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 6+ messages in thread* [PATCH] drm/i915/execlists: Always clear preempt status on cancelling all
2018-07-14 9:52 [PATCH] drm/i915/execlists: Always clear preempt status on cancelling all Chris Wilson
2018-07-14 10:00 ` Chris Wilson
2018-07-14 10:02 ` ✗ Fi.CI.BAT: failure for drm/i915/execlists: Always clear preempt status on cancelling all (rev2) Patchwork
@ 2018-07-14 10:11 ` Chris Wilson
2018-07-14 10:47 ` ✓ Fi.CI.BAT: success for drm/i915/execlists: Always clear preempt status on cancelling all (rev3) Patchwork
2018-07-16 9:18 ` ✓ Fi.CI.IGT: " Patchwork
4 siblings, 0 replies; 6+ messages in thread
From: Chris Wilson @ 2018-07-14 10:11 UTC (permalink / raw)
To: intel-gfx
On reset/wedging, we cancel all pending replies from the HW and we also
want to cancel an outstanding preemption event. Since we use the same
function to cancel the pending replies for reset and for a preemption
event, we can simply clear the active tracking for all.
v2: Keep execlists_user_end() markup for wedging
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
---
drivers/gpu/drm/i915/intel_guc_submission.c | 2 --
drivers/gpu/drm/i915/intel_lrc.c | 5 ++---
2 files changed, 2 insertions(+), 5 deletions(-)
diff --git a/drivers/gpu/drm/i915/intel_guc_submission.c b/drivers/gpu/drm/i915/intel_guc_submission.c
index cc444dc5f3ad..94d0674ea3c6 100644
--- a/drivers/gpu/drm/i915/intel_guc_submission.c
+++ b/drivers/gpu/drm/i915/intel_guc_submission.c
@@ -633,8 +633,6 @@ static void complete_preempt_context(struct intel_engine_cs *engine)
wait_for_guc_preempt_report(engine);
intel_write_status_page(engine, I915_GEM_HWS_PREEMPT_INDEX, 0);
-
- execlists_clear_active(execlists, EXECLISTS_ACTIVE_PREEMPT);
}
/**
diff --git a/drivers/gpu/drm/i915/intel_lrc.c b/drivers/gpu/drm/i915/intel_lrc.c
index 8fd8de71c2b5..33b65608600c 100644
--- a/drivers/gpu/drm/i915/intel_lrc.c
+++ b/drivers/gpu/drm/i915/intel_lrc.c
@@ -563,8 +563,6 @@ static void complete_preempt_context(struct intel_engine_execlists *execlists)
__unwind_incomplete_requests(container_of(execlists,
struct intel_engine_cs,
execlists));
-
- execlists_clear_active(execlists, EXECLISTS_ACTIVE_PREEMPT);
}
static void execlists_dequeue(struct intel_engine_cs *engine)
@@ -792,7 +790,7 @@ execlists_cancel_port_requests(struct intel_engine_execlists * const execlists)
port++;
}
- execlists_user_end(execlists);
+ execlists->active = 0;
}
static void reset_csb_pointers(struct intel_engine_execlists *execlists)
@@ -838,6 +836,7 @@ static void execlists_cancel_requests(struct intel_engine_cs *engine)
/* Cancel the requests on the HW and clear the ELSP tracker. */
execlists_cancel_port_requests(execlists);
+ execlists_user_end(execlists);
/* Mark all executing requests as skipped. */
list_for_each_entry(rq, &engine->timeline.requests, link) {
--
2.18.0
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 6+ messages in thread* ✓ Fi.CI.BAT: success for drm/i915/execlists: Always clear preempt status on cancelling all (rev3)
2018-07-14 9:52 [PATCH] drm/i915/execlists: Always clear preempt status on cancelling all Chris Wilson
` (2 preceding siblings ...)
2018-07-14 10:11 ` [PATCH] drm/i915/execlists: Always clear preempt status on cancelling all Chris Wilson
@ 2018-07-14 10:47 ` Patchwork
2018-07-16 9:18 ` ✓ Fi.CI.IGT: " Patchwork
4 siblings, 0 replies; 6+ messages in thread
From: Patchwork @ 2018-07-14 10:47 UTC (permalink / raw)
To: Chris Wilson; +Cc: intel-gfx
== Series Details ==
Series: drm/i915/execlists: Always clear preempt status on cancelling all (rev3)
URL : https://patchwork.freedesktop.org/series/46528/
State : success
== Summary ==
= CI Bug Log - changes from CI_DRM_4489 -> Patchwork_9659 =
== Summary - SUCCESS ==
No regressions found.
External URL: https://patchwork.freedesktop.org/api/1.0/series/46528/revisions/3/mbox/
== Known issues ==
Here are the changes found in Patchwork_9659 that come from known issues:
=== IGT changes ===
==== Issues hit ====
igt@drv_module_reload@basic-reload:
fi-glk-j4005: PASS -> DMESG-WARN (fdo#106000)
==== Warnings ====
igt@gem_exec_suspend@basic-s4-devices:
{fi-kbl-8809g}: INCOMPLETE (fdo#107139) -> DMESG-WARN (fdo#107139)
{name}: This element is suppressed. This means it is ignored when computing
the status of the difference (SUCCESS, WARNING, or FAILURE).
fdo#106000 https://bugs.freedesktop.org/show_bug.cgi?id=106000
fdo#107139 https://bugs.freedesktop.org/show_bug.cgi?id=107139
== Participating hosts (45 -> 41) ==
Missing (4): fi-hsw-peppy fi-ilk-m540 fi-byt-squawks fi-hsw-4200u
== Build changes ==
* Linux: CI_DRM_4489 -> Patchwork_9659
CI_DRM_4489: d0b0c9150d280254d8ce7fcddaaf96132ac5ec62 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_4558: d8e97e1710b27a3931a1c53d1dd88c0e709c085b @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_9659: 62ab42d10c501aa57195cb0fc3cfb2e10f3015b9 @ git://anongit.freedesktop.org/gfx-ci/linux
== Linux commits ==
62ab42d10c50 drm/i915/execlists: Always clear preempt status on cancelling all
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_9659/issues.html
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 6+ messages in thread* ✓ Fi.CI.IGT: success for drm/i915/execlists: Always clear preempt status on cancelling all (rev3)
2018-07-14 9:52 [PATCH] drm/i915/execlists: Always clear preempt status on cancelling all Chris Wilson
` (3 preceding siblings ...)
2018-07-14 10:47 ` ✓ Fi.CI.BAT: success for drm/i915/execlists: Always clear preempt status on cancelling all (rev3) Patchwork
@ 2018-07-16 9:18 ` Patchwork
4 siblings, 0 replies; 6+ messages in thread
From: Patchwork @ 2018-07-16 9:18 UTC (permalink / raw)
To: Chris Wilson; +Cc: intel-gfx
== Series Details ==
Series: drm/i915/execlists: Always clear preempt status on cancelling all (rev3)
URL : https://patchwork.freedesktop.org/series/46528/
State : success
== Summary ==
= CI Bug Log - changes from CI_DRM_4489_full -> Patchwork_9659_full =
== Summary - WARNING ==
Minor unknown changes coming with Patchwork_9659_full need to be verified
manually.
If you think the reported changes have nothing to do with the changes
introduced in Patchwork_9659_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_9659_full:
=== IGT changes ===
==== Warnings ====
igt@gem_exec_schedule@reorder-wide-render:
shard-glk: SKIP -> PASS +37
igt@gem_userptr_blits@map-fixed-invalidate:
shard-apl: SKIP -> PASS +37
igt@kms_vblank@pipe-a-wait-busy:
shard-snb: SKIP -> PASS +1
igt@perf_pmu@frequency:
shard-kbl: SKIP -> PASS +35
== Known issues ==
Here are the changes found in Patchwork_9659_full that come from known issues:
=== IGT changes ===
==== Issues hit ====
igt@drv_suspend@shrink:
shard-glk: PASS -> FAIL (fdo#106886)
igt@gem_ctx_isolation@vcs0-s3:
shard-kbl: PASS -> INCOMPLETE (fdo#103665)
igt@kms_flip@2x-plain-flip-fb-recreate-interruptible:
shard-glk: PASS -> FAIL (fdo#100368) +1
igt@kms_setmode@basic:
shard-apl: PASS -> FAIL (fdo#99912)
==== Possible fixes ====
igt@drv_missed_irq:
shard-apl: INCOMPLETE (fdo#103927) -> PASS +1
shard-glk: INCOMPLETE (k.org#198133, fdo#103359) -> PASS +1
igt@drv_suspend@shrink:
shard-snb: INCOMPLETE (fdo#105411, fdo#106886) -> PASS
igt@gem_exec_schedule@preempt-hang-bsd:
shard-glk: DMESG-FAIL -> PASS +3
igt@gem_exec_schedule@preempt-hang-bsd1:
shard-kbl: DMESG-FAIL -> PASS +4
igt@gem_exec_schedule@preempt-hang-render:
shard-apl: DMESG-FAIL -> PASS +3
igt@kms_cursor_crc@cursor-256x256-suspend:
shard-kbl: INCOMPLETE (fdo#103665) -> PASS +2
igt@kms_draw_crc@draw-method-xrgb2101010-blt-xtiled:
shard-kbl: FAIL -> PASS +1
igt@kms_flip@2x-dpms-vs-vblank-race:
shard-hsw: FAIL (fdo#103060) -> PASS
igt@kms_flip@plain-flip-ts-check-interruptible:
shard-glk: FAIL (fdo#100368) -> PASS +2
igt@kms_frontbuffer_tracking@fbc-1p-shrfb-fliptrack:
shard-glk: FAIL -> PASS +8
shard-kbl: FAIL (fdo#106067) -> PASS +1
igt@kms_plane_lowres@pipe-c-tiling-y:
shard-kbl: FAIL (fdo#106066) -> PASS +3
igt@kms_rotation_crc@bad-pixel-format:
shard-apl: FAIL -> PASS +6
{name}: This element is suppressed. This means it is ignored when computing
the status of the difference (SUCCESS, WARNING, or FAILURE).
fdo#100368 https://bugs.freedesktop.org/show_bug.cgi?id=100368
fdo#103060 https://bugs.freedesktop.org/show_bug.cgi?id=103060
fdo#103359 https://bugs.freedesktop.org/show_bug.cgi?id=103359
fdo#103665 https://bugs.freedesktop.org/show_bug.cgi?id=103665
fdo#103927 https://bugs.freedesktop.org/show_bug.cgi?id=103927
fdo#105411 https://bugs.freedesktop.org/show_bug.cgi?id=105411
fdo#106066 https://bugs.freedesktop.org/show_bug.cgi?id=106066
fdo#106067 https://bugs.freedesktop.org/show_bug.cgi?id=106067
fdo#106886 https://bugs.freedesktop.org/show_bug.cgi?id=106886
fdo#99912 https://bugs.freedesktop.org/show_bug.cgi?id=99912
k.org#198133 https://bugzilla.kernel.org/show_bug.cgi?id=198133
== Participating hosts (5 -> 5) ==
No changes in participating hosts
== Build changes ==
* Linux: CI_DRM_4489 -> Patchwork_9659
CI_DRM_4489: d0b0c9150d280254d8ce7fcddaaf96132ac5ec62 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_4558: d8e97e1710b27a3931a1c53d1dd88c0e709c085b @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_9659: 62ab42d10c501aa57195cb0fc3cfb2e10f3015b9 @ 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_9659/shards.html
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 6+ messages in thread