diff options
| author | Chris Wilson | 2019-01-25 14:22:28 +0100 |
|---|---|---|
| committer | Chris Wilson | 2019-01-25 15:27:22 +0100 |
| commit | eb8d0f5af4ec2d172baf8b4b9a2199cd916b4e54 (patch) | |
| tree | 28293a5cdfd09863ce764d181c5039cce25b79a2 /drivers/gpu/drm/i915/intel_guc_submission.c | |
| parent | drm/i915/guc: Disable global reset (diff) | |
| download | kernel-qcow2-linux-eb8d0f5af4ec2d172baf8b4b9a2199cd916b4e54.tar.gz kernel-qcow2-linux-eb8d0f5af4ec2d172baf8b4b9a2199cd916b4e54.tar.xz kernel-qcow2-linux-eb8d0f5af4ec2d172baf8b4b9a2199cd916b4e54.zip | |
drm/i915: Remove GPU reset dependence on struct_mutex
Now that the submission backends are controlled via their own spinlocks,
with a wave of a magic wand we can lift the struct_mutex requirement
around GPU reset. That is we allow the submission frontend (userspace)
to keep on submitting while we process the GPU reset as we can suspend
the backend independently.
The major change is around the backoff/handoff strategy for performing
the reset. With no mutex deadlock, we no longer have to coordinate with
any waiter, and just perform the reset immediately.
Testcase: igt/gem_mmap_gtt/hang # regresses
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: Mika Kuoppala <mika.kuoppala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20190125132230.22221-3-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 | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/gpu/drm/i915/intel_guc_submission.c b/drivers/gpu/drm/i915/intel_guc_submission.c index 349ae5844f24..45e2db683fe5 100644 --- a/drivers/gpu/drm/i915/intel_guc_submission.c +++ b/drivers/gpu/drm/i915/intel_guc_submission.c @@ -834,8 +834,7 @@ static void guc_submission_tasklet(unsigned long data) spin_unlock_irqrestore(&engine->timeline.lock, flags); } -static struct i915_request * -guc_reset_prepare(struct intel_engine_cs *engine) +static void guc_reset_prepare(struct intel_engine_cs *engine) { struct intel_engine_execlists * const execlists = &engine->execlists; @@ -861,8 +860,6 @@ guc_reset_prepare(struct intel_engine_cs *engine) */ if (engine->i915->guc.preempt_wq) flush_workqueue(engine->i915->guc.preempt_wq); - - return i915_gem_find_active_request(engine); } /* |