drm/amdgpu: convert code name to ip version for noretry set
authorYifan Zhang <yifan1.zhang@amd.com>
Wed, 2 Mar 2022 19:09:07 +0000 (14:09 -0500)
committerAlex Deucher <alexander.deucher@amd.com>
Wed, 2 Mar 2022 23:40:06 +0000 (18:40 -0500)
Use IP version rather than codename for noretry set.

Acked-by: Christian König <christian.koenig@amd.com>
Reviewed-by: Huang Rui <ray.huang@amd.com>
Signed-off-by: Yifan Zhang <yifan1.zhang@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c

index 65f1d3f..58fd272 100644 (file)
@@ -559,11 +559,11 @@ void amdgpu_gmc_noretry_set(struct amdgpu_device *adev)
 {
        struct amdgpu_gmc *gmc = &adev->gmc;
 
-       switch (adev->asic_type) {
-       case CHIP_VEGA10:
-       case CHIP_VEGA20:
-       case CHIP_ARCTURUS:
-       case CHIP_ALDEBARAN:
+       switch (adev->ip_versions[GC_HWIP][0]) {
+       case IP_VERSION(9, 0, 1):
+       case IP_VERSION(9, 4, 0):
+       case IP_VERSION(9, 4, 1):
+       case IP_VERSION(9, 4, 2):
                /*
                 * noretry = 0 will cause kfd page fault tests fail
                 * for some ASICs, so set default to 1 for these ASICs.
@@ -573,7 +573,6 @@ void amdgpu_gmc_noretry_set(struct amdgpu_device *adev)
                else
                        gmc->noretry = amdgpu_noretry;
                break;
-       case CHIP_RAVEN:
        default:
                /* Raven currently has issues with noretry
                 * regardless of what we decide for other