Commit 84a11c51 authored by Matthew Brost's avatar Matthew Brost
Browse files

drm/xe: Drop force_alloc from xe_bo_evict in selftests 



The force_alloc flag was removed from TTM / Xe but updating the
selftests to new function interfaces was missed. Remove argument from
xe_bo_evict in selftests.

v2:
 - Fix dma-buf, migrate selftests (CI)

Fixes: 55df7c0c ("drm/ttm/xe: drop unused force_alloc flag")
Signed-off-by: default avatarMatthew Brost <matthew.brost@intel.com>
Reviewed-by: default avatarClint Taylor <Clinton.A.Taylor@intel.com>
Link: https://lore.kernel.org/r/20250428022318.877860-1-matthew.brost@intel.com
parent 6ed20625

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

+1 −1
Original line number Diff line number Diff line
@@ -60,7 +60,7 @@ static int ccs_test_migrate(struct xe_tile *tile, struct xe_bo *bo, 
	}



	/* Evict to system. CCS data should be copied. */

	ret = xe_bo_evict(bo, true);

	ret = xe_bo_evict(bo);

	if (ret) {

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

		return ret;

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

+1 −1
Original line number Diff line number Diff line
@@ -65,7 +65,7 @@ static void check_residency(struct kunit *test, struct xe_bo *exported, 
	 * the exporter and the importer should be the same bo.

	 */

	swap(exported->ttm.base.dma_buf, dmabuf);

	ret = xe_bo_evict(exported, true);

	ret = xe_bo_evict(exported);

	swap(exported->ttm.base.dma_buf, dmabuf);

	if (ret) {

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

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

+1 −1
Original line number Diff line number Diff line
@@ -509,7 +509,7 @@ static void test_migrate(struct xe_device *xe, struct xe_tile *tile, 
	dma_fence_put(fence);



	kunit_info(test, "Evict vram buffer object\n");

	ret = xe_bo_evict(vram_bo, true);

	ret = xe_bo_evict(vram_bo);

	if (ret) {

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

		return;