From cdd280b1b9b15217b404276b3e703e2764cad8c3 Mon Sep 17 00:00:00 2001 From: Chris Wilson Date: Thu, 2 Jan 2020 23:16:04 +0000 Subject: drm/i915/gt: Flush ongoing retires during wait_for_idle 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 Acked-by: Andi Shyti Link: https://patchwork.freedesktop.org/patch/msgid/20200102231604.1669010-1-chris@chris-wilson.co.uk --- drivers/gpu/drm/i915/gt/intel_gt_requests.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) (limited to 'drivers/gpu/drm/i915/gt/intel_gt_requests.c') diff --git a/drivers/gpu/drm/i915/gt/intel_gt_requests.c b/drivers/gpu/drm/i915/gt/intel_gt_requests.c index fc691c130ba6..7ef1d37970f6 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 */ -- cgit v1.2.3-59-g8ed1b