drm/amdkfd: Use mode1 reset for GFX v9.4.4
Subsystems (3)
PATCH 1/1 drm/amdkfd: Use mode1 reset for GFX v9.4.4
GFX v9.4.4 uses mode1 reset to handle poison consumption.
Signed-off-by Stanley.Yang <[email protected]>
--- drivers/gpu/drm/amd/amdkfd/kfd_int_process_v9.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/gpu/drm/amd/amdkfd/kfd_int_process_v9.c +4 -2
@@ -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 ;
Signature · 1 line
2.25.1
[AMD Official Use Only - AMD Internal Distribution Only]
Reviewed-by Hawking Zhang <[email protected]>
Regards,
Hawking
-----Original Message-----
From: Yang, Stanley <[email protected]>
Sent: Monday, July 8, 2024 10:02
To: [email protected]; Zhang, Hawking <[email protected]>
Cc: Yang, Stanley <[email protected]>
Subject: [PATCH Review 1/1] drm/amdkfd: Use mode1 reset for GFX v9.4.4
GFX v9.4.4 uses mode1 reset to handle poison consumption.
Signed-off-by Stanley.Yang <[email protected]>
--- drivers/gpu/drm/amd/amdkfd/kfd_int_process_v9.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/gpu/drm/amd/amdkfd/kfd_int_process_v9.c +2 -1
@@ -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;--
2.25.1