diff options
| author | Chris Wilson | 2016-11-14 21:40:57 +0100 |
|---|---|---|
| committer | Chris Wilson | 2016-11-14 22:00:21 +0100 |
| commit | bb89485e999181a329cafa8e798b6bbf10c1a52a (patch) | |
| tree | 360f0842dd62e56606951724984a487197cfe68b /drivers/gpu/drm/i915/i915_gem_request.c | |
| parent | drm/i915: Give each sw_fence its own lockclass (diff) | |
| download | kernel-qcow2-linux-bb89485e999181a329cafa8e798b6bbf10c1a52a.tar.gz kernel-qcow2-linux-bb89485e999181a329cafa8e798b6bbf10c1a52a.tar.xz kernel-qcow2-linux-bb89485e999181a329cafa8e798b6bbf10c1a52a.zip | |
drm/i915: Create distinct lockclasses for execution vs user timelines
In order to simplify the lockdep annotation, as they become more complex
in the future with deferred execution and multiple paths through the
same functions, create a separate lockclass for the user timeline and
the hardware execution timeline.
We should only ever be locking the user timeline and the execution
timeline in parallel so we only need to create two lock classes, rather
than a separate class for every timeline.
v2: Rename the lock classes to be more consistent with other lockdep.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/20161114204105.29171-2-chris@chris-wilson.co.uk
Diffstat (limited to 'drivers/gpu/drm/i915/i915_gem_request.c')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_gem_request.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/i915_gem_request.c b/drivers/gpu/drm/i915/i915_gem_request.c index 5050464c5401..f25b537d6e64 100644 --- a/drivers/gpu/drm/i915/i915_gem_request.c +++ b/drivers/gpu/drm/i915/i915_gem_request.c @@ -346,7 +346,7 @@ submit_notify(struct i915_sw_fence *fence, enum i915_sw_fence_notify state) request->ring->vaddr + request->postfix); engine->submit_request(request); - spin_lock_nested(&request->timeline->lock, SINGLE_DEPTH_NESTING); + spin_lock(&request->timeline->lock); list_move_tail(&request->link, &timeline->requests); spin_unlock(&request->timeline->lock); |