diff options
| author | Chris Wilson | 2019-04-03 10:21:32 +0200 |
|---|---|---|
| committer | Chris Wilson | 2019-04-05 11:39:17 +0200 |
| commit | b66ea2c2cf59b80c38a14127fafb49fdf0df9180 (patch) | |
| tree | bbb483368908e89aab28cf84b74870650e3ca0b8 /drivers/gpu/drm/i915/i915_request.h | |
| parent | drm/i915: add Makefile magic for testing headers are self-contained (diff) | |
| download | kernel-qcow2-linux-b66ea2c2cf59b80c38a14127fafb49fdf0df9180.tar.gz kernel-qcow2-linux-b66ea2c2cf59b80c38a14127fafb49fdf0df9180.tar.xz kernel-qcow2-linux-b66ea2c2cf59b80c38a14127fafb49fdf0df9180.zip | |
drm/i915: Use lockdep_pin_lock() over the construction of the request
During request construction, we take the timeline->mutex to ensure
exclusive access to the ringbuffer (for command emission) and the
timeline itself (for command ordering). The timeline->mutex should not
be dropped by callers until we release it in i915_request_add().
lockdep provides a pin/unpin lock facility to detect accidental unlocks
inside critical sections, so put it to use for request construction.
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/20190403082132.327-1-chris@chris-wilson.co.uk
Diffstat (limited to 'drivers/gpu/drm/i915/i915_request.h')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_request.h | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/i915_request.h b/drivers/gpu/drm/i915/i915_request.h index cd6c130964cd..875be6f71412 100644 --- a/drivers/gpu/drm/i915/i915_request.h +++ b/drivers/gpu/drm/i915/i915_request.h @@ -26,6 +26,7 @@ #define I915_REQUEST_H #include <linux/dma-fence.h> +#include <linux/lockdep.h> #include "i915_gem.h" #include "i915_scheduler.h" @@ -121,6 +122,15 @@ struct i915_request { unsigned long rcustate; /* + * We pin the timeline->mutex while constructing the request to + * ensure that no caller accidentally drops it during construction. + * The timeline->mutex must be held to ensure that only this caller + * can use the ring and manipulate the associated timeline during + * construction. + */ + struct pin_cookie cookie; + + /* * Fences for the various phases in the request's lifetime. * * The submit fence is used to await upon all of the request's |