[ Sasha's backport helper bot ] Hi, The upstream commit SHA1 provided is correct: 8d79acd567db183e675cccc6cc737d2959e2a2d9 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 08:34:58.863867900 -0500 +++ /tmp/tmp.d91DYLc9D7 2024-11-23 08:34:58.856237487 -0500 @@ -1,3 +1,5 @@ +commit 8d79acd567db183e675cccc6cc737d2959e2a2d9 upstream. + Add an helper function to program identity map. v2: Formatting nits @@ -6,15 +8,16 @@ Reviewed-by: Matthew Brost <matthew.brost@xxxxxxxxx> Signed-off-by: Matt Roper <matthew.d.roper@xxxxxxxxx> Link: https://patchwork.freedesktop.org/patch/msgid/91dc05f05bd33076fb9a9f74f8495b48d2abff53.1721250309.git.akshata.jahagirdar@xxxxxxxxx +Signed-off-by: Lucas De Marchi <lucas.demarchi@xxxxxxxxx> --- drivers/gpu/drm/xe/xe_migrate.c | 88 ++++++++++++++++++--------------- 1 file changed, 48 insertions(+), 40 deletions(-) diff --git a/drivers/gpu/drm/xe/xe_migrate.c b/drivers/gpu/drm/xe/xe_migrate.c -index 85eec95c9bc27..49ad5d8443cf2 100644 +index 8315cb02f370d..f1cdb6f1fa176 100644 --- a/drivers/gpu/drm/xe/xe_migrate.c +++ b/drivers/gpu/drm/xe/xe_migrate.c -@@ -130,6 +130,51 @@ static u64 xe_migrate_vram_ofs(struct xe_device *xe, u64 addr) +@@ -131,6 +131,51 @@ static u64 xe_migrate_vram_ofs(struct xe_device *xe, u64 addr) return addr + (256ULL << xe_pt_shift(2)); } @@ -66,7 +69,7 @@ static int xe_migrate_prepare_vm(struct xe_tile *tile, struct xe_migrate *m, struct xe_vm *vm) { -@@ -253,47 +298,10 @@ static int xe_migrate_prepare_vm(struct xe_tile *tile, struct xe_migrate *m, +@@ -254,47 +299,10 @@ static int xe_migrate_prepare_vm(struct xe_tile *tile, struct xe_migrate *m, /* Identity map the entire vram at 256GiB offset */ if (IS_DGFX(xe)) { @@ -117,3 +120,6 @@ } /* +-- +2.47.0 + --- Results of testing on various branches: | Branch | Patch Apply | Build Test | |---------------------------|-------------|------------| | stable/linux-6.11.y | Success | Success |
