[PATCH i-g-t 2/2] tests/amdgpu: enhance sdma test for deadlock

[vitaly prosyak]

Both changes looks good to me. Reviewed-by: Vitaly Prosyak <vitaly.prosyak at amd.com>


On 2024-10-10 00:58, Jesse.zhang at amd.com wrote:
> Test all sdma rings and ensure
> all rings can be recovered by sdma queue reset.
>
> Signed-off-by: Jesse Zhang <Jesse.Zhang at amd.com>
> ---
>  tests/amdgpu/amd_deadlock.c | 18 +++++++++---------
>  1 file changed, 9 insertions(+), 9 deletions(-)
>
> diff --git a/tests/amdgpu/amd_deadlock.c b/tests/amdgpu/amd_deadlock.c
> index 696fac2eb..b5d053663 100644
> --- a/tests/amdgpu/amd_deadlock.c
> +++ b/tests/amdgpu/amd_deadlock.c
> @@ -73,7 +73,7 @@ igt_main
>  	igt_subtest_with_dynamic("amdgpu-gfx-illegal-reg-access") {
>  		if (arr_cap[AMD_IP_GFX]) {
>  			igt_dynamic_f("amdgpu-illegal-reg-access")
> -			bad_access_helper(device, CMD_STREAM_TRANS_BAD_REG_ADDRESS,
> +			bad_access_ring_helper(device, CMD_STREAM_TRANS_BAD_REG_ADDRESS,
>  					AMDGPU_HW_IP_GFX);
>  		}
>  	}
> @@ -82,7 +82,7 @@ igt_main
>  	igt_subtest_with_dynamic("amdgpu-gfx-illegal-mem-access") {
>  		if (arr_cap[AMD_IP_GFX]) {
>  			igt_dynamic_f("amdgpu-illegal-mem-access")
> -			bad_access_helper(device, CMD_STREAM_TRANS_BAD_MEM_ADDRESS,
> +			bad_access_ring_helper(device, CMD_STREAM_TRANS_BAD_MEM_ADDRESS,
>  					AMDGPU_HW_IP_GFX);
>  		}
>  	}
> @@ -99,7 +99,7 @@ igt_main
>  	igt_describe("Test-GPU-reset-by-access-compute-illegal-mem-addr");
>  	igt_subtest("amdgpu-compute-illegal-mem-access") {
>  		igt_skip_on_f(!arr_cap[AMD_IP_COMPUTE], "SKIP, compute ring don't support\n");
> -		bad_access_helper(device, CMD_STREAM_TRANS_BAD_MEM_ADDRESS,
> +		bad_access_ring_helper(device, CMD_STREAM_TRANS_BAD_MEM_ADDRESS,
>  				AMDGPU_HW_IP_COMPUTE);
>  	}
>  
> @@ -115,7 +115,7 @@ igt_main
>  	igt_subtest_with_dynamic("amdgpu-deadlock-sdma-corrupted-header-test") {
>  		if (arr_cap[AMD_IP_DMA]) {
>  			igt_dynamic_f("amdgpu-deadlock-sdma-corrupted-header-test")
> -			amdgpu_hang_sdma_helper(device, DMA_CORRUPTED_HEADER_HANG);
> +			amdgpu_hang_sdma_ring_helper(device, DMA_CORRUPTED_HEADER_HANG);
>  		}
>  	}
>  
> @@ -123,7 +123,7 @@ igt_main
>  	igt_subtest_with_dynamic("amdgpu-deadlock-sdma-slow-linear-copy") {
>  		if (arr_cap[AMD_IP_DMA]) {
>  			igt_dynamic_f("amdgpu-deadlock-sdma-slow-linear-copy")
> -			amdgpu_hang_sdma_helper(device, DMA_SLOW_LINEARCOPY_HANG);
> +			amdgpu_hang_sdma_ring_helper(device, DMA_SLOW_LINEARCOPY_HANG);
>  		}
>  	}
>  
> @@ -131,7 +131,7 @@ igt_main
>  	igt_subtest_with_dynamic("amdgpu-deadlock-sdma-badop-test") {
>  		if (arr_cap[AMD_IP_DMA]) {
>  			igt_dynamic_f("amdgpu-deadlock-sdma-badop-test")
> -			bad_access_helper(device, CMD_STREAM_EXEC_INVALID_OPCODE,
> +			bad_access_ring_helper(device, CMD_STREAM_EXEC_INVALID_OPCODE,
>  					AMDGPU_HW_IP_DMA);
>  		}
>  	}
> @@ -140,7 +140,7 @@ igt_main
>  	igt_subtest_with_dynamic("amdgpu-deadlock-sdma-bad-mem-test") {
>  		if (arr_cap[AMD_IP_DMA]) {
>  			igt_dynamic_f("amdgpu-deadlock-sdma-bad-mem-test")
> -			bad_access_helper(device, CMD_STREAM_TRANS_BAD_MEM_ADDRESS,
> +			bad_access_ring_helper(device, CMD_STREAM_TRANS_BAD_MEM_ADDRESS,
>  					AMDGPU_HW_IP_DMA);
>  		}
>  	}
> @@ -149,7 +149,7 @@ igt_main
>  	igt_subtest_with_dynamic("amdgpu-deadlock-sdma-bad-reg-test") {
>  		if (arr_cap[AMD_IP_DMA]) {
>  			igt_dynamic_f("amdgpu-deadlock-sdma-bad-reg-test")
> -			bad_access_helper(device, CMD_STREAM_TRANS_BAD_REG_ADDRESS,
> +			bad_access_ring_helper(device, CMD_STREAM_TRANS_BAD_REG_ADDRESS,
>  					AMDGPU_HW_IP_DMA);
>  		}
>  	}
> @@ -158,7 +158,7 @@ igt_main
>  	igt_subtest_with_dynamic("amdgpu-deadlock-sdma-bad-length-test") {
>  		if (arr_cap[AMD_IP_DMA]) {
>  			igt_dynamic_f("amdgpu-deadlock-sdma-bad-length-test")
> -			bad_access_helper(device, CMD_STREAM_EXEC_INVALID_PACKET_LENGTH,
> +			bad_access_ring_helper(device, CMD_STREAM_EXEC_INVALID_PACKET_LENGTH,
>  					AMDGPU_HW_IP_DMA);
>  		}
>  	}