Commit cf41a8f1 authored by Maarten Lankhorst's avatar Maarten Lankhorst Committed by Daniel Vetter
Browse files

drm/i915: Finally remove obj->mm.lock. 



With all callers and selftests fixed to use ww locking, we can now
finally remove this lock.

Signed-off-by: default avatarMaarten Lankhorst <maarten.lankhorst@linux.intel.com>
Reviewed-by: default avatarThomas Hellström <thomas.hellstrom@linux.intel.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Link: https://patchwork.freedesktop.org/patch/msgid/20210323155059.628690-62-maarten.lankhorst@linux.intel.com
parent 480ae795

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

+0 −2
Original line number Diff line number Diff line
@@ -62,8 +62,6 @@ void i915_gem_object_init(struct drm_i915_gem_object *obj, 
			  const struct drm_i915_gem_object_ops *ops,

			  struct lock_class_key *key, unsigned flags)

{

	mutex_init(&obj->mm.lock);



	spin_lock_init(&obj->vma.lock);

	INIT_LIST_HEAD(&obj->vma.list);

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

+2 −3
Original line number Diff line number Diff line
@@ -129,7 +129,7 @@ static inline void assert_object_held_shared(struct drm_i915_gem_object *obj) 
	 */

	if (IS_ENABLED(CONFIG_LOCKDEP) &&

	    kref_read(&obj->base.refcount) > 0)

		lockdep_assert_held(&obj->mm.lock);

		assert_object_held(obj);

}



static inline int __i915_gem_object_lock(struct drm_i915_gem_object *obj,
@@ -358,7 +358,7 @@ int __i915_gem_object_get_pages(struct drm_i915_gem_object *obj); 
static inline int __must_check

i915_gem_object_pin_pages(struct drm_i915_gem_object *obj)

{

	might_lock(&obj->mm.lock);

	assert_object_held(obj);



	if (atomic_inc_not_zero(&obj->mm.pages_pin_count))

		return 0;
@@ -404,7 +404,6 @@ i915_gem_object_unpin_pages(struct drm_i915_gem_object *obj) 
}



int __i915_gem_object_put_pages(struct drm_i915_gem_object *obj);

int __i915_gem_object_put_pages_locked(struct drm_i915_gem_object *obj);

void i915_gem_object_truncate(struct drm_i915_gem_object *obj);

void i915_gem_object_writeback(struct drm_i915_gem_object *obj);

drivers/gpu/drm/i915/gem/i915_gem_object_types.h

+0 −1
Original line number Diff line number Diff line
@@ -216,7 +216,6 @@ struct drm_i915_gem_object { 
		 * Protects the pages and their use. Do not use directly, but

		 * instead go through the pin/unpin interfaces.

		 */

		struct mutex lock;

		atomic_t pages_pin_count;

		atomic_t shrink_pin;

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

+9 −34
Original line number Diff line number Diff line
@@ -70,7 +70,7 @@ void __i915_gem_object_set_pages(struct drm_i915_gem_object *obj, 
		struct list_head *list;

		unsigned long flags;



		lockdep_assert_held(&obj->mm.lock);

		assert_object_held(obj);

		spin_lock_irqsave(&i915->mm.obj_lock, flags);



		i915->mm.shrink_count++;
@@ -117,9 +117,7 @@ int __i915_gem_object_get_pages(struct drm_i915_gem_object *obj) 
{

	int err;



	err = mutex_lock_interruptible(&obj->mm.lock);

	if (err)

		return err;

	assert_object_held(obj);



	assert_object_held_shared(obj);
@@ -128,15 +126,13 @@ int __i915_gem_object_get_pages(struct drm_i915_gem_object *obj) 


		err = ____i915_gem_object_get_pages(obj);

		if (err)

			goto unlock;

			return err;



		smp_mb__before_atomic();

	}

	atomic_inc(&obj->mm.pages_pin_count);



unlock:

	mutex_unlock(&obj->mm.lock);

	return err;

	return 0;

}



int i915_gem_object_pin_pages_unlocked(struct drm_i915_gem_object *obj)
@@ -223,7 +219,7 @@ __i915_gem_object_unset_pages(struct drm_i915_gem_object *obj) 
	return pages;

}



int __i915_gem_object_put_pages_locked(struct drm_i915_gem_object *obj)

int __i915_gem_object_put_pages(struct drm_i915_gem_object *obj)

{

	struct sg_table *pages;
@@ -254,21 +250,6 @@ int __i915_gem_object_put_pages_locked(struct drm_i915_gem_object *obj) 
	return 0;

}



int __i915_gem_object_put_pages(struct drm_i915_gem_object *obj)

{

	int err;



	if (i915_gem_object_has_pinned_pages(obj))

		return -EBUSY;



	/* May be called by shrinker from within get_pages() (on another bo) */

	mutex_lock(&obj->mm.lock);

	err = __i915_gem_object_put_pages_locked(obj);

	mutex_unlock(&obj->mm.lock);



	return err;

}



/* The 'mapping' part of i915_gem_object_pin_map() below */

static void *i915_gem_object_map_page(struct drm_i915_gem_object *obj,

				      enum i915_map_type type)
@@ -371,9 +352,7 @@ void *i915_gem_object_pin_map(struct drm_i915_gem_object *obj, 
	    !i915_gem_object_type_has(obj, I915_GEM_OBJECT_HAS_IOMEM))

		return ERR_PTR(-ENXIO);



	err = mutex_lock_interruptible(&obj->mm.lock);

	if (err)

		return ERR_PTR(err);

	assert_object_held(obj);



	pinned = !(type & I915_MAP_OVERRIDE);

	type &= ~I915_MAP_OVERRIDE;
@@ -383,10 +362,8 @@ void *i915_gem_object_pin_map(struct drm_i915_gem_object *obj, 
			GEM_BUG_ON(i915_gem_object_has_pinned_pages(obj));



			err = ____i915_gem_object_get_pages(obj);

			if (err) {

				ptr = ERR_PTR(err);

				goto out_unlock;

			}

			if (err)

				return ERR_PTR(err);



			smp_mb__before_atomic();

		}
@@ -421,13 +398,11 @@ void *i915_gem_object_pin_map(struct drm_i915_gem_object *obj, 
		obj->mm.mapping = page_pack_bits(ptr, type);

	}



out_unlock:

	mutex_unlock(&obj->mm.lock);

	return ptr;



err_unpin:

	atomic_dec(&obj->mm.pages_pin_count);

	goto out_unlock;

	return ptr;

}



void *i915_gem_object_pin_map_unlocked(struct drm_i915_gem_object *obj,

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

+8 −26
Original line number Diff line number Diff line
@@ -234,40 +234,22 @@ int i915_gem_object_attach_phys(struct drm_i915_gem_object *obj, int align) 
	if (err)

		return err;



	err = mutex_lock_interruptible(&obj->mm.lock);

	if (err)

		return err;



	if (unlikely(!i915_gem_object_has_struct_page(obj)))

		goto out;



	if (obj->mm.madv != I915_MADV_WILLNEED) {

		err = -EFAULT;

		goto out;

	}

	if (obj->mm.madv != I915_MADV_WILLNEED)

		return -EFAULT;



	if (i915_gem_object_has_tiling_quirk(obj)) {

		err = -EFAULT;

		goto out;

	}

	if (i915_gem_object_has_tiling_quirk(obj))

		return -EFAULT;



	if (obj->mm.mapping || i915_gem_object_has_pinned_pages(obj)) {

		err = -EBUSY;

		goto out;

	}

	if (obj->mm.mapping || i915_gem_object_has_pinned_pages(obj))

		return -EBUSY;



	if (unlikely(obj->mm.madv != I915_MADV_WILLNEED)) {

		drm_dbg(obj->base.dev,

			"Attempting to obtain a purgeable object\n");

		err = -EFAULT;

		goto out;

		return -EFAULT;

	}



	err = i915_gem_object_shmem_to_phys(obj);



out:

	mutex_unlock(&obj->mm.lock);

	return err;

	return i915_gem_object_shmem_to_phys(obj);

}



#if IS_ENABLED(CONFIG_DRM_I915_SELFTEST)