drm/amd/gmc9: rename AMDGPU_PTE_MTYPE to AMDGPU_PTE_MTYPE_VG10

To differentiate the mtypes across asics.

Signed-off-by: Hawking Zhang <Hawking.Zhang@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Reviewed-by: Christian König <christian.koenig@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
index 2778ff63d97df9566a7e053f37f70dcd12c5df77..8225d6e05a55daed71b4a727fa9a49f4c552238e 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
@@ -962,8 +962,8 @@ int amdgpu_ttm_gart_bind(struct amdgpu_device *adev,
                        goto gart_bind_fail;
 
                /* Patch mtype of the second part BO */
-               flags &=  ~AMDGPU_PTE_MTYPE_MASK;
-               flags |= AMDGPU_PTE_MTYPE(AMDGPU_MTYPE_NC);
+               flags &= ~AMDGPU_PTE_MTYPE_VG10_MASK;
+               flags |= AMDGPU_PTE_MTYPE_VG10(AMDGPU_MTYPE_NC);
 
                r = amdgpu_gart_bind(adev,
                                gtt->offset + (page_idx << PAGE_SHIFT),

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
index 568c0f61b4d650c26406c685f641f3061a5a94df..14f96476f3b86205a8b0c85ee68299edef5a15ce 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
@@ -1578,8 +1578,8 @@ static int amdgpu_vm_bo_split_mapping(struct amdgpu_device *adev,
                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);
+               flags &= ~AMDGPU_PTE_MTYPE_VG10_MASK;
+               flags |= (mapping->flags & AMDGPU_PTE_MTYPE_VG10_MASK);
        }
 
        if ((mapping->flags & AMDGPU_PTE_PRT) &&

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h
index c4125b477138f7403a3097660c4cb7a6828e939a..778eb13ab1b8f7049b13253b8eeb991a13afb84b 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h
@@ -75,8 +75,8 @@ struct amdgpu_bo_list_entry;
 
 
 /* For GFX9 */
-#define AMDGPU_PTE_MTYPE(a)    ((uint64_t)(a) << 57)
-#define AMDGPU_PTE_MTYPE_MASK  AMDGPU_PTE_MTYPE(3ULL)
+#define AMDGPU_PTE_MTYPE_VG10(a)       ((uint64_t)(a) << 57)
+#define AMDGPU_PTE_MTYPE_VG10_MASK     AMDGPU_PTE_MTYPE_VG10(3ULL)
 
 #define AMDGPU_MTYPE_NC 0
 #define AMDGPU_MTYPE_CC 2
@@ -86,7 +86,7 @@ struct amdgpu_bo_list_entry;
                                 | AMDGPU_PTE_EXECUTABLE \
                                 | AMDGPU_PTE_READABLE   \
                                 | AMDGPU_PTE_WRITEABLE  \
-                                | AMDGPU_PTE_MTYPE(AMDGPU_MTYPE_CC))
+                                | AMDGPU_PTE_MTYPE_VG10(AMDGPU_MTYPE_CC))
 
 /* NAVI10 only */
 #define AMDGPU_PTE_MTYPE_NV10(a)       ((uint64_t)(a) << 48)

diff --git a/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c b/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c
index 3c23de4b2e48db0b11c06a84edafc36eaa79a932..f93c75c7b7ade59bb01a96e68aef7527604e8fa3 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c
@@ -531,22 +531,22 @@ static uint64_t gmc_v9_0_get_vm_pte_flags(struct amdgpu_device *adev,
 
        switch (flags & AMDGPU_VM_MTYPE_MASK) {
        case AMDGPU_VM_MTYPE_DEFAULT:
-               pte_flag |= AMDGPU_PTE_MTYPE(MTYPE_NC);
+               pte_flag |= AMDGPU_PTE_MTYPE_VG10(MTYPE_NC);
                break;
        case AMDGPU_VM_MTYPE_NC:
-               pte_flag |= AMDGPU_PTE_MTYPE(MTYPE_NC);
+               pte_flag |= AMDGPU_PTE_MTYPE_VG10(MTYPE_NC);
                break;
        case AMDGPU_VM_MTYPE_WC:
-               pte_flag |= AMDGPU_PTE_MTYPE(MTYPE_WC);
+               pte_flag |= AMDGPU_PTE_MTYPE_VG10(MTYPE_WC);
                break;
        case AMDGPU_VM_MTYPE_CC:
-               pte_flag |= AMDGPU_PTE_MTYPE(MTYPE_CC);
+               pte_flag |= AMDGPU_PTE_MTYPE_VG10(MTYPE_CC);
                break;
        case AMDGPU_VM_MTYPE_UC:
-               pte_flag |= AMDGPU_PTE_MTYPE(MTYPE_UC);
+               pte_flag |= AMDGPU_PTE_MTYPE_VG10(MTYPE_UC);
                break;
        default:
-               pte_flag |= AMDGPU_PTE_MTYPE(MTYPE_NC);
+               pte_flag |= AMDGPU_PTE_MTYPE_VG10(MTYPE_NC);
                break;
        }
 
@@ -913,7 +913,7 @@ static int gmc_v9_0_gart_init(struct amdgpu_device *adev)
        if (r)
                return r;
        adev->gart.table_size = adev->gart.num_gpu_pages * 8;
-       adev->gart.gart_pte_flags = AMDGPU_PTE_MTYPE(MTYPE_UC) |
+       adev->gart.gart_pte_flags = AMDGPU_PTE_MTYPE_VG10(MTYPE_UC) |
                                 AMDGPU_PTE_EXECUTABLE;
        return amdgpu_gart_table_vram_alloc(adev);
 }