Skip to content

Commit be7612f

Browse files
committed
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
1 parent 2c3849b commit be7612f

1 file changed

Lines changed: 5 additions & 0 deletions

File tree

drivers/gpu/drm/i915/gem/i915_gem_object.c

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -262,6 +262,8 @@ static void __i915_gem_object_free_mmaps(struct drm_i915_gem_object *obj)
262262
*/
263263
void __i915_gem_object_pages_fini(struct drm_i915_gem_object *obj)
264264
{
265+
assert_object_held(obj);
266+
265267
if (!list_empty(&obj->vma.list)) {
266268
struct i915_vma *vma;
267269

@@ -328,7 +330,10 @@ static void __i915_gem_free_objects(struct drm_i915_private *i915,
328330
obj->ops->delayed_free(obj);
329331
continue;
330332
}
333+
334+
i915_gem_object_lock(obj, NULL);
331335
__i915_gem_object_pages_fini(obj);
336+
i915_gem_object_unlock(obj);
332337
__i915_gem_free_object(obj);
333338

334339
/* But keep the pointer alive for RCU-protected lookups */

0 commit comments

Comments
 (0)