Commit 6b77dab5 authored by Nirmoy Das's avatar Nirmoy Das
Browse files

drm/xe: Remove redundant param from xe_bo_create_user 



BO from xe_bo_create_user() will always be of type,
ttm_bo_type_device. So remove that redundant parameter.

Cc: Matthew Auld <matthew.auld@intel.com>
Cc: Matthew Brost <matthew.brost@intel.com>
Cc: Thomas Hellström <thomas.hellstrom@linux.intel.com>
Reviewed-by: default avatarMatthew Brost <matthew.brost@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20240816102248.25628-1-nirmoy.das@intel.com


Signed-off-by: default avatarNirmoy Das <nirmoy.das@intel.com>
parent 4099cfda

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

+2 −3
Original line number Diff line number Diff line
@@ -125,7 +125,7 @@ static void ccs_test_run_tile(struct xe_device *xe, struct xe_tile *tile, 
		kunit_info(test, "Testing system memory\n");



	bo = xe_bo_create_user(xe, NULL, NULL, SZ_1M, DRM_XE_GEM_CPU_CACHING_WC,

			       ttm_bo_type_device, bo_flags);

			       bo_flags);

	if (IS_ERR(bo)) {

		KUNIT_FAIL(test, "Failed to create bo.\n");

		return;
@@ -206,7 +206,6 @@ static int evict_test_run_tile(struct xe_device *xe, struct xe_tile *tile, struc 
		xe_vm_lock(vm, false);

		bo = xe_bo_create_user(xe, NULL, vm, 0x10000,

				       DRM_XE_GEM_CPU_CACHING_WC,

				       ttm_bo_type_device,

				       bo_flags);

		xe_vm_unlock(vm);

		if (IS_ERR(bo)) {
@@ -216,7 +215,7 @@ static int evict_test_run_tile(struct xe_device *xe, struct xe_tile *tile, struc 


		external = xe_bo_create_user(xe, NULL, NULL, 0x10000,

					     DRM_XE_GEM_CPU_CACHING_WC,

					     ttm_bo_type_device, bo_flags);

					     bo_flags);

		if (IS_ERR(external)) {

			KUNIT_FAIL(test, "external bo create err=%pe\n", external);

			goto cleanup_bo;

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

+1 −1
Original line number Diff line number Diff line
@@ -126,7 +126,7 @@ static void xe_test_dmabuf_import_same_driver(struct xe_device *xe) 


	kunit_info(test, "running %s\n", __func__);

	bo = xe_bo_create_user(xe, NULL, NULL, size, DRM_XE_GEM_CPU_CACHING_WC,

			       ttm_bo_type_device, params->mem_mask);

			       params->mem_mask);

	if (IS_ERR(bo)) {

		KUNIT_FAIL(test, "xe_bo_create() failed with err=%ld\n",

			   PTR_ERR(bo));

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

+7 −5
Original line number Diff line number Diff line
@@ -641,7 +641,7 @@ static void validate_ccs_test_run_tile(struct xe_device *xe, struct xe_tile *til 
	long ret;



	sys_bo = xe_bo_create_user(xe, NULL, NULL, SZ_4M,

				   DRM_XE_GEM_CPU_CACHING_WC, ttm_bo_type_device,

				   DRM_XE_GEM_CPU_CACHING_WC,

				   XE_BO_FLAG_SYSTEM | XE_BO_FLAG_NEEDS_CPU_ACCESS);



	if (IS_ERR(sys_bo)) {
@@ -664,8 +664,9 @@ static void validate_ccs_test_run_tile(struct xe_device *xe, struct xe_tile *til 
	}

	xe_bo_unlock(sys_bo);



	ccs_bo = xe_bo_create_user(xe, NULL, NULL, SZ_4M, DRM_XE_GEM_CPU_CACHING_WC,

				   ttm_bo_type_device, bo_flags | XE_BO_FLAG_NEEDS_CPU_ACCESS);

	ccs_bo = xe_bo_create_user(xe, NULL, NULL, SZ_4M,

				   DRM_XE_GEM_CPU_CACHING_WC,

				   bo_flags | XE_BO_FLAG_NEEDS_CPU_ACCESS);



	if (IS_ERR(ccs_bo)) {

		KUNIT_FAIL(test, "xe_bo_create() failed with err=%ld\n",
@@ -687,8 +688,9 @@ static void validate_ccs_test_run_tile(struct xe_device *xe, struct xe_tile *til 
	}

	xe_bo_unlock(ccs_bo);



	vram_bo = xe_bo_create_user(xe, NULL, NULL, SZ_4M, DRM_XE_GEM_CPU_CACHING_WC,

				    ttm_bo_type_device, bo_flags | XE_BO_FLAG_NEEDS_CPU_ACCESS);

	vram_bo = xe_bo_create_user(xe, NULL, NULL, SZ_4M,

				    DRM_XE_GEM_CPU_CACHING_WC,

				    bo_flags | XE_BO_FLAG_NEEDS_CPU_ACCESS);

	if (IS_ERR(vram_bo)) {

		KUNIT_FAIL(test, "xe_bo_create() failed with err=%ld\n",

			   PTR_ERR(vram_bo));

drivers/gpu/drm/xe/xe_bo.c

+2 −4
Original line number Diff line number Diff line
@@ -1499,11 +1499,10 @@ struct xe_bo *xe_bo_create_locked(struct xe_device *xe, struct xe_tile *tile, 
struct xe_bo *xe_bo_create_user(struct xe_device *xe, struct xe_tile *tile,

				struct xe_vm *vm, size_t size,

				u16 cpu_caching,

				enum ttm_bo_type type,

				u32 flags)

{

	struct xe_bo *bo = __xe_bo_create_locked(xe, tile, vm, size, 0, ~0ULL,

						 cpu_caching, type,

						 cpu_caching, ttm_bo_type_device,

						 flags | XE_BO_FLAG_USER);

	if (!IS_ERR(bo))

		xe_bo_unlock_vm_held(bo);
@@ -2027,7 +2026,7 @@ int xe_gem_create_ioctl(struct drm_device *dev, void *data, 
	}



	bo = xe_bo_create_user(xe, NULL, vm, args->size, args->cpu_caching,

			       ttm_bo_type_device, bo_flags);

			       bo_flags);



	if (vm)

		xe_vm_unlock(vm);
@@ -2333,7 +2332,6 @@ int xe_bo_dumb_create(struct drm_file *file_priv, 


	bo = xe_bo_create_user(xe, NULL, NULL, args->size,

			       DRM_XE_GEM_CPU_CACHING_WC,

			       ttm_bo_type_device,

			       XE_BO_FLAG_VRAM_IF_DGFX(xe_device_get_root_tile(xe)) |

			       XE_BO_FLAG_SCANOUT |

			       XE_BO_FLAG_NEEDS_CPU_ACCESS);

drivers/gpu/drm/xe/xe_bo.h

+0 −1
Original line number Diff line number Diff line
@@ -87,7 +87,6 @@ struct xe_bo *xe_bo_create(struct xe_device *xe, struct xe_tile *tile, 
struct xe_bo *xe_bo_create_user(struct xe_device *xe, struct xe_tile *tile,

				struct xe_vm *vm, size_t size,

				u16 cpu_caching,

				enum ttm_bo_type type,

				u32 flags);

struct xe_bo *xe_bo_create_pin_map(struct xe_device *xe, struct xe_tile *tile,

				   struct xe_vm *vm, size_t size,