Commit b7ab8c4f authored by Thomas Hellström's avatar Thomas Hellström Committed by Rodrigo Vivi
Browse files

drm/xe/bo: Remove the lock_no_vm()/unlock_no_vm() interface 



Apart from asserts, it's essentially the same as
xe_bo_lock()/xe_bo_unlock(), and the usage intentions of this interface
was unclear. Remove it.

v2:
- Update the xe_display subsystem as well.

Signed-off-by: default avatarThomas Hellström <thomas.hellstrom@linux.intel.com>
Reviewed-by: default avatarMatthew Brost <matthew.brost@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20230908091716.36984-4-thomas.hellstrom@linux.intel.com


Signed-off-by: default avatarRodrigo Vivi <rodrigo.vivi@intel.com>
parent d00e9cc2

drivers/gpu/drm/xe/tests/xe_bo.c

+1 −1
Original line number Diff line number Diff line
@@ -143,7 +143,7 @@ static void ccs_test_run_gt(struct xe_device *xe, struct xe_gt *gt, 
	ret = ccs_test_migrate(gt, bo, true, 0ULL, 0ULL, test);



out_unlock:

	xe_bo_unlock_no_vm(bo);

	xe_bo_unlock(bo);

	xe_bo_put(bo);

}

drivers/gpu/drm/xe/tests/xe_dma_buf.c

+2 −2
Original line number Diff line number Diff line
@@ -147,14 +147,14 @@ static void xe_test_dmabuf_import_same_driver(struct xe_device *xe) 
			int err;



			/* Is everything where we expect it to be? */

			xe_bo_lock_no_vm(import_bo, NULL);

			xe_bo_lock(import_bo, false);

			err = xe_bo_validate(import_bo, NULL, false);

			if (err && err != -EINTR && err != -ERESTARTSYS)

				KUNIT_FAIL(test,

					   "xe_bo_validate() failed with err=%d\n", err);



			check_residency(test, bo, import_bo, dmabuf);

			xe_bo_unlock_no_vm(import_bo);

			xe_bo_unlock(import_bo);

		}

		drm_gem_object_put(import);

	} else if (PTR_ERR(import) != -EOPNOTSUPP) {

drivers/gpu/drm/xe/tests/xe_migrate.c

+1 −1
Original line number Diff line number Diff line
@@ -183,7 +183,7 @@ static void test_copy(struct xe_migrate *m, struct xe_bo *bo, 


	xe_bo_vunmap(sysmem);

out_unlock:

	xe_bo_unlock_no_vm(sysmem);

	xe_bo_unlock(sysmem);

	xe_bo_put(sysmem);

}

drivers/gpu/drm/xe/xe_bo.h

+2 −21
Original line number Diff line number Diff line
@@ -173,25 +173,6 @@ static inline void xe_bo_unlock_vm_held(struct xe_bo *bo) 
	}

}



static inline void xe_bo_lock_no_vm(struct xe_bo *bo,

				    struct ww_acquire_ctx *ctx)

{

	if (bo) {

		XE_WARN_ON(bo->vm || (bo->ttm.type != ttm_bo_type_sg &&

				      bo->ttm.base.resv != &bo->ttm.base._resv));

		dma_resv_lock(bo->ttm.base.resv, ctx);

	}

}



static inline void xe_bo_unlock_no_vm(struct xe_bo *bo)

{

	if (bo) {

		XE_WARN_ON(bo->vm || (bo->ttm.type != ttm_bo_type_sg &&

				      bo->ttm.base.resv != &bo->ttm.base._resv));

		dma_resv_unlock(bo->ttm.base.resv);

	}

}



int xe_bo_pin_external(struct xe_bo *bo);

int xe_bo_pin(struct xe_bo *bo);

void xe_bo_unpin_external(struct xe_bo *bo);
@@ -206,9 +187,9 @@ static inline bool xe_bo_is_pinned(struct xe_bo *bo) 
static inline void xe_bo_unpin_map_no_vm(struct xe_bo *bo)

{

	if (likely(bo)) {

		xe_bo_lock_no_vm(bo, NULL);

		xe_bo_lock(bo, false);

		xe_bo_unpin(bo);

		xe_bo_unlock_no_vm(bo);

		xe_bo_unlock(bo);



		xe_bo_put(bo);

	}

drivers/gpu/drm/xe/xe_dma_buf.c

+3 −2
Original line number Diff line number Diff line
@@ -150,9 +150,10 @@ static int xe_dma_buf_begin_cpu_access(struct dma_buf *dma_buf, 
	if (!reads)

		return 0;



	xe_bo_lock_no_vm(bo, NULL);

	/* Can we do interruptible lock here? */

	xe_bo_lock(bo, false);

	(void)xe_bo_migrate(bo, XE_PL_TT);

	xe_bo_unlock_no_vm(bo);

	xe_bo_unlock(bo);



	return 0;

}