diff options
| author | Chris Wilson | 2018-07-16 14:54:24 +0200 |
|---|---|---|
| committer | Chris Wilson | 2018-07-16 18:17:27 +0200 |
| commit | 0051163ab3d8090a08ea2ea5edbb738c0920000a (patch) | |
| tree | 122df37cbd35385e48176301ef470aebaacb40da /drivers/gpu/drm/i915/intel_guc_submission.c | |
| parent | drm/i915/execlists: Disable submission tasklet upon wedging (diff) | |
| download | kernel-qcow2-linux-0051163ab3d8090a08ea2ea5edbb738c0920000a.tar.gz kernel-qcow2-linux-0051163ab3d8090a08ea2ea5edbb738c0920000a.tar.xz kernel-qcow2-linux-0051163ab3d8090a08ea2ea5edbb738c0920000a.zip | |
drm/i915/execlists: Always clear preempt status on cancelling all
On reset/wedging, we cancel all pending replies from the HW and we also
want to cancel an outstanding preemption event. Since we use the same
function to cancel the pending replies for reset and for a preemption
event, we can simply clear the active tracking for all.
v2: Keep execlists_user_end() markup for wedging
v3: Move assignment to inline to hide the bare assignment.
Fixes: 60a943245413 ("drm/i915/execlists: Drop clear_gtiir() on GPU reset")
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20180716125424.5715-1-chris@chris-wilson.co.uk
Diffstat (limited to 'drivers/gpu/drm/i915/intel_guc_submission.c')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_guc_submission.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/gpu/drm/i915/intel_guc_submission.c b/drivers/gpu/drm/i915/intel_guc_submission.c index cc444dc5f3ad..94d0674ea3c6 100644 --- a/drivers/gpu/drm/i915/intel_guc_submission.c +++ b/drivers/gpu/drm/i915/intel_guc_submission.c @@ -633,8 +633,6 @@ static void complete_preempt_context(struct intel_engine_cs *engine) wait_for_guc_preempt_report(engine); intel_write_status_page(engine, I915_GEM_HWS_PREEMPT_INDEX, 0); - - execlists_clear_active(execlists, EXECLISTS_ACTIVE_PREEMPT); } /** |