diff options
| author |   Maarten Lankhorst <maarten.lankhorst@linux.intel.com> | 2021-12-16 15:27:42 +0100 |
|---|---|---|
| committer | Maarten Lankhorst <maarten.lankhorst@linux.intel.com> | 2021-12-21 13:27:06 +0100 |
| commit | be7612fd6665f5ef3f6c89e78bb4ec4dbff6cd16 (patch) | |
| tree | 6076f955adf25b3a54b0ba510cefe16947fcb263 | |
| parent | drm/i915: Trylock the object when shrinking (diff) | |
| download | linux-dev-be7612fd6665f5ef3f6c89e78bb4ec4dbff6cd16.tar.xz linux-dev-be7612fd6665f5ef3f6c89e78bb4ec4dbff6cd16.zip | |
drm/i915: Require object lock when freeing pages during destruction
TTM already requires this, and we require it for delayed destroy.
Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Reviewed-by: Matthew Auld <matthew.auld@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20211216142749.1966107-11-maarten.lankhorst@linux.intel.com
| -rw-r--r-- | drivers/gpu/drm/i915/gem/i915_gem_object.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/gem/i915_gem_object.c b/drivers/gpu/drm/i915/gem/i915_gem_object.c index 5fac9b560b73..39cd563544a5 100644 --- a/drivers/gpu/drm/i915/gem/i915_gem_object.c +++ b/drivers/gpu/drm/i915/gem/i915_gem_object.c @@ -262,6 +262,8 @@ static void __i915_gem_object_free_mmaps(struct drm_i915_gem_object *obj) */ void __i915_gem_object_pages_fini(struct drm_i915_gem_object *obj) { + assert_object_held(obj); + if (!list_empty(&obj->vma.list)) { struct i915_vma *vma; @@ -328,7 +330,10 @@ static void __i915_gem_free_objects(struct drm_i915_private *i915, obj->ops->delayed_free(obj); continue; } + + i915_gem_object_lock(obj, NULL); __i915_gem_object_pages_fini(obj); + i915_gem_object_unlock(obj); __i915_gem_free_object(obj); /* But keep the pointer alive for RCU-protected lookups */ |