Skip to contentSkip to conversation

drm/xe: Drop force_alloc from xe_bo_evict in selftests

PATCH Superseded Matthew Brost 3 participants 5 messages Apr 28, 2025

Subsystems (2)

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore

Matthew Brost

author maintainer
#0 lore raw

PATCH 1/1 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.

Fixes 55df7c0c62c1 ("drm/ttm/xe: drop unused force_alloc flag")
---
 drivers/gpu/drm/xe/tests/xe_bo.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/xe/tests/xe_bo.c +1 -1
index 230eb824550f..378dcd0fb414 100644
@@ -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;
Signature · 1 line
2.34.1
#1 lore raw

✓ CI.Patch_applied: success for drm/xe: Drop force_alloc from xe_bo_evict in selftests

== Series Details ==

== Series Details ==

Series: drm/xe: Drop force_alloc from xe_bo_evict in selftests
URL : https://patchwork.freedesktop.org/series/148326/
State : success

== Summary ==

=== Applying kernel patches on branch 'drm-tip' with base: ===
Base commit: f05adacde2fa drm-tip: 2025y-04m-27d-23h-47m-23s UTC integration manifest === git am output follows ===
Applying: drm/xe: Drop force_alloc from xe_bo_evict in selftests

#2 lore raw

✓ CI.checkpatch: success for drm/xe: Drop force_alloc from xe_bo_evict in selftests

In reply to Matthew Brost
== Series Details ==

== Series Details ==

Series: drm/xe: Drop force_alloc from xe_bo_evict in selftests
URL : https://patchwork.freedesktop.org/series/148326/
State : success

== Summary ==

+ KERNEL=/kernel
+ git clone https://gitlab.freedesktop.org/drm/maintainer-tools mt Cloning into 'mt'...
warning: redirecting to https://gitlab.freedesktop.org/drm/maintainer-tools.git/
+ git -C mt rev-list -n1 origin/master 202708c00696422fd217223bb679a353a5936e23
+ cd /kernel
+ git config --global --add safe.directory /kernel
+ git log -n1
commit 2a9c10668956ffc48f8bdfa9fd09c1b7de0fb0df

Author: Matthew Brost <[email protected]>
Date:   Sun Apr 27 18:33:43 2025 -0700

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.

Fixes 55df7c0c62c1 ("drm/ttm/xe: drop unused force_alloc flag")

+ /mt/dim checkpatch f05adacde2faff8e0938d53b42ed318a06229f9c drm-intel 2a9c10668956 drm/xe: Drop force_alloc from xe_bo_evict in selftests

#3 lore raw

✗ CI.KUnit: failure for drm/xe: Drop force_alloc from xe_bo_evict in selftests

In reply to Matthew Brost
== Series Details ==

== Series Details ==

Series: drm/xe: Drop force_alloc from xe_bo_evict in selftests
URL : https://patchwork.freedesktop.org/series/148326/
State : failure

== Summary ==

+ trap cleanup EXIT
+ /kernel/tools/testing/kunit/kunit.py run --kunitconfig /kernel/drivers/gpu/drm/xe/.kunitconfig ERROR:root:In file included from ../drivers/gpu/drm/xe/xe_dma_buf.c:319:
../drivers/gpu/drm/xe/tests/xe_dma_buf.c: In function ‘check_residency’:
../drivers/gpu/drm/xe/tests/xe_dma_buf.c:68:15: error: too many arguments to function ‘xe_bo_evict’

   68 |         ret = xe_bo_evict(exported, true);
      |               ^~~~~~~~~~~
In file included from ../drivers/gpu/drm/xe/xe_dma_buf.c:17:
../drivers/gpu/drm/xe/xe_bo.h:277:5: note: declared here
  277 | int xe_bo_evict(struct xe_bo *bo);
      |     ^~~~~~~~~~~

make[7]: *** [../scripts/Makefile.build:203: drivers/gpu/drm/xe/xe_dma_buf.o] Error 1 make[7]: *** Waiting for unfinished jobs....
make[6]: *** [../scripts/Makefile.build:461: drivers/gpu/drm/xe] Error 2 make[6]: *** Waiting for unfinished jobs....
make[5]: *** [../scripts/Makefile.build:461: drivers/gpu/drm] Error 2 make[4]: *** [../scripts/Makefile.build:461: drivers/gpu] Error 2 make[4]: *** Waiting for unfinished jobs....
make[3]: *** [../scripts/Makefile.build:461: drivers] Error 2
make[3]: *** Waiting for unfinished jobs....
make[2]: *** [/kernel/Makefile:2011: .] Error 2
make[1]: *** [/kernel/Makefile:248: __sub-make] Error 2
make: *** [Makefile:248: __sub-make] Error 2

[01:38:10] Configuring KUnit Kernel ...
Generating .config ...
Populating config with:

$ make ARCH=um O=.kunit olddefconfig
[01:38:14] Building KUnit Kernel ...
Populating config with:
$ make ARCH=um O=.kunit olddefconfig
Building with:
$ make all compile_commands.json scripts_gdb ARCH=um O=.kunit --jobs=48
+ cleanup
++ stat -c %u:%g /kernel
+ chown -R 1003:1003 /kernel
Reviewed-by on v1 1/1
#4 lore raw
In reply to Matthew Brost

looks good to me.

-Clint

Quoted 25 lines · Matthew Brost

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.

Fixes 55df7c0c62c1 ("drm/ttm/xe: drop unused force_alloc flag")

---
 drivers/gpu/drm/xe/tests/xe_bo.c | 2 +-

 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/xe/tests/xe_bo.c +0 -0
index 230eb824550f..378dcd0fb414 100644
@@ -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;