* [Intel-gfx] [PATCH] drm/i915/gt: Flush ongoing retires during wait_for_idle
@ 2020-01-02 21:56 Chris Wilson
2020-01-02 22:40 ` [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for " Patchwork
2020-01-02 23:10 ` [Intel-gfx] ✓ Fi.CI.BAT: success " Patchwork
0 siblings, 2 replies; 3+ messages in thread
From: Chris Wilson @ 2020-01-02 21:56 UTC (permalink / raw)
To: intel-gfx
Synchronise with any background retires and parking we may have spawned,
so that all requests are accounted for.
Closes: https://gitlab.freedesktop.org/drm/intel/issues/878
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
---
drivers/gpu/drm/i915/gt/intel_gt_requests.c | 14 +++++++++-----
drivers/gpu/drm/i915/intel_wakeref.c | 7 +++++--
drivers/gpu/drm/i915/intel_wakeref.h | 9 +++++++--
3 files changed, 21 insertions(+), 9 deletions(-)
diff --git a/drivers/gpu/drm/i915/gt/intel_gt_requests.c b/drivers/gpu/drm/i915/gt/intel_gt_requests.c
index fc691c130ba6..0c3d8517010a 100644
--- a/drivers/gpu/drm/i915/gt/intel_gt_requests.c
+++ b/drivers/gpu/drm/i915/gt/intel_gt_requests.c
@@ -26,18 +26,22 @@ static bool retire_requests(struct intel_timeline *tl)
return !i915_active_fence_isset(&tl->last_request);
}
-static void flush_submission(struct intel_gt *gt)
+static bool flush_submission(struct intel_gt *gt)
{
struct intel_engine_cs *engine;
enum intel_engine_id id;
+ bool active = false;
if (!intel_gt_pm_is_awake(gt))
- return;
+ return false;;
for_each_engine(engine, gt, id) {
intel_engine_flush_submission(engine);
- flush_work(&engine->retire_work);
+ active |= flush_work(&engine->retire_work);
+ active |= flush_work(&engine->wakeref.work);
}
+
+ return active;
}
static void engine_retire(struct work_struct *work)
@@ -147,9 +151,9 @@ long intel_gt_retire_requests_timeout(struct intel_gt *gt, long timeout)
}
}
- active_count += !retire_requests(tl);
+ if (!retire_requests(tl) || flush_submission(gt))
+ active_count++;
- flush_submission(gt); /* sync with concurrent retirees */
spin_lock(&timelines->lock);
/* Resume iteration after dropping lock */
diff --git a/drivers/gpu/drm/i915/intel_wakeref.c b/drivers/gpu/drm/i915/intel_wakeref.c
index 59aa1b6f1827..1a57898d5a06 100644
--- a/drivers/gpu/drm/i915/intel_wakeref.c
+++ b/drivers/gpu/drm/i915/intel_wakeref.c
@@ -95,16 +95,19 @@ static void __intel_wakeref_put_work(struct work_struct *wrk)
void __intel_wakeref_init(struct intel_wakeref *wf,
struct intel_runtime_pm *rpm,
const struct intel_wakeref_ops *ops,
- struct lock_class_key *key)
+ struct intel_wakeref_lockclass *key)
{
wf->rpm = rpm;
wf->ops = ops;
- __mutex_init(&wf->mutex, "wakeref", key);
+ __mutex_init(&wf->mutex, "wakeref.mutex", &key->mutex);
atomic_set(&wf->count, 0);
wf->wakeref = 0;
INIT_WORK(&wf->work, __intel_wakeref_put_work);
+#ifdef CONFIG_LOCKDEP
+ lockdep_init_map(&wf->work.lockdep_map, "wakeref.work", &key->work, 0);
+#endif
}
int intel_wakeref_wait_for_idle(struct intel_wakeref *wf)
diff --git a/drivers/gpu/drm/i915/intel_wakeref.h b/drivers/gpu/drm/i915/intel_wakeref.h
index 8d945db94b7a..7d1e676b71ef 100644
--- a/drivers/gpu/drm/i915/intel_wakeref.h
+++ b/drivers/gpu/drm/i915/intel_wakeref.h
@@ -44,12 +44,17 @@ struct intel_wakeref {
struct work_struct work;
};
+struct intel_wakeref_lockclass {
+ struct lock_class_key mutex;
+ struct lock_class_key work;
+};
+
void __intel_wakeref_init(struct intel_wakeref *wf,
struct intel_runtime_pm *rpm,
const struct intel_wakeref_ops *ops,
- struct lock_class_key *key);
+ struct intel_wakeref_lockclass *key);
#define intel_wakeref_init(wf, rpm, ops) do { \
- static struct lock_class_key __key; \
+ static struct intel_wakeref_lockclass __key; \
\
__intel_wakeref_init((wf), (rpm), (ops), &__key); \
} while (0)
--
2.25.0.rc0
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for drm/i915/gt: Flush ongoing retires during wait_for_idle
2020-01-02 21:56 [Intel-gfx] [PATCH] drm/i915/gt: Flush ongoing retires during wait_for_idle Chris Wilson
@ 2020-01-02 22:40 ` Patchwork
2020-01-02 23:10 ` [Intel-gfx] ✓ Fi.CI.BAT: success " Patchwork
1 sibling, 0 replies; 3+ messages in thread
From: Patchwork @ 2020-01-02 22:40 UTC (permalink / raw)
To: Chris Wilson; +Cc: intel-gfx
== Series Details ==
Series: drm/i915/gt: Flush ongoing retires during wait_for_idle
URL : https://patchwork.freedesktop.org/series/71575/
State : warning
== Summary ==
$ dim checkpatch origin/drm-tip
d965fea13a5b drm/i915/gt: Flush ongoing retires during wait_for_idle
-:29: WARNING:ONE_SEMICOLON: Statements terminations use 1 semicolon
#29: FILE: drivers/gpu/drm/i915/gt/intel_gt_requests.c:36:
+ return false;;
total: 0 errors, 1 warnings, 0 checks, 76 lines checked
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 3+ messages in thread
* [Intel-gfx] ✓ Fi.CI.BAT: success for drm/i915/gt: Flush ongoing retires during wait_for_idle
2020-01-02 21:56 [Intel-gfx] [PATCH] drm/i915/gt: Flush ongoing retires during wait_for_idle Chris Wilson
2020-01-02 22:40 ` [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for " Patchwork
@ 2020-01-02 23:10 ` Patchwork
1 sibling, 0 replies; 3+ messages in thread
From: Patchwork @ 2020-01-02 23:10 UTC (permalink / raw)
To: Chris Wilson; +Cc: intel-gfx
== Series Details ==
Series: drm/i915/gt: Flush ongoing retires during wait_for_idle
URL : https://patchwork.freedesktop.org/series/71575/
State : success
== Summary ==
CI Bug Log - changes from CI_DRM_7668 -> Patchwork_15980
====================================================
Summary
-------
**SUCCESS**
No regressions found.
External URL: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15980/index.html
Known issues
------------
Here are the changes found in Patchwork_15980 that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@gem_close_race@basic-threads:
- fi-byt-j1900: [PASS][1] -> [TIMEOUT][2] ([i915#816])
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7668/fi-byt-j1900/igt@gem_close_race@basic-threads.html
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15980/fi-byt-j1900/igt@gem_close_race@basic-threads.html
* igt@i915_module_load@reload-with-fault-injection:
- fi-cfl-8700k: [PASS][3] -> [INCOMPLETE][4] ([i915#505])
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7668/fi-cfl-8700k/igt@i915_module_load@reload-with-fault-injection.html
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15980/fi-cfl-8700k/igt@i915_module_load@reload-with-fault-injection.html
- fi-bxt-dsi: [PASS][5] -> [INCOMPLETE][6] ([fdo#103927])
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7668/fi-bxt-dsi/igt@i915_module_load@reload-with-fault-injection.html
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15980/fi-bxt-dsi/igt@i915_module_load@reload-with-fault-injection.html
* igt@i915_selftest@live_blt:
- fi-hsw-4770r: [PASS][7] -> [DMESG-FAIL][8] ([i915#553] / [i915#725])
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7668/fi-hsw-4770r/igt@i915_selftest@live_blt.html
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15980/fi-hsw-4770r/igt@i915_selftest@live_blt.html
* igt@i915_selftest@live_gt_lrc:
- fi-skl-6600u: [PASS][9] -> [DMESG-FAIL][10] ([i915#889]) +7 similar issues
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7668/fi-skl-6600u/igt@i915_selftest@live_gt_lrc.html
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15980/fi-skl-6600u/igt@i915_selftest@live_gt_lrc.html
* igt@i915_selftest@live_late_gt_pm:
- fi-skl-6600u: [PASS][11] -> [DMESG-WARN][12] ([i915#889]) +23 similar issues
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7668/fi-skl-6600u/igt@i915_selftest@live_late_gt_pm.html
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15980/fi-skl-6600u/igt@i915_selftest@live_late_gt_pm.html
* igt@kms_frontbuffer_tracking@basic:
- fi-icl-dsi: [PASS][13] -> [DMESG-WARN][14] ([i915#109])
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7668/fi-icl-dsi/igt@kms_frontbuffer_tracking@basic.html
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15980/fi-icl-dsi/igt@kms_frontbuffer_tracking@basic.html
#### Possible fixes ####
* igt@i915_module_load@reload-with-fault-injection:
- fi-skl-6700k2: [INCOMPLETE][15] ([i915#671]) -> [PASS][16]
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7668/fi-skl-6700k2/igt@i915_module_load@reload-with-fault-injection.html
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15980/fi-skl-6700k2/igt@i915_module_load@reload-with-fault-injection.html
* igt@i915_selftest@live_active:
- fi-kbl-r: [DMESG-FAIL][17] -> [PASS][18]
[17]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7668/fi-kbl-r/igt@i915_selftest@live_active.html
[18]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15980/fi-kbl-r/igt@i915_selftest@live_active.html
* igt@i915_selftest@live_gem:
- fi-bdw-5557u: [FAIL][19] -> [PASS][20]
[19]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7668/fi-bdw-5557u/igt@i915_selftest@live_gem.html
[20]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15980/fi-bdw-5557u/igt@i915_selftest@live_gem.html
* igt@kms_chamelium@hdmi-crc-fast:
- fi-icl-u2: [FAIL][21] ([fdo#109635]) -> [PASS][22]
[21]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7668/fi-icl-u2/igt@kms_chamelium@hdmi-crc-fast.html
[22]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15980/fi-icl-u2/igt@kms_chamelium@hdmi-crc-fast.html
#### Warnings ####
* igt@i915_selftest@live_blt:
- fi-hsw-4770: [DMESG-FAIL][23] ([i915#553] / [i915#725]) -> [DMESG-FAIL][24] ([i915#725])
[23]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7668/fi-hsw-4770/igt@i915_selftest@live_blt.html
[24]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15980/fi-hsw-4770/igt@i915_selftest@live_blt.html
[fdo#103927]: https://bugs.freedesktop.org/show_bug.cgi?id=103927
[fdo#109635]: https://bugs.freedesktop.org/show_bug.cgi?id=109635
[i915#109]: https://gitlab.freedesktop.org/drm/intel/issues/109
[i915#505]: https://gitlab.freedesktop.org/drm/intel/issues/505
[i915#553]: https://gitlab.freedesktop.org/drm/intel/issues/553
[i915#671]: https://gitlab.freedesktop.org/drm/intel/issues/671
[i915#725]: https://gitlab.freedesktop.org/drm/intel/issues/725
[i915#816]: https://gitlab.freedesktop.org/drm/intel/issues/816
[i915#889]: https://gitlab.freedesktop.org/drm/intel/issues/889
Participating hosts (48 -> 43)
------------------------------
Additional (5): fi-skl-guc fi-bwr-2160 fi-cfl-8109u fi-kbl-8809g fi-bsw-kefka
Missing (10): fi-ilk-m540 fi-tgl-u fi-hsw-4200u fi-hsw-peppy fi-bsw-cyan fi-ctg-p8600 fi-skl-lmem fi-blb-e6850 fi-byt-clapper fi-bdw-samus
Build changes
-------------
* CI: CI-20190529 -> None
* Linux: CI_DRM_7668 -> Patchwork_15980
CI-20190529: 20190529
CI_DRM_7668: e63e1b81764ac9d3edbf178821a6cbbc8d7eab9d @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_5357: a555a4b98f90dab655d24bb3d07e9291a8b8dac8 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_15980: d965fea13a5b20d735e3245227a3cd1928c9eca7 @ git://anongit.freedesktop.org/gfx-ci/linux
== Linux commits ==
d965fea13a5b drm/i915/gt: Flush ongoing retires during wait_for_idle
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15980/index.html
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2020-01-02 23:10 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-01-02 21:56 [Intel-gfx] [PATCH] drm/i915/gt: Flush ongoing retires during wait_for_idle Chris Wilson
2020-01-02 22:40 ` [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for " Patchwork
2020-01-02 23:10 ` [Intel-gfx] ✓ Fi.CI.BAT: success " 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.