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

drm/i915/selftests: Prepare mman testcases for obj->mm.lock removal. 



Ensure we hold the lock around put_pages, and use the unlocked wrappers
for pinning pages and mappings.

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-48-maarten.lankhorst@linux.intel.com
parent 1832f886

drivers/gpu/drm/i915/gem/selftests/i915_gem_mman.c

+6 −4
Original line number Diff line number Diff line
@@ -322,7 +322,7 @@ static int igt_partial_tiling(void *arg) 
	if (IS_ERR(obj))

		return PTR_ERR(obj);



	err = i915_gem_object_pin_pages(obj);

	err = i915_gem_object_pin_pages_unlocked(obj);

	if (err) {

		pr_err("Failed to allocate %u pages (%lu total), err=%d\n",

		       nreal, obj->base.size / PAGE_SIZE, err);
@@ -459,7 +459,7 @@ static int igt_smoke_tiling(void *arg) 
	if (IS_ERR(obj))

		return PTR_ERR(obj);



	err = i915_gem_object_pin_pages(obj);

	err = i915_gem_object_pin_pages_unlocked(obj);

	if (err) {

		pr_err("Failed to allocate %u pages (%lu total), err=%d\n",

		       nreal, obj->base.size / PAGE_SIZE, err);
@@ -798,7 +798,7 @@ static int wc_set(struct drm_i915_gem_object *obj) 
{

	void *vaddr;



	vaddr = i915_gem_object_pin_map(obj, I915_MAP_WC);

	vaddr = i915_gem_object_pin_map_unlocked(obj, I915_MAP_WC);

	if (IS_ERR(vaddr))

		return PTR_ERR(vaddr);
@@ -814,7 +814,7 @@ static int wc_check(struct drm_i915_gem_object *obj) 
	void *vaddr;

	int err = 0;



	vaddr = i915_gem_object_pin_map(obj, I915_MAP_WC);

	vaddr = i915_gem_object_pin_map_unlocked(obj, I915_MAP_WC);

	if (IS_ERR(vaddr))

		return PTR_ERR(vaddr);
@@ -1316,7 +1316,9 @@ static int __igt_mmap_revoke(struct drm_i915_private *i915, 
	}



	if (type != I915_MMAP_TYPE_GTT) {

		i915_gem_object_lock(obj, NULL);

		__i915_gem_object_put_pages(obj);

		i915_gem_object_unlock(obj);

		if (i915_gem_object_has_pages(obj)) {

			pr_err("Failed to put-pages object!\n");

			err = -EINVAL;