From bcd600ab7f2e8ebf7eb5b6ab28dd479341c389e0 Mon Sep 17 00:00:00 2001 From: Lang Yu Date: Wed, 17 Dec 2025 11:01:39 +0800 Subject: [PATCH] drm/amdkfd: Switch to using GC VERSION to decide LDS/Scratch base Next generation GC IP with 4-level page table needs to use the same LDS/Scratch base with 5-level page table, use GC VERSION to decide is more appropriate. Signed-off-by: Lang Yu Reviewed-by: Hawking Zhang Signed-off-by: Alex Deucher --- drivers/gpu/drm/amd/amdkfd/kfd_flat_memory.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_flat_memory.c b/drivers/gpu/drm/amd/amdkfd/kfd_flat_memory.c index 557a5ade329a..e8da0b4527dc 100644 --- a/drivers/gpu/drm/amd/amdkfd/kfd_flat_memory.c +++ b/drivers/gpu/drm/amd/amdkfd/kfd_flat_memory.c @@ -342,7 +342,7 @@ static void kfd_init_apertures_vi(struct kfd_process_device *pdd, uint8_t id) static void kfd_init_apertures_v9(struct kfd_process_device *pdd, uint8_t id) { - if (pdd->dev->adev->vm_manager.root_level == AMDGPU_VM_PDB3) + if (KFD_GC_VERSION(pdd->dev) >= IP_VERSION(12, 1, 0)) pdd->lds_base = pdd->dev->adev->gmc.shared_aperture_start; else pdd->lds_base = MAKE_LDS_APP_BASE_V9(); @@ -352,7 +352,7 @@ static void kfd_init_apertures_v9(struct kfd_process_device *pdd, uint8_t id) pdd->gpuvm_limit = pdd->dev->kfd->shared_resources.gpuvm_size - 1; - if (pdd->dev->adev->vm_manager.root_level == AMDGPU_VM_PDB3) + if (KFD_GC_VERSION(pdd->dev) >= IP_VERSION(12, 1, 0)) pdd->scratch_base = pdd->dev->adev->gmc.private_aperture_start; else pdd->scratch_base = MAKE_SCRATCH_APP_BASE_V9(); -- 2.47.3