When waiting for idle, serialise with any ongoing callback so that it
will have completed before completing the wait.
Signed-off-by: Chris Wilson <chris@xxxxxxxxxxxxxxxxxx>
---
drivers/gpu/drm/i915/intel_wakeref.c | 18 ++++++++++++++++--
1 file changed, 16 insertions(+), 2 deletions(-)
diff --git a/drivers/gpu/drm/i915/intel_wakeref.c b/drivers/gpu/drm/i915/intel_wakeref.c
index 8084cded62db..1241e3a3c024 100644
--- a/drivers/gpu/drm/i915/intel_wakeref.c
+++ b/drivers/gpu/drm/i915/intel_wakeref.c
@@ -98,10 +98,24 @@ void __intel_wakeref_init(struct intel_wakeref *wf,
INIT_WORK(&wf->work, __intel_wakeref_put_work);
}
+static bool is_idle_wait(struct intel_wakeref *wf)
+{
+ bool result;
+
+ if (intel_wakeref_is_active(wf))
+ return false;
+
+ /* serialise with the wf->put() callback; wait until finished */
+ mutex_lock(&wf->mutex);
+ result = !intel_wakeref_is_active(wf);
+ mutex_unlock(&wf->mutex);
+
+ return result;
+}
+
int intel_wakeref_wait_for_idle(struct intel_wakeref *wf)
{
- return wait_var_event_killable(&wf->wakeref,
- !intel_wakeref_is_active(wf));
+ return wait_var_event_killable(&wf->wakeref, is_idle_wait(wf));
}
static void wakeref_auto_timeout(struct timer_list *t)
--
2.24.0
_______________________________________________
Intel-gfx mailing list
Intel-gfx@xxxxxxxxxxxxxxxxxxxxx
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
