[PATCH i-g-t v2] tests/amdgpu: add check for deadlock test

vitaly prosyak vprosyak at amd.com
Tue Apr 16 21:06:20 UTC 2024


Hi Jesse,
The change looks good to me.
Please, remove links and AMD internal information within the commit message.
With this fixed
Reviewed by:  Vitaly Prosyak <vitaly.prosyak at amd.com>


Thanks, Vitaly

On 2024-04-15 22:04, Jesse Zhang wrote:
> Only enable deadlock test  for ASICs supporting GPU reset.
> The internal related tickets:
> https://ontrack-internal.amd.com/browse/LWPSWATG-6036
> https://ontrack-internal.amd.com/browse/SWDEV-112212
>
> the issue report by:GMP, Vikram <vikram.gmp at amd.com>
> The internal ticket:
> https://ontrack-internal.amd.com/browse/SWDEV-455182
>
> Cc: Vitaly Prosyak <vitaly.prosyak at amd.com>
> Cc: Alex Deucher <alexander.deucher at amd.com>
> Cc: Christian Koenig <christian.koenig at amd.com>
> Cc: Kamil Konieczny <kamil.konieczny at linux.intel.com>
> Signed-off-by: Jesse Zhang <Jesse.Zhang at amd.com>
> ---
>  tests/amdgpu/amd_deadlock.c | 23 +++++++++++++++++++++++
>  1 file changed, 23 insertions(+)
>
> diff --git a/tests/amdgpu/amd_deadlock.c b/tests/amdgpu/amd_deadlock.c
> index dc7ec4366..7a27fae51 100644
> --- a/tests/amdgpu/amd_deadlock.c
> +++ b/tests/amdgpu/amd_deadlock.c
> @@ -9,6 +9,28 @@
>  #include "lib/amdgpu/amd_command_submission.h"
>  #include "lib/amdgpu/amd_deadlock_helpers.h"
>  
> +#define AMDGPU_FAMILY_SI                        110 /* Hainan, Oland, Verde, Pitcairn, Tahiti */
> +#define AMDGPU_FAMILY_CI                        120 /* Bonaire, Hawaii */
> +#define AMDGPU_FAMILY_CZ                        135 /* Carrizo, Stoney */
> +#define AMDGPU_FAMILY_RV                        142 /* Raven */
> +
> +static bool
> +is_deadlock_tests_enable(const struct amdgpu_gpu_info *gpu_info)
> +{
> +	bool enable = true;
> +	/*
> +	 * skip for the ASICs that don't support GPU reset.
> +	 */
> +	if (gpu_info->family_id == AMDGPU_FAMILY_SI ||
> +	    gpu_info->family_id == AMDGPU_FAMILY_KV ||
> +	    gpu_info->family_id == AMDGPU_FAMILY_CZ ||
> +	    gpu_info->family_id == AMDGPU_FAMILY_RV) {
> +		igt_info("\n\nGPU reset is not enabled for the ASIC, deadlock test skip\n");
> +		enable = false;
> +	}
> +	return enable;
> +}
> +
>  igt_main
>  {
>  	amdgpu_device_handle device;
> @@ -34,6 +56,7 @@ igt_main
>  		r = setup_amdgpu_ip_blocks(major, minor, &gpu_info, device);
>  		igt_assert_eq(r, 0);
>  		asic_rings_readness(device, 1, arr_cap);
> +		igt_skip_on(!is_deadlock_tests_enable(&gpu_info));
>  
>  	}
>  	igt_describe("Test-GPU-reset-by-flooding-sdma-ring-with-jobs");


More information about the igt-dev mailing list