niansa-misc/linux
1
0
Fork 0
mirror of synced 2025-03-06 20:59:54 +01:00
Code Issues Projects Releases Packages Wiki Activity

drm/i915: Require object lock when freeing pages during destruction

Browse source 
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
This commit is contained in:
Maarten Lankhorst 2021-12-16 15:27:42 +01:00
parent 2c3849baf2
commit be7612fd66
1 changed files with 5 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
drivers/gpu/drm/i915/gem/i915_gem_object.c
View file

@ -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) void __i915_gem_object_pages_fini(struct drm_i915_gem_object *obj)
{ {
assert_object_held(obj);
if (!list_empty(&obj->vma.list)) { if (!list_empty(&obj->vma.list)) {
struct i915_vma *vma; struct i915_vma *vma;
@ -328,7 +330,10 @@ static void __i915_gem_free_objects(struct drm_i915_private *i915,
obj->ops->delayed_free(obj); obj->ops->delayed_free(obj);
continue; continue;
} }
i915_gem_object_lock(obj, NULL);
__i915_gem_object_pages_fini(obj); __i915_gem_object_pages_fini(obj);
i915_gem_object_unlock(obj);
__i915_gem_free_object(obj); __i915_gem_free_object(obj);
/* But keep the pointer alive for RCU-protected lookups */ /* But keep the pointer alive for RCU-protected lookups */