* [PATCH] drm/i915/gt: Push the flush_pd before the set-context
@ 2019-11-30 12:05 ` Chris Wilson
0 siblings, 0 replies; 4+ messages in thread
From: Chris Wilson @ 2019-11-30 12:05 UTC (permalink / raw)
To: intel-gfx
Move our "wait for the PD load to complete" paranoia before the
MI_SET_CONTEXT just in case the context restore tries to access local
addresses.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
---
.../gpu/drm/i915/gt/intel_ring_submission.c | 28 +++++++++----------
1 file changed, 13 insertions(+), 15 deletions(-)
diff --git a/drivers/gpu/drm/i915/gt/intel_ring_submission.c b/drivers/gpu/drm/i915/gt/intel_ring_submission.c
index f977fc27b001..dcdeef0a776f 100644
--- a/drivers/gpu/drm/i915/gt/intel_ring_submission.c
+++ b/drivers/gpu/drm/i915/gt/intel_ring_submission.c
@@ -1591,24 +1591,11 @@ static int switch_context(struct i915_request *rq)
GEM_BUG_ON(HAS_EXECLISTS(rq->i915));
if (vm) {
- ret = load_pd_dir(rq, i915_vm_to_ppgtt(vm));
- if (ret)
- return ret;
- }
-
- if (ce->state) {
- GEM_BUG_ON(rq->engine->id != RCS0);
-
- if (!rq->engine->default_state)
- hw_flags = MI_RESTORE_INHIBIT;
+ struct intel_engine_cs *engine = rq->engine;
- ret = mi_set_context(rq, hw_flags);
+ ret = load_pd_dir(rq, i915_vm_to_ppgtt(vm));
if (ret)
return ret;
- }
-
- if (vm) {
- struct intel_engine_cs *engine = rq->engine;
ret = engine->emit_flush(rq, EMIT_INVALIDATE);
if (ret)
@@ -1635,6 +1622,17 @@ static int switch_context(struct i915_request *rq)
return ret;
}
+ if (ce->state) {
+ GEM_BUG_ON(rq->engine->id != RCS0);
+
+ if (!rq->engine->default_state)
+ hw_flags = MI_RESTORE_INHIBIT;
+
+ ret = mi_set_context(rq, hw_flags);
+ if (ret)
+ return ret;
+ }
+
ret = remap_l3(rq);
if (ret)
return ret;
--
2.24.0
_______________________________________________
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] [PATCH] drm/i915/gt: Push the flush_pd before the set-context
@ 2019-11-30 12:05 ` Chris Wilson
0 siblings, 0 replies; 4+ messages in thread
From: Chris Wilson @ 2019-11-30 12:05 UTC (permalink / raw)
To: intel-gfx
Move our "wait for the PD load to complete" paranoia before the
MI_SET_CONTEXT just in case the context restore tries to access local
addresses.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
---
.../gpu/drm/i915/gt/intel_ring_submission.c | 28 +++++++++----------
1 file changed, 13 insertions(+), 15 deletions(-)
diff --git a/drivers/gpu/drm/i915/gt/intel_ring_submission.c b/drivers/gpu/drm/i915/gt/intel_ring_submission.c
index f977fc27b001..dcdeef0a776f 100644
--- a/drivers/gpu/drm/i915/gt/intel_ring_submission.c
+++ b/drivers/gpu/drm/i915/gt/intel_ring_submission.c
@@ -1591,24 +1591,11 @@ static int switch_context(struct i915_request *rq)
GEM_BUG_ON(HAS_EXECLISTS(rq->i915));
if (vm) {
- ret = load_pd_dir(rq, i915_vm_to_ppgtt(vm));
- if (ret)
- return ret;
- }
-
- if (ce->state) {
- GEM_BUG_ON(rq->engine->id != RCS0);
-
- if (!rq->engine->default_state)
- hw_flags = MI_RESTORE_INHIBIT;
+ struct intel_engine_cs *engine = rq->engine;
- ret = mi_set_context(rq, hw_flags);
+ ret = load_pd_dir(rq, i915_vm_to_ppgtt(vm));
if (ret)
return ret;
- }
-
- if (vm) {
- struct intel_engine_cs *engine = rq->engine;
ret = engine->emit_flush(rq, EMIT_INVALIDATE);
if (ret)
@@ -1635,6 +1622,17 @@ static int switch_context(struct i915_request *rq)
return ret;
}
+ if (ce->state) {
+ GEM_BUG_ON(rq->engine->id != RCS0);
+
+ if (!rq->engine->default_state)
+ hw_flags = MI_RESTORE_INHIBIT;
+
+ ret = mi_set_context(rq, hw_flags);
+ if (ret)
+ return ret;
+ }
+
ret = remap_l3(rq);
if (ret)
return ret;
--
2.24.0
_______________________________________________
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
* ✗ Fi.CI.BAT: failure for drm/i915/gt: Push the flush_pd before the set-context
@ 2019-11-30 13:08 ` Patchwork
0 siblings, 0 replies; 4+ messages in thread
From: Patchwork @ 2019-11-30 13:08 UTC (permalink / raw)
To: Chris Wilson; +Cc: intel-gfx
== Series Details ==
Series: drm/i915/gt: Push the flush_pd before the set-context
URL : https://patchwork.freedesktop.org/series/70229/
State : failure
== Summary ==
CI Bug Log - changes from CI_DRM_7450 -> Patchwork_15522
====================================================
Summary
-------
**FAILURE**
Serious unknown changes coming with Patchwork_15522 absolutely need to be
verified manually.
If you think the reported changes have nothing to do with the changes
introduced in Patchwork_15522, please notify your bug team to allow them
to document this new failure mode, which will reduce false positives in CI.
External URL: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15522/index.html
Possible new issues
-------------------
Here are the unknown changes that may have been introduced in Patchwork_15522:
### IGT changes ###
#### Possible regressions ####
* igt@i915_selftest@live_blt:
- fi-hsw-4770: [PASS][1] -> [DMESG-FAIL][2]
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7450/fi-hsw-4770/igt@i915_selftest@live_blt.html
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15522/fi-hsw-4770/igt@i915_selftest@live_blt.html
* igt@i915_selftest@live_gt_lrc:
- fi-bwr-2160: [PASS][3] -> [INCOMPLETE][4]
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7450/fi-bwr-2160/igt@i915_selftest@live_gt_lrc.html
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15522/fi-bwr-2160/igt@i915_selftest@live_gt_lrc.html
Known issues
------------
Here are the changes found in Patchwork_15522 that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@gem_workarounds@basic-read:
- fi-icl-dsi: [PASS][5] -> [DMESG-WARN][6] ([i915#109])
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7450/fi-icl-dsi/igt@gem_workarounds@basic-read.html
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15522/fi-icl-dsi/igt@gem_workarounds@basic-read.html
* igt@i915_selftest@live_blt:
- fi-hsw-4770r: [PASS][7] -> [DMESG-FAIL][8] ([i915#563])
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7450/fi-hsw-4770r/igt@i915_selftest@live_blt.html
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15522/fi-hsw-4770r/igt@i915_selftest@live_blt.html
#### Warnings ####
* igt@gem_exec_suspend@basic-s4-devices:
- fi-kbl-x1275: [DMESG-WARN][9] ([fdo#107139] / [i915#62] / [i915#92]) -> [DMESG-WARN][10] ([fdo#107139] / [i915#62] / [i915#92] / [i915#95])
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7450/fi-kbl-x1275/igt@gem_exec_suspend@basic-s4-devices.html
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15522/fi-kbl-x1275/igt@gem_exec_suspend@basic-s4-devices.html
* igt@i915_pm_rpm@basic-rte:
- fi-kbl-guc: [FAIL][11] ([i915#579]) -> [SKIP][12] ([fdo#109271])
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7450/fi-kbl-guc/igt@i915_pm_rpm@basic-rte.html
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15522/fi-kbl-guc/igt@i915_pm_rpm@basic-rte.html
* igt@kms_flip@basic-flip-vs-modeset:
- fi-kbl-x1275: [DMESG-WARN][13] ([i915#62] / [i915#92] / [i915#95]) -> [DMESG-WARN][14] ([i915#62] / [i915#92]) +7 similar issues
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7450/fi-kbl-x1275/igt@kms_flip@basic-flip-vs-modeset.html
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15522/fi-kbl-x1275/igt@kms_flip@basic-flip-vs-modeset.html
* igt@kms_pipe_crc_basic@suspend-read-crc-pipe-a:
- fi-kbl-x1275: [DMESG-WARN][15] ([i915#62] / [i915#92]) -> [DMESG-WARN][16] ([i915#62] / [i915#92] / [i915#95]) +6 similar issues
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7450/fi-kbl-x1275/igt@kms_pipe_crc_basic@suspend-read-crc-pipe-a.html
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15522/fi-kbl-x1275/igt@kms_pipe_crc_basic@suspend-read-crc-pipe-a.html
[fdo#107139]: https://bugs.freedesktop.org/show_bug.cgi?id=107139
[fdo#109271]: https://bugs.freedesktop.org/show_bug.cgi?id=109271
[i915#109]: https://gitlab.freedesktop.org/drm/intel/issues/109
[i915#563]: https://gitlab.freedesktop.org/drm/intel/issues/563
[i915#579]: https://gitlab.freedesktop.org/drm/intel/issues/579
[i915#62]: https://gitlab.freedesktop.org/drm/intel/issues/62
[i915#92]: https://gitlab.freedesktop.org/drm/intel/issues/92
[i915#95]: https://gitlab.freedesktop.org/drm/intel/issues/95
Participating hosts (50 -> 43)
------------------------------
Missing (7): fi-ilk-m540 fi-hsw-4200u fi-bsw-cyan fi-ctg-p8600 fi-skl-lmem fi-byt-clapper fi-bdw-samus
Build changes
-------------
* CI: CI-20190529 -> None
* Linux: CI_DRM_7450 -> Patchwork_15522
CI-20190529: 20190529
CI_DRM_7450: 23cbc1d70aa6dc08fcf354f14d740fde0e1252c5 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_5318: 26ae6584ac03ad862d82f986302275a68bcccb29 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_15522: b71e1bd45b704ccb522124a9b81234d59d296ed2 @ git://anongit.freedesktop.org/gfx-ci/linux
== Linux commits ==
b71e1bd45b70 drm/i915/gt: Push the flush_pd before the set-context
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15522/index.html
_______________________________________________
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.BAT: failure for drm/i915/gt: Push the flush_pd before the set-context
@ 2019-11-30 13:08 ` Patchwork
0 siblings, 0 replies; 4+ messages in thread
From: Patchwork @ 2019-11-30 13:08 UTC (permalink / raw)
To: Chris Wilson; +Cc: intel-gfx
== Series Details ==
Series: drm/i915/gt: Push the flush_pd before the set-context
URL : https://patchwork.freedesktop.org/series/70229/
State : failure
== Summary ==
CI Bug Log - changes from CI_DRM_7450 -> Patchwork_15522
====================================================
Summary
-------
**FAILURE**
Serious unknown changes coming with Patchwork_15522 absolutely need to be
verified manually.
If you think the reported changes have nothing to do with the changes
introduced in Patchwork_15522, please notify your bug team to allow them
to document this new failure mode, which will reduce false positives in CI.
External URL: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15522/index.html
Possible new issues
-------------------
Here are the unknown changes that may have been introduced in Patchwork_15522:
### IGT changes ###
#### Possible regressions ####
* igt@i915_selftest@live_blt:
- fi-hsw-4770: [PASS][1] -> [DMESG-FAIL][2]
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7450/fi-hsw-4770/igt@i915_selftest@live_blt.html
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15522/fi-hsw-4770/igt@i915_selftest@live_blt.html
* igt@i915_selftest@live_gt_lrc:
- fi-bwr-2160: [PASS][3] -> [INCOMPLETE][4]
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7450/fi-bwr-2160/igt@i915_selftest@live_gt_lrc.html
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15522/fi-bwr-2160/igt@i915_selftest@live_gt_lrc.html
Known issues
------------
Here are the changes found in Patchwork_15522 that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@gem_workarounds@basic-read:
- fi-icl-dsi: [PASS][5] -> [DMESG-WARN][6] ([i915#109])
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7450/fi-icl-dsi/igt@gem_workarounds@basic-read.html
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15522/fi-icl-dsi/igt@gem_workarounds@basic-read.html
* igt@i915_selftest@live_blt:
- fi-hsw-4770r: [PASS][7] -> [DMESG-FAIL][8] ([i915#563])
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7450/fi-hsw-4770r/igt@i915_selftest@live_blt.html
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15522/fi-hsw-4770r/igt@i915_selftest@live_blt.html
#### Warnings ####
* igt@gem_exec_suspend@basic-s4-devices:
- fi-kbl-x1275: [DMESG-WARN][9] ([fdo#107139] / [i915#62] / [i915#92]) -> [DMESG-WARN][10] ([fdo#107139] / [i915#62] / [i915#92] / [i915#95])
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7450/fi-kbl-x1275/igt@gem_exec_suspend@basic-s4-devices.html
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15522/fi-kbl-x1275/igt@gem_exec_suspend@basic-s4-devices.html
* igt@i915_pm_rpm@basic-rte:
- fi-kbl-guc: [FAIL][11] ([i915#579]) -> [SKIP][12] ([fdo#109271])
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7450/fi-kbl-guc/igt@i915_pm_rpm@basic-rte.html
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15522/fi-kbl-guc/igt@i915_pm_rpm@basic-rte.html
* igt@kms_flip@basic-flip-vs-modeset:
- fi-kbl-x1275: [DMESG-WARN][13] ([i915#62] / [i915#92] / [i915#95]) -> [DMESG-WARN][14] ([i915#62] / [i915#92]) +7 similar issues
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7450/fi-kbl-x1275/igt@kms_flip@basic-flip-vs-modeset.html
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15522/fi-kbl-x1275/igt@kms_flip@basic-flip-vs-modeset.html
* igt@kms_pipe_crc_basic@suspend-read-crc-pipe-a:
- fi-kbl-x1275: [DMESG-WARN][15] ([i915#62] / [i915#92]) -> [DMESG-WARN][16] ([i915#62] / [i915#92] / [i915#95]) +6 similar issues
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7450/fi-kbl-x1275/igt@kms_pipe_crc_basic@suspend-read-crc-pipe-a.html
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15522/fi-kbl-x1275/igt@kms_pipe_crc_basic@suspend-read-crc-pipe-a.html
[fdo#107139]: https://bugs.freedesktop.org/show_bug.cgi?id=107139
[fdo#109271]: https://bugs.freedesktop.org/show_bug.cgi?id=109271
[i915#109]: https://gitlab.freedesktop.org/drm/intel/issues/109
[i915#563]: https://gitlab.freedesktop.org/drm/intel/issues/563
[i915#579]: https://gitlab.freedesktop.org/drm/intel/issues/579
[i915#62]: https://gitlab.freedesktop.org/drm/intel/issues/62
[i915#92]: https://gitlab.freedesktop.org/drm/intel/issues/92
[i915#95]: https://gitlab.freedesktop.org/drm/intel/issues/95
Participating hosts (50 -> 43)
------------------------------
Missing (7): fi-ilk-m540 fi-hsw-4200u fi-bsw-cyan fi-ctg-p8600 fi-skl-lmem fi-byt-clapper fi-bdw-samus
Build changes
-------------
* CI: CI-20190529 -> None
* Linux: CI_DRM_7450 -> Patchwork_15522
CI-20190529: 20190529
CI_DRM_7450: 23cbc1d70aa6dc08fcf354f14d740fde0e1252c5 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_5318: 26ae6584ac03ad862d82f986302275a68bcccb29 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_15522: b71e1bd45b704ccb522124a9b81234d59d296ed2 @ git://anongit.freedesktop.org/gfx-ci/linux
== Linux commits ==
b71e1bd45b70 drm/i915/gt: Push the flush_pd before the set-context
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15522/index.html
_______________________________________________
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:[~2019-11-30 13:08 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-11-30 12:05 [PATCH] drm/i915/gt: Push the flush_pd before the set-context Chris Wilson
2019-11-30 12:05 ` [Intel-gfx] " Chris Wilson
2019-11-30 13:08 ` ✗ Fi.CI.BAT: failure for " Patchwork
2019-11-30 13:08 ` [Intel-gfx] " Patchwork
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.