drm/amd: define gc ip version local variable

For better readability. Also leftover orphaned code.

Signed-off-by: Alex Sierra <alex.sierra@amd.com>
Reviewed-by: Felix Kuehling <felix.kuehling@amd.com>
Reviewed-by: Harish Kasiviswanathan <harish.kasiviswanathan@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 dc670cf836664b35214f0f861b2a0f2408e3abe1..1475d03ebb0578756e5ac09ba3c0a309a7a28964 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c
@@ -1138,12 +1138,13 @@ static void gmc_v9_0_get_coherence_flags(struct amdgpu_device *adev,
        bool uncached = bo->flags & AMDGPU_GEM_CREATE_UNCACHED;
        struct amdgpu_vm *vm = mapping->bo_va->base.vm;
        unsigned int mtype_local, mtype;
+       uint32_t gc_ip_version = amdgpu_ip_version(adev, GC_HWIP, 0);
        bool snoop = false;
        bool is_local;
 
        dma_resv_assert_held(bo->tbo.base.resv);
 
-       switch (amdgpu_ip_version(adev, GC_HWIP, 0)) {
+       switch (gc_ip_version) {
        case IP_VERSION(9, 4, 1):
        case IP_VERSION(9, 4, 2):
                if (is_vram) {
@@ -1157,10 +1158,7 @@ static void gmc_v9_0_get_coherence_flags(struct amdgpu_device *adev,
                                /* FIXME: is this still needed? Or does
                                 * amdgpu_ttm_tt_pde_flags already handle this?
                                 */
-                               if ((amdgpu_ip_version(adev, GC_HWIP, 0) ==
-                                            IP_VERSION(9, 4, 2) ||
-                                    amdgpu_ip_version(adev, GC_HWIP, 0) ==
-                                            IP_VERSION(9, 4, 3)) &&
+                               if (gc_ip_version == IP_VERSION(9, 4, 2) &&
                                    adev->gmc.xgmi.connected_to_cpu)
                                        snoop = true;
                        } else {

diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_svm.c b/drivers/gpu/drm/amd/amdkfd/kfd_svm.c
index 3e2911895c740dd53fcd8d2f49d17a818250589b..c096caf314c0e90112307cfc430b8a572f10a93e 100644 (file)
--- a/drivers/gpu/drm/amd/amdkfd/kfd_svm.c
+++ b/drivers/gpu/drm/amd/amdkfd/kfd_svm.c
@@ -1195,6 +1195,7 @@ svm_range_get_pte_flags(struct kfd_node *node,
        struct kfd_node *bo_node;
        uint32_t flags = prange->flags;
        uint32_t mapping_flags = 0;
+       uint32_t gc_ip_version = KFD_GC_VERSION(node);
        uint64_t pte_flags;
        bool snoop = (domain != SVM_RANGE_VRAM_DOMAIN);
        bool coherent = flags & (KFD_IOCTL_SVM_FLAG_COHERENT | KFD_IOCTL_SVM_FLAG_EXT_COHERENT);
@@ -1204,7 +1205,7 @@ svm_range_get_pte_flags(struct kfd_node *node,
        if (domain == SVM_RANGE_VRAM_DOMAIN)
                bo_node = prange->svm_bo->node;
 
-       switch (amdgpu_ip_version(node->adev, GC_HWIP, 0)) {
+       switch (gc_ip_version) {
        case IP_VERSION(9, 4, 1):
                if (domain == SVM_RANGE_VRAM_DOMAIN) {
                        if (bo_node == node) {
@@ -1299,7 +1300,7 @@ svm_range_get_pte_flags(struct kfd_node *node,
        pte_flags = AMDGPU_PTE_VALID;
        pte_flags |= (domain == SVM_RANGE_VRAM_DOMAIN) ? 0 : AMDGPU_PTE_SYSTEM;
        pte_flags |= snoop ? AMDGPU_PTE_SNOOPED : 0;
-       if (KFD_GC_VERSION(node) >= IP_VERSION(12, 0, 0))
+       if (gc_ip_version >= IP_VERSION(12, 0, 0))
                pte_flags |= AMDGPU_PTE_IS_PTE;
 
        pte_flags |= amdgpu_gem_va_map_flags(node->adev, mapping_flags);