drm/i915/gt: Cancel the flush worker more thoroughly
diff mbox series

Message ID 20200520204152.3032831-1-chris@chris-wilson.co.uk
State New
Headers show
  • drm/i915/gt: Cancel the flush worker more thoroughly
Related show

Commit Message

Chris Wilson May 20, 2020, 8:41 p.m. UTC
Since the worker may rearm, we currently are only guaranteed to flush
the work if we cancel the timer. If the work was running at the time we
try and cancel it, we will wait for it to complete, but it may leave
items in the pool and requeue the work. If we rearrange the immediate
discard of the pool then cancel the work, we know that the work cannot
rearm and so our flush will be final.

<0> [314.146044] i915_mod-1321    2.... 299799443us : intel_gt_fini_buffer_pool: intel_gt_fini_buffer_pool:227 GEM_BUG_ON(!list_empty(&pool->cache_list[n]))

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
 drivers/gpu/drm/i915/gt/intel_gt_buffer_pool.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff mbox series

diff --git a/drivers/gpu/drm/i915/gt/intel_gt_buffer_pool.c b/drivers/gpu/drm/i915/gt/intel_gt_buffer_pool.c
index 1495054a4305..77487732d53f 100644
--- a/drivers/gpu/drm/i915/gt/intel_gt_buffer_pool.c
+++ b/drivers/gpu/drm/i915/gt/intel_gt_buffer_pool.c
@@ -212,8 +212,8 @@  void intel_gt_flush_buffer_pool(struct intel_gt *gt)
 	struct intel_gt_buffer_pool *pool = &gt->buffer_pool;
-	if (cancel_delayed_work_sync(&pool->work))
-		pool_free_imm(pool);
+	pool_free_imm(pool);
+	cancel_delayed_work_sync(&pool->work);
 void intel_gt_fini_buffer_pool(struct intel_gt *gt)