Skip to content

Commit bcd600a

Browse files
Lang Yualexdeucher
authored andcommitted
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 <lang.yu@amd.com> Reviewed-by: Hawking Zhang <Hawking.Zhang@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
1 parent e3a03d0 commit bcd600a

1 file changed

Lines changed: 2 additions & 2 deletions

File tree

drivers/gpu/drm/amd/amdkfd/kfd_flat_memory.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -342,7 +342,7 @@ static void kfd_init_apertures_vi(struct kfd_process_device *pdd, uint8_t id)
342342

343343
static void kfd_init_apertures_v9(struct kfd_process_device *pdd, uint8_t id)
344344
{
345-
if (pdd->dev->adev->vm_manager.root_level == AMDGPU_VM_PDB3)
345+
if (KFD_GC_VERSION(pdd->dev) >= IP_VERSION(12, 1, 0))
346346
pdd->lds_base = pdd->dev->adev->gmc.shared_aperture_start;
347347
else
348348
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)
352352
pdd->gpuvm_limit =
353353
pdd->dev->kfd->shared_resources.gpuvm_size - 1;
354354

355-
if (pdd->dev->adev->vm_manager.root_level == AMDGPU_VM_PDB3)
355+
if (KFD_GC_VERSION(pdd->dev) >= IP_VERSION(12, 1, 0))
356356
pdd->scratch_base = pdd->dev->adev->gmc.private_aperture_start;
357357
else
358358
pdd->scratch_base = MAKE_SCRATCH_APP_BASE_V9();

0 commit comments

Comments
 (0)