Commit 44963bf9 authored by Chris Wilson's avatar Chris Wilson

drm/i915/gt: Tidy up checking active timelines during retirement

Use the status of the timeline request list as we retire it to determine
if the timeline is still active.
Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Cc: Andi Shyti <andi.shyti@intel.com>
Acked-by: default avatarAndi Shyti <andi.shyti@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20191223150833.2329366-1-chris@chris-wilson.co.uk
parent 8c4bba5a
...@@ -14,13 +14,16 @@ ...@@ -14,13 +14,16 @@
#include "intel_gt_requests.h" #include "intel_gt_requests.h"
#include "intel_timeline.h" #include "intel_timeline.h"
static void retire_requests(struct intel_timeline *tl) static bool retire_requests(struct intel_timeline *tl)
{ {
struct i915_request *rq, *rn; struct i915_request *rq, *rn;
list_for_each_entry_safe(rq, rn, &tl->requests, link) list_for_each_entry_safe(rq, rn, &tl->requests, link)
if (!i915_request_retire(rq)) if (!i915_request_retire(rq))
break; return false;
/* And check nothing new was submitted */
return !i915_active_fence_isset(&tl->last_request);
} }
static bool flush_submission(struct intel_gt *gt) static bool flush_submission(struct intel_gt *gt)
...@@ -29,6 +32,9 @@ static bool flush_submission(struct intel_gt *gt) ...@@ -29,6 +32,9 @@ static bool flush_submission(struct intel_gt *gt)
enum intel_engine_id id; enum intel_engine_id id;
bool active = false; bool active = false;
if (!intel_gt_pm_is_awake(gt))
return false;
for_each_engine(engine, gt, id) { for_each_engine(engine, gt, id) {
active |= intel_engine_flush_submission(engine); active |= intel_engine_flush_submission(engine);
active |= flush_work(&engine->retire_work); active |= flush_work(&engine->retire_work);
...@@ -145,7 +151,7 @@ long intel_gt_retire_requests_timeout(struct intel_gt *gt, long timeout) ...@@ -145,7 +151,7 @@ long intel_gt_retire_requests_timeout(struct intel_gt *gt, long timeout)
} }
} }
retire_requests(tl); active_count += !retire_requests(tl);
spin_lock(&timelines->lock); spin_lock(&timelines->lock);
...@@ -153,8 +159,6 @@ long intel_gt_retire_requests_timeout(struct intel_gt *gt, long timeout) ...@@ -153,8 +159,6 @@ long intel_gt_retire_requests_timeout(struct intel_gt *gt, long timeout)
list_safe_reset_next(tl, tn, link); list_safe_reset_next(tl, tn, link);
if (atomic_dec_and_test(&tl->active_count)) if (atomic_dec_and_test(&tl->active_count))
list_del(&tl->link); list_del(&tl->link);
else
active_count += i915_active_fence_isset(&tl->last_request);
mutex_unlock(&tl->mutex); mutex_unlock(&tl->mutex);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment