[ Sasha's backport helper bot ] Hi, The upstream commit SHA1 provided is correct: 54f07cfc016226c3959e0b3b7ed306124d986ce4 WARNING: Author mismatch between patch and upstream commit: Backport author: Lucas De Marchi <lucas.demarchi@xxxxxxxxx> Commit author: Akshata Jahagirdar <akshata.jahagirdar@xxxxxxxxx> Status in newer kernel trees: 6.12.y | Present (exact SHA1) 6.11.y | Not found Note: The patch differs from the upstream commit: --- --- - 2024-11-23 09:22:46.652978735 -0500 +++ /tmp/tmp.PlkTLzjdk1 2024-11-23 09:22:46.648420454 -0500 @@ -1,3 +1,5 @@ +commit 54f07cfc016226c3959e0b3b7ed306124d986ce4 upstream. + This test verifies if the main and ccs data are cleared during bo creation. The motivation to use Kunit instead of IGT is that, although we can verify whether the data is zero following bo creation, @@ -18,6 +20,7 @@ Acked-by: Nirmoy Das <nirmoy.das@xxxxxxxxx> Signed-off-by: Matt Roper <matthew.d.roper@xxxxxxxxx> Link: https://patchwork.freedesktop.org/patch/msgid/c07603439b88cfc99e78c0e2069327e65d5aa87d.1721250309.git.akshata.jahagirdar@xxxxxxxxx +Signed-off-by: Lucas De Marchi <lucas.demarchi@xxxxxxxxx> --- drivers/gpu/drm/xe/tests/xe_migrate.c | 276 ++++++++++++++++++++++++++ 1 file changed, 276 insertions(+) @@ -311,3 +314,6 @@ {} }; +-- +2.47.0 + --- Results of testing on various branches: | Branch | Patch Apply | Build Test | |---------------------------|-------------|------------| | stable/linux-6.11.y | Success | Failed | Build Errors: Build error for stable/linux-6.11.y: In file included from drivers/gpu/drm/xe/xe_migrate.c:1496: drivers/gpu/drm/xe/tests/xe_migrate.c: In function 'blt_copy': drivers/gpu/drm/xe/tests/xe_migrate.c:402:63: error: incompatible type for argument 3 of 'pte_update_size' 402 | batch_size += pte_update_size(m, src_is_vram, src_is_vram, src, &src_it, &src_L0, | ^~~~~~~~~~~ | | | bool {aka _Bool} drivers/gpu/drm/xe/xe_migrate.c:493:49: note: expected 'struct ttm_resource *' but argument is of type 'bool' {aka '_Bool'} 493 | struct ttm_resource *res, | ~~~~~~~~~~~~~~~~~~~~~^~~ drivers/gpu/drm/xe/tests/xe_migrate.c:402:76: error: passing argument 4 of 'pte_update_size' from incompatible pointer type [-Wincompatible-pointer-types] 402 | batch_size += pte_update_size(m, src_is_vram, src_is_vram, src, &src_it, &src_L0, | ^~~ | | | struct ttm_resource * drivers/gpu/drm/xe/xe_migrate.c:494:50: note: expected 'struct xe_res_cursor *' but argument is of type 'struct ttm_resource *' 494 | struct xe_res_cursor *cur, | ~~~~~~~~~~~~~~~~~~~~~~^~~ drivers/gpu/drm/xe/tests/xe_migrate.c:402:81: error: passing argument 5 of 'pte_update_size' from incompatible pointer type [-Wincompatible-pointer-types] 402 | batch_size += pte_update_size(m, src_is_vram, src_is_vram, src, &src_it, &src_L0, | ^~~~~~~ | | | struct xe_res_cursor * drivers/gpu/drm/xe/xe_migrate.c:495:33: note: expected 'u64 *' {aka 'long long unsigned int *'} but argument is of type 'struct xe_res_cursor *' 495 | u64 *L0, u64 *L0_ofs, u32 *L0_pt, | ~~~~~^~ drivers/gpu/drm/xe/tests/xe_migrate.c:403:47: error: passing argument 7 of 'pte_update_size' from incompatible pointer type [-Wincompatible-pointer-types] 403 | &src_L0_ofs, &src_L0_pt, 0, 0, | ^~~~~~~~~~~ | | | u64 * {aka long long unsigned int *} drivers/gpu/drm/xe/xe_migrate.c:495:55: note: expected 'u32 *' {aka 'unsigned int *'} but argument is of type 'u64 *' {aka 'long long unsigned int *'} 495 | u64 *L0, u64 *L0_ofs, u32 *L0_pt, | ~~~~~^~~~~ drivers/gpu/drm/xe/tests/xe_migrate.c:403:60: error: passing argument 8 of 'pte_update_size' makes integer from pointer without a cast [-Wint-conversion] 403 | &src_L0_ofs, &src_L0_pt, 0, 0, | ^~~~~~~~~~ | | | u32 * {aka unsigned int *} drivers/gpu/drm/xe/xe_migrate.c:496:32: note: expected 'u32' {aka 'unsigned int'} but argument is of type 'u32 *' {aka 'unsigned int *'} 496 | u32 cmd_size, u32 pt_ofs, u32 avail_pts) | ~~~~^~~~~~~~ drivers/gpu/drm/xe/tests/xe_migrate.c:402:31: error: too many arguments to function 'pte_update_size' 402 | batch_size += pte_update_size(m, src_is_vram, src_is_vram, src, &src_it, &src_L0, | ^~~~~~~~~~~~~~~ drivers/gpu/drm/xe/xe_migrate.c:491:12: note: declared here 491 | static u32 pte_update_size(struct xe_migrate *m, | ^~~~~~~~~~~~~~~ drivers/gpu/drm/xe/tests/xe_migrate.c:406:63: error: incompatible type for argument 3 of 'pte_update_size' 406 | batch_size += pte_update_size(m, dst_is_vram, dst_is_vram, dst, &dst_it, &src_L0, | ^~~~~~~~~~~ | | | bool {aka _Bool} drivers/gpu/drm/xe/xe_migrate.c:493:49: note: expected 'struct ttm_resource *' but argument is of type 'bool' {aka '_Bool'} 493 | struct ttm_resource *res, | ~~~~~~~~~~~~~~~~~~~~~^~~ drivers/gpu/drm/xe/tests/xe_migrate.c:406:76: error: passing argument 4 of 'pte_update_size' from incompatible pointer type [-Wincompatible-pointer-types] 406 | batch_size += pte_update_size(m, dst_is_vram, dst_is_vram, dst, &dst_it, &src_L0, | ^~~ | | | struct ttm_resource * drivers/gpu/drm/xe/xe_migrate.c:494:50: note: expected 'struct xe_res_cursor *' but argument is of type 'struct ttm_resource *' 494 | struct xe_res_cursor *cur, | ~~~~~~~~~~~~~~~~~~~~~~^~~ drivers/gpu/drm/xe/tests/xe_migrate.c:406:81: error: passing argument 5 of 'pte_update_size' from incompatible pointer type [-Wincompatible-pointer-types] 406 | batch_size += pte_update_size(m, dst_is_vram, dst_is_vram, dst, &dst_it, &src_L0, | ^~~~~~~ | | | struct xe_res_cursor * drivers/gpu/drm/xe/xe_migrate.c:495:33: note: expected 'u64 *' {aka 'long long unsigned int *'} but argument is of type 'struct xe_res_cursor *' 495 | u64 *L0, u64 *L0_ofs, u32 *L0_pt, | ~~~~~^~ drivers/gpu/drm/xe/tests/xe_migrate.c:407:47: error: passing argument 7 of 'pte_update_size' from incompatible pointer type [-Wincompatible-pointer-types] 407 | &dst_L0_ofs, &dst_L0_pt, 0, | ^~~~~~~~~~~ | | | u64 * {aka long long unsigned int *} drivers/gpu/drm/xe/xe_migrate.c:495:55: note: expected 'u32 *' {aka 'unsigned int *'} but argument is of type 'u64 *' {aka 'long long unsigned int *'} 495 | u64 *L0, u64 *L0_ofs, u32 *L0_pt, | ~~~~~^~~~~ drivers/gpu/drm/xe/tests/xe_migrate.c:407:60: error: passing argument 8 of 'pte_update_size' makes integer from pointer without a cast [-Wint-conversion] 407 | &dst_L0_ofs, &dst_L0_pt, 0, | ^~~~~~~~~~ | | | u32 * {aka unsigned int *} drivers/gpu/drm/xe/xe_migrate.c:496:32: note: expected 'u32' {aka 'unsigned int'} but argument is of type 'u32 *' {aka 'unsigned int *'} 496 | u32 cmd_size, u32 pt_ofs, u32 avail_pts) | ~~~~^~~~~~~~ drivers/gpu/drm/xe/tests/xe_migrate.c:406:31: error: too many arguments to function 'pte_update_size' 406 | batch_size += pte_update_size(m, dst_is_vram, dst_is_vram, dst, &dst_it, &src_L0, | ^~~~~~~~~~~~~~~ drivers/gpu/drm/xe/xe_migrate.c:491:12: note: declared here 491 | static u32 pte_update_size(struct xe_migrate *m, | ^~~~~~~~~~~~~~~ make[6]: *** [scripts/Makefile.build:244: drivers/gpu/drm/xe/xe_migrate.o] Error 1 make[6]: Target 'drivers/gpu/drm/xe/' not remade because of errors. make[5]: *** [scripts/Makefile.build:485: drivers/gpu/drm/xe] Error 2 make[5]: Target 'drivers/gpu/drm/' not remade because of errors. make[4]: *** [scripts/Makefile.build:485: drivers/gpu/drm] Error 2 make[4]: Target 'drivers/gpu/' not remade because of errors. make[3]: *** [scripts/Makefile.build:485: drivers/gpu] Error 2 make[3]: Target 'drivers/' not remade because of errors. make[2]: *** [scripts/Makefile.build:485: drivers] Error 2 make[2]: Target './' not remade because of errors. make[1]: *** [/home/sasha/build/linus-next/Makefile:1926: .] Error 2 make[1]: Target '__all' not remade because of errors. make: *** [Makefile:224: __sub-make] Error 2 make: Target '__all' not remade because of errors.
