drm/amdgpu: extend halt_if_hws_hang to MES
Subsystems (2)
PATCH v2 1/1 drm/amdgpu: extend halt_if_hws_hang to MES
Hang on MES timeout if halt_if_hws_hang is set to 1.
Signed-off-by Graham Sider <[email protected]>
--- drivers/gpu/drm/amd/amdgpu/amdgpu.h | 2 ++ drivers/gpu/drm/amd/amdgpu/mes_v10_1.c | 4 ++++ drivers/gpu/drm/amd/amdgpu/mes_v11_0.c | 4 ++++ 3 files changed, 10 insertions(+)
drivers/gpu/drm/amd/amdgpu/amdgpu.h +2 -0
@@ -219,10 +219,12 @@ extern int amdgpu_use_xgmi_p2p;extern int sched_policy;extern bool debug_evictions;extern bool no_system_mem_limit; +extern int halt_if_hws_hang;#else static const int __maybe_unused sched_policy =KFD_SCHED_POLICY_HWS ;static const bool __maybe_unused debug_evictions;/* = false */ static const bool __maybe_unused no_system_mem_limit; +static const int __maybe_unused halt_if_hws_hang;#endif #ifdef CONFIG_HSA_AMD_P2P extern bool pcie_p2p;
drivers/gpu/drm/amd/amdgpu/mes_v10_1.c +4 -0
@@ -121,6 +121,10 @@ static int mes_v10_1_submit_pkt_and_poll_completion(struct amdgpu_mes *mes,if (r <1 ) {DRM_ERROR ("MES failed to response msg=%d\n" , x_pkt->header.opcode); + +while (halt_if_hws_hang) +schedule (); +return -ETIMEDOUT ; }
drivers/gpu/drm/amd/amdgpu/mes_v11_0.c +4 -0
@@ -129,6 +129,10 @@ static int mes_v11_0_submit_pkt_and_poll_completion(struct amdgpu_mes *mes,if (r <1 ) {DRM_ERROR ("MES failed to response msg=%d\n" , x_pkt->header.opcode); + +while (halt_if_hws_hang) +schedule (); +return -ETIMEDOUT ; }
Signature · 1 line
2.25.1
Quoted 3 lines · Graham Sider
Hang on MES timeout if
halt_if_hws_hangis set to 1.Signed-off-by Graham Sider <[email protected]>
Reviewed-by Felix Kuehling <[email protected]>
Quoted 53 lines
--- drivers/gpu/drm/amd/amdgpu/amdgpu.h | 2 ++ drivers/gpu/drm/amd/amdgpu/mes_v10_1.c | 4 ++++ drivers/gpu/drm/amd/amdgpu/mes_v11_0.c | 4 ++++ 3 files changed, 10 insertions(+)drivers/gpu/drm/amd/amdgpu/amdgpu.h +2
-0@@ -219,10 +219,12 @@ extern int amdgpu_use_xgmi_p2p;extern int sched_policy;extern bool debug_evictions;extern bool no_system_mem_limit; +extern int halt_if_hws_hang;#else static const int __maybe_unused sched_policy =KFD_SCHED_POLICY_HWS ;static const bool __maybe_unused debug_evictions;/* = false */ static const bool __maybe_unused no_system_mem_limit; +static const int __maybe_unused halt_if_hws_hang;#endif #ifdef CONFIG_HSA_AMD_P2P extern bool pcie_p2p;drivers/gpu/drm/amd/amdgpu/mes_v10_1.c +4
-0@@ -121,6 +121,10 @@ static int mes_v10_1_submit_pkt_and_poll_completion(struct amdgpu_mes *mes,if (r <1 ) {DRM_ERROR ("MES failed to response msg=%d\n" , x_pkt->header.opcode); + +while (halt_if_hws_hang) +schedule (); +return -ETIMEDOUT ; }drivers/gpu/drm/amd/amdgpu/mes_v11_0.c +4
-0@@ -129,6 +129,10 @@ static int mes_v11_0_submit_pkt_and_poll_completion(struct amdgpu_mes *mes,if (r <1 ) {DRM_ERROR ("MES failed to response msg=%d\n" , x_pkt->header.opcode); + +while (halt_if_hws_hang) +schedule (); +return -ETIMEDOUT ; }