[PATCH 08/13] tests/intel/xe_oa: Use default buffer size for non-zero reason

[Dixit, Ashutosh]

On Fri, 14 Feb 2025 17:06:23 -0800, Umesh Nerlige Ramappa wrote:
>
> Use a default buffer size for non-zero-reason for and strip
> out testing buffer size in the same test.

OK, this is cleaner:

Reviewed-by: Ashutosh Dixit <ashutosh.dixit at intel.com>

>
> Signed-off-by: Umesh Nerlige Ramappa <umesh.nerlige.ramappa at intel.com>
> ---
>  tests/intel/xe_oa.c | 14 ++++----------
>  1 file changed, 4 insertions(+), 10 deletions(-)
>
> diff --git a/tests/intel/xe_oa.c b/tests/intel/xe_oa.c
> index fc03b74af..03d223df4 100644
> --- a/tests/intel/xe_oa.c
> +++ b/tests/intel/xe_oa.c
> @@ -2447,7 +2447,7 @@ test_non_zero_reason(const struct drm_xe_engine_class_instance *hwe, size_t oa_b
>		DRM_XE_OA_PROPERTY_OA_FORMAT, __ff(fmt),
>		DRM_XE_OA_PROPERTY_OA_PERIOD_EXPONENT, oa_exponent,
>		DRM_XE_OA_PROPERTY_OA_ENGINE_INSTANCE, hwe->engine_instance,
> -		DRM_XE_OA_PROPERTY_OA_BUFFER_SIZE, oa_buffer_size,
> +		DRM_XE_OA_PROPERTY_OA_BUFFER_SIZE, oa_buffer_size ?: buffer_fill_size
>	};
>	struct intel_xe_oa_open_prop param = {
>		.num_properties = ARRAY_SIZE(properties) / 2,
> @@ -4805,15 +4805,9 @@ igt_main
>		__for_one_hwe_in_oag(hwe)
>			test_buffer_fill(hwe);
>
> -	igt_subtest_with_dynamic("non-zero-reason") {
> -		if (oau->capabilities & DRM_XE_OA_CAPS_OA_BUFFER_SIZE) {
> -			__for_one_hwe_in_oag_w_arg(hwe, "16M")
> -				test_non_zero_reason(hwe, SZ_16M);
> -		} else {
> -			__for_one_hwe_in_oag_w_arg(hwe, "default")
> -				test_non_zero_reason(hwe, 0);
> -		}
> -	}
> +	igt_subtest_with_dynamic("non-zero-reason")
> +		__for_one_hwe_in_oag(hwe)
> +			test_non_zero_reason(hwe, 0);
>
>	igt_subtest("disabled-read-error")
>		test_disabled_read_error();
> --
> 2.34.1
>