drm/amdgpu: Setup MTYPE on SOC models for GFX 12.1

Fix it to apply for all models.

Signed-off-by: Mukul Joshi <mukul.joshi@amd.com>
Reviewed-by: Alex Sierra <alex.sierra@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/amdgpu/gmc_v12_1.c b/drivers/gpu/drm/amd/amdgpu/gmc_v12_1.c
index 86c0846780935c55d98404bfdecf861946d0df3e..695f3cf05b6f68c7423edaca48a79845f4fd293e 100644 (file)
--- 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 = {