drm/amdgpu: Change extended-scope MTYPE on GC 9.4.3

Change local memory type to MTYPE_UC on revision id 0

Signed-off-by: David Yat Sin <David.YatSin@amd.com>
Reviewed-by: Felix Kuehling <Felix.Kuehling@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c b/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c
index 05fb57540e35525c5be86d9f8020132b5b82b3e7..bde25eb4ed8e2cb1e3f0adf62897cfab076db7db 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c
@@ -1180,7 +1180,10 @@ static void gmc_v9_0_get_coherence_flags(struct amdgpu_device *adev,
                if (uncached) {
                        mtype = MTYPE_UC;
                } else if (ext_coherent) {
-                       mtype = is_local ? MTYPE_CC : MTYPE_UC;
+                       if (adev->rev_id)
+                               mtype = is_local ? MTYPE_CC : MTYPE_UC;
+                       else
+                               mtype = MTYPE_UC;
                } else if (adev->flags & AMD_IS_APU) {
                        mtype = is_local ? mtype_local : MTYPE_NC;
                } else {
@@ -1301,7 +1304,7 @@ static void gmc_v9_0_override_vm_pte_flags(struct amdgpu_device *adev,
 
                        *flags = (*flags & ~AMDGPU_PTE_MTYPE_VG10_MASK) |
                                 AMDGPU_PTE_MTYPE_VG10(mtype_local);
-               } else {
+               } else if (adev->rev_id) {
                        /* MTYPE_UC case */
                        *flags = (*flags & ~AMDGPU_PTE_MTYPE_VG10_MASK) |
                                 AMDGPU_PTE_MTYPE_VG10(MTYPE_CC);

diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_svm.c b/drivers/gpu/drm/amd/amdkfd/kfd_svm.c
index e67d06a4280954f545cb88c34219e38af7cab9a1..f2f3c338fd9446606a65a5cd5126e7a317ced82e 100644 (file)
--- a/drivers/gpu/drm/amd/amdkfd/kfd_svm.c
+++ b/drivers/gpu/drm/amd/amdkfd/kfd_svm.c
@@ -1255,9 +1255,11 @@ svm_range_get_pte_flags(struct kfd_node *node,
                }
                break;
        case IP_VERSION(9, 4, 3):
-               mtype_local = amdgpu_mtype_local == 1 ? AMDGPU_VM_MTYPE_NC :
-                             (amdgpu_mtype_local == 2 || ext_coherent ?
-                                       AMDGPU_VM_MTYPE_CC : AMDGPU_VM_MTYPE_RW);
+               if (ext_coherent)
+                       mtype_local = node->adev->rev_id ? AMDGPU_VM_MTYPE_CC : AMDGPU_VM_MTYPE_UC;
+               else
+                       mtype_local = amdgpu_mtype_local == 1 ? AMDGPU_VM_MTYPE_NC :
+                               amdgpu_mtype_local == 2 ? AMDGPU_VM_MTYPE_CC : AMDGPU_VM_MTYPE_RW;
                snoop = true;
                if (uncached) {
                        mapping_flags |= AMDGPU_VM_MTYPE_UC;