From 382dd7d23d1af3be58f07c9fabd571b760a3aff1 Mon Sep 17 00:00:00 2001 From: Mukul Joshi Date: Wed, 13 Aug 2025 15:05:37 -0400 Subject: [PATCH] drm/amdgpu: Setup MTYPE on SOC models for GFX 12.1 Fix it to apply for all models. Signed-off-by: Mukul Joshi Reviewed-by: Alex Sierra Signed-off-by: Alex Deucher --- drivers/gpu/drm/amd/amdgpu/gmc_v12_1.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/drm/amd/amdgpu/gmc_v12_1.c b/drivers/gpu/drm/amd/amdgpu/gmc_v12_1.c index 86c084678093..695f3cf05b6f 100644 --- a/drivers/gpu/drm/amd/amdgpu/gmc_v12_1.c +++ b/drivers/gpu/drm/amd/amdgpu/gmc_v12_1.c @@ -482,7 +482,6 @@ static void gmc_v12_1_get_vm_pde(struct amdgpu_device *adev, int level, } } -#if 0 static void gmc_v12_1_get_coherence_flags(struct amdgpu_device *adev, struct amdgpu_bo *bo, uint64_t *flags) @@ -536,7 +535,6 @@ static void gmc_v12_1_get_coherence_flags(struct amdgpu_device *adev, *flags |= snoop ? AMDGPU_PTE_SNOOPED : 0; } -#endif static void gmc_v12_1_get_vm_pte(struct amdgpu_device *adev, struct amdgpu_vm *vm, @@ -582,8 +580,8 @@ static void gmc_v12_1_get_vm_pte(struct amdgpu_device *adev, if (adev->have_atomics_support) *flags |= AMDGPU_PTE_BUS_ATOMICS; - if (bo && bo->flags & AMDGPU_GEM_CREATE_UNCACHED) - *flags = AMDGPU_PTE_MTYPE_GFX12(*flags, MTYPE_UC); + if ((*flags & AMDGPU_PTE_VALID) && bo) + gmc_v12_1_get_coherence_flags(adev, bo, flags); } static const struct amdgpu_gmc_funcs gmc_v12_1_gmc_funcs = { -- 2.47.3