From: Thomas Hellström Date: Wed, 24 May 2023 16:51:42 +0000 (+0000) Subject: drm/xe: Fix the migrate selftest for integrated GPUs X-Git-Tag: v6.8-rc1~111^2~7^2~675 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9922bb40e2ef98c17fb142d22843c0c70ba35e5b;p=thirdparty%2Fkernel%2Flinux.git drm/xe: Fix the migrate selftest for integrated GPUs The TTM resource cursor was set up incorrectly. Signed-off-by: Thomas Hellström Reviewed-by: Matthew Auld Signed-off-by: Rodrigo Vivi --- diff --git a/drivers/gpu/drm/xe/tests/xe_migrate.c b/drivers/gpu/drm/xe/tests/xe_migrate.c index 0f4371ad1fd95..f8ee9b9fca990 100644 --- a/drivers/gpu/drm/xe/tests/xe_migrate.c +++ b/drivers/gpu/drm/xe/tests/xe_migrate.c @@ -303,9 +303,14 @@ static void xe_migrate_sanity_test(struct xe_migrate *m, struct kunit *test) expected = gen8_pte_encode(NULL, pt, 0, XE_CACHE_WB, 0, 0); if (m->eng->vm->flags & XE_VM_FLAGS_64K) expected |= XE_PTE_PS64; - xe_res_first(pt->ttm.resource, 0, pt->size, &src_it); + if (xe_bo_is_vram(pt)) + xe_res_first(pt->ttm.resource, 0, pt->size, &src_it); + else + xe_res_first_sg(xe_bo_get_sg(pt), 0, pt->size, &src_it); + emit_pte(m, bb, NUM_KERNEL_PDE - 1, xe_bo_is_vram(pt), &src_it, XE_PAGE_SIZE, pt); + run_sanity_job(m, xe, bb, bb->len, "Writing PTE for our fake PT", test); retval = xe_map_rd(xe, &bo->vmap, XE_PAGE_SIZE * (NUM_KERNEL_PDE - 1),