]> www.infradead.org Git - nvme.git/commitdiff
drm/amdkfd: Use mode1 reset for GFX v9.4.4
authorStanley.Yang <Stanley.Yang@amd.com>
Wed, 3 Jul 2024 07:34:35 +0000 (15:34 +0800)
committerAlex Deucher <alexander.deucher@amd.com>
Mon, 8 Jul 2024 20:55:26 +0000 (16:55 -0400)
GFX v9.4.4 uses mode1 reset to handle poison consumption.

Signed-off-by: Stanley.Yang <Stanley.Yang@amd.com>
Reviewed-by: Hawking Zhang <Hawking.Zhang@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
drivers/gpu/drm/amd/amdkfd/kfd_int_process_v9.c

index 816800555f7f2b5c6f5acbfced00d3ec482a46c1..da95b8ba87e4221d842ba9b4f125a4e4222a607b 100644 (file)
@@ -164,7 +164,8 @@ static void event_interrupt_poison_consumption_v9(struct kfd_node *dev,
        case SOC15_IH_CLIENTID_SE3SH:
        case SOC15_IH_CLIENTID_UTCL2:
                block = AMDGPU_RAS_BLOCK__GFX;
-               if (amdgpu_ip_version(dev->adev, GC_HWIP, 0) == IP_VERSION(9, 4, 3))
+               if (amdgpu_ip_version(dev->adev, GC_HWIP, 0) == IP_VERSION(9, 4, 3) ||
+                       amdgpu_ip_version(dev->adev, GC_HWIP, 0) == IP_VERSION(9, 4, 4))
                        reset = AMDGPU_RAS_GPU_RESET_MODE1_RESET;
                else
                        reset = AMDGPU_RAS_GPU_RESET_MODE2_RESET;
@@ -180,7 +181,8 @@ static void event_interrupt_poison_consumption_v9(struct kfd_node *dev,
        case SOC15_IH_CLIENTID_SDMA3:
        case SOC15_IH_CLIENTID_SDMA4:
                block = AMDGPU_RAS_BLOCK__SDMA;
-               if (amdgpu_ip_version(dev->adev, GC_HWIP, 0) == IP_VERSION(9, 4, 3))
+               if (amdgpu_ip_version(dev->adev, GC_HWIP, 0) == IP_VERSION(9, 4, 3) ||
+                       amdgpu_ip_version(dev->adev, GC_HWIP, 0) == IP_VERSION(9, 4, 4))
                        reset = AMDGPU_RAS_GPU_RESET_MODE1_RESET;
                else
                        reset = AMDGPU_RAS_GPU_RESET_MODE2_RESET;