drm/amdgpu: Use function for IP version check

[linux-block.git] / drivers / gpu / drm / amd / amdgpu / gfxhub_v1_2.c

diff --git a/drivers/gpu/drm/amd/amdgpu/gfxhub_v1_2.c b/drivers/gpu/drm/amd/amdgpu/gfxhub_v1_2.c
index 0834af7715497de643834735f8356fdabd6b3d7a..ff60670b8464e424a1ca62ea4814883e79ee9a48 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/gfxhub_v1_2.c
+++ b/drivers/gpu/drm/amd/amdgpu/gfxhub_v1_2.c
@@ -356,11 +356,14 @@ static void gfxhub_v1_2_xcc_setup_vmid_config(struct amdgpu_device *adev,
                         * the SQ per-process.
                         * Retry faults need to be enabled for that to work.
                         */
-                       tmp = REG_SET_FIELD(tmp, VM_CONTEXT1_CNTL,
-                                           RETRY_PERMISSION_OR_INVALID_PAGE_FAULT,
-                                           !adev->gmc.noretry ||
-                                           adev->ip_versions[GC_HWIP][0] == IP_VERSION(9, 4, 2) ||
-                                           adev->ip_versions[GC_HWIP][0] == IP_VERSION(9, 4, 3));
+                       tmp = REG_SET_FIELD(
+                               tmp, VM_CONTEXT1_CNTL,
+                               RETRY_PERMISSION_OR_INVALID_PAGE_FAULT,
+                               !adev->gmc.noretry ||
+                                       amdgpu_ip_version(adev, GC_HWIP, 0) ==
+                                               IP_VERSION(9, 4, 2) ||
+                                       amdgpu_ip_version(adev, GC_HWIP, 0) ==
+                                               IP_VERSION(9, 4, 3));
                        WREG32_SOC15_OFFSET(GC, GET_INST(GC, j), regVM_CONTEXT1_CNTL,
                                            i * hub->ctx_distance, tmp);
                        WREG32_SOC15_OFFSET(GC, GET_INST(GC, j),