drm/amdgpu: Correct dGPU MTYPE settings for gfx943

Revert temporary dGPU VRAM MTYPE setting and align with expected
coherency protocol.

Signed-off-by: Graham Sider <Graham.Sider@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 aca8489635b8f8511a37d482310127251aba195c..b6c500be6f703d43c2ff071c556553648e5f0d2b 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c
@@ -1238,17 +1238,12 @@ static void gmc_v9_0_get_coherence_flags(struct amdgpu_device *adev,
                        mtype = MTYPE_RW;
                } else {
                        /* dGPU */
-                       /*
-                       if ((mem->alloc_flags & KFD_IOC_ALLOC_MEM_FLAGS_VRAM) &&
-                           bo_adev == adev)
-                               mapping_flags |= AMDGPU_VM_MTYPE_RW;
+                       if (is_vram && bo_adev == adev)
+                               mtype = MTYPE_RW;
+                       else if (is_vram)
+                               mtype = MTYPE_NC;
                        else
-                       */
-                       /* Temporarily comment out above lines and use MTYPE_NC
-                        * on both VRAM and system memory access until
-                        * MTYPE_RW can properly work on VRAM access
-                        */
-                       mtype = MTYPE_NC;
+                               mtype = MTYPE_UC;
                }
 
                break;

diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_svm.c b/drivers/gpu/drm/amd/amdkfd/kfd_svm.c
index 6daba0582bf37bfa268fa52416c56eb9aa80a992..2b79849ddd30f96c7a0417cef6a787dbc829d56f 100644 (file)
--- a/drivers/gpu/drm/amd/amdkfd/kfd_svm.c
+++ b/drivers/gpu/drm/amd/amdkfd/kfd_svm.c
@@ -1198,13 +1198,9 @@ svm_range_get_pte_flags(struct kfd_node *node,
                if (uncached) {
                        mapping_flags |= AMDGPU_VM_MTYPE_UC;
                } else if (domain == SVM_RANGE_VRAM_DOMAIN) {
-                       /* local HBM region close to partition with a workaround
-                        * for Endpoint systems.
-                        */
+                       /* local HBM region close to partition */
                        if (bo_node == node)
-                               mapping_flags |=
-                                       (node->adev->flags & AMD_IS_APU) ?
-                                       AMDGPU_VM_MTYPE_RW : AMDGPU_VM_MTYPE_NC;
+                               mapping_flags |= AMDGPU_VM_MTYPE_RW;
                        /* local HBM region far from partition or remote XGMI GPU */
                        else if (svm_nodes_in_same_hive(bo_node, node))
                                mapping_flags |= AMDGPU_VM_MTYPE_NC;