diff options
author | Chris Wilson <chris@chris-wilson.co.uk> | 2018-07-11 08:36:02 +0100 |
---|---|---|
committer | Chris Wilson <chris@chris-wilson.co.uk> | 2018-07-11 13:56:16 +0100 |
commit | 19bb33c756edee5e3f0fb126895f6ec23e60dd08 (patch) | |
tree | be49d2cc2a5e0b875feff52382b5555643a7b462 /drivers/gpu/drm/i915/i915_gem_gtt.h | |
parent | 185441e03aa9dde9fb99e6a015441fc9b312d2ef (diff) | |
download | linux-stable-19bb33c756edee5e3f0fb126895f6ec23e60dd08.tar.gz linux-stable-19bb33c756edee5e3f0fb126895f6ec23e60dd08.tar.bz2 linux-stable-19bb33c756edee5e3f0fb126895f6ec23e60dd08.zip |
drm/i915: Introduce i915_address_space.mutex
Add a mutex into struct i915_address_space to be used while operating on
the vma and their lists for a particular vm. As this may be called from
the shrinker, we taint the mutex with fs_reclaim so that from the start
lockdep warns us if we are caught holding the mutex across an
allocation. (With such small steps we will eventually rid ourselves of
struct_mutex recursion!)
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Link: https://patchwork.freedesktop.org/patch/msgid/20180711073608.20286-2-chris@chris-wilson.co.uk
Diffstat (limited to 'drivers/gpu/drm/i915/i915_gem_gtt.h')
-rw-r--r-- | drivers/gpu/drm/i915/i915_gem_gtt.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/i915_gem_gtt.h b/drivers/gpu/drm/i915/i915_gem_gtt.h index feda45dfd481..14e62651010b 100644 --- a/drivers/gpu/drm/i915/i915_gem_gtt.h +++ b/drivers/gpu/drm/i915/i915_gem_gtt.h @@ -293,6 +293,8 @@ struct i915_address_space { bool closed; + struct mutex mutex; /* protects vma and our lists */ + struct i915_page_dma scratch_page; struct i915_page_table *scratch_pt; struct i915_page_directory *scratch_pd; |