1 files changed, 7 insertions, 2 deletions

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
index 4f10f5aba00b..568c0f61b4d6 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
@@ -1574,8 +1574,13 @@ static int amdgpu_vm_bo_split_mapping(struct amdgpu_device *adev,
         flags &= ~AMDGPU_PTE_EXECUTABLE;
         flags |= mapping->flags & AMDGPU_PTE_EXECUTABLE;
 
-        flags &= ~AMDGPU_PTE_MTYPE_MASK;
-        flags |= (mapping->flags & AMDGPU_PTE_MTYPE_MASK);
+        if (adev->asic_type == CHIP_NAVI10) {
+                flags &= ~AMDGPU_PTE_MTYPE_NV10_MASK;
+                flags |= (mapping->flags & AMDGPU_PTE_MTYPE_NV10_MASK);
+        } else {
+                flags &= ~AMDGPU_PTE_MTYPE_MASK;
+                flags |= (mapping->flags & AMDGPU_PTE_MTYPE_MASK);
+        }
 
         if ((mapping->flags & AMDGPU_PTE_PRT) &&
             (adev->asic_type >= CHIP_VEGA10)) {