[PATCH v5 3/4] kms_async_flips: Refactor data options

[Melissa Wen]

On 04/01, André Almeida wrote:
> Setting the test data options as true and false for every test is error
> prone. Instead, reset all the data to false at the end of a test and
> just set the needed options to true before running a test.
> 
> Signed-off-by: André Almeida <andrealmeid at igalia.com>

Reviewed-by: Melissa Wen <mwen at igalia.com>

> ---
>  tests/kms_async_flips.c | 27 +++++++++++++++++++--------
>  1 file changed, 19 insertions(+), 8 deletions(-)
> 
> diff --git a/tests/kms_async_flips.c b/tests/kms_async_flips.c
> index d2a1f60f9..6986278d7 100644
> --- a/tests/kms_async_flips.c
> +++ b/tests/kms_async_flips.c
> @@ -230,6 +230,12 @@ static void test_init(data_t *data)
>  	data->plane = igt_output_get_plane_type(data->output, DRM_PLANE_TYPE_PRIMARY);
>  }
>  
> +static void test_init_ops(data_t *data)
> +{
> +	data->alternate_sync_async = false;
> +	data->atomic_path = false;
> +}
> +
>  static void test_init_fbs(data_t *data)
>  {
>  	int i;
> @@ -778,8 +784,7 @@ igt_main
>  
>  		igt_describe("Wait for page flip events in between successive asynchronous flips");
>  		igt_subtest_with_dynamic("async-flip-with-page-flip-events") {
> -			data.alternate_sync_async = false;
> -			data.atomic_path = false;
> +			test_init_ops(&data);
>  			if (is_intel_device(data.drm_fd))
>  				run_test_with_modifiers(&data, test_async_flip);
>  			else
> @@ -789,7 +794,7 @@ igt_main
>  		igt_describe("Wait for page flip events in between successive "
>  			     "asynchronous flips using atomic path");
>  		igt_subtest_with_dynamic("async-flip-with-page-flip-events-atomic") {
> -			data.alternate_sync_async = false;
> +			test_init_ops(&data);
>  			data.atomic_path = true;
>  			if (is_intel_device(data.drm_fd))
>  				run_test_with_modifiers(&data, test_async_flip);
> @@ -799,13 +804,14 @@ igt_main
>  
>  		igt_describe("Alternate between sync and async flips");
>  		igt_subtest_with_dynamic("alternate-sync-async-flip") {
> +			test_init_ops(&data);
>  			data.alternate_sync_async = true;
> -			data.atomic_path = false;
>  			run_test(&data, test_async_flip);
>  		}
>  
>  		igt_describe("Alternate between sync and async flips using atomic path");
>  		igt_subtest_with_dynamic("alternate-sync-async-flip-atomic") {
> +			test_init_ops(&data);
>  			data.alternate_sync_async = true;
>  			data.atomic_path = true;
>  			run_test(&data, test_async_flip);
> @@ -814,13 +820,14 @@ igt_main
>  		igt_describe("Verify that the async flip timestamp does not "
>  			     "coincide with either previous or next vblank");
>  		igt_subtest_with_dynamic("test-time-stamp") {
> -			data.atomic_path = false;
> +			test_init_ops(&data);
>  			run_test(&data, test_timestamp);
>  		}
>  
>  		igt_describe("Verify that the async flip timestamp does not coincide "
>  			     "with either previous or next vblank with atomic path");
>  		igt_subtest_with_dynamic("test-time-stamp-atomic") {
> +			test_init_ops(&data);
>  			data.atomic_path = true;
>  			run_test(&data, test_timestamp);
>  		}
> @@ -828,6 +835,7 @@ igt_main
>  
>  	igt_describe("Verify that the DRM_IOCTL_MODE_CURSOR passes after async flip");
>  	igt_subtest_with_dynamic("test-cursor") {
> +		test_init_ops(&data);
>  		/*
>  		 * Intel's PSR2 selective fetch adds other planes to state when
>  		 * necessary, causing the async flip to fail because async flip is not
> @@ -837,13 +845,13 @@ igt_main
>  			      "PSR2 sel fetch causes cursor to be added to primary plane "
>  			      "pages flips and async flip is not supported in cursor\n");
>  
> -		data.atomic_path = false;
>  		run_test(&data, test_cursor);
>  	}
>  
>  	igt_describe("Verify that the DRM_IOCTL_MODE_CURSOR passes after "
>  		     "async flip with atomic commit");
>  	igt_subtest_with_dynamic("test-cursor-atomic") {
> +		test_init_ops(&data);
>  		/*
>  		 * Intel's PSR2 selective fetch adds other planes to state when
>  		 * necessary, causing the async flip to fail because async flip is not
> @@ -858,6 +866,7 @@ igt_main
>  
>  	igt_describe("Negative case to verify if changes in fb are rejected from kernel as expected");
>  	igt_subtest_with_dynamic("invalid-async-flip") {
> +		test_init_ops(&data);
>  		/* TODO: support more vendors */
>  		igt_require(is_intel_device(data.drm_fd));
>  		igt_require(igt_display_has_format_mod(&data.display, DRM_FORMAT_XRGB8888,
> @@ -865,13 +874,13 @@ igt_main
>  		igt_require(igt_display_has_format_mod(&data.display, DRM_FORMAT_XRGB8888,
>  						       I915_FORMAT_MOD_Y_TILED));
>  
> -		data.atomic_path = false;
>  		run_test(&data, test_invalid);
>  	}
>  
>  	igt_describe("Negative case to verify if changes in fb are rejected "
>  		     "from kernel as expected when async flip is done using atomic path");
>  	igt_subtest_with_dynamic("invalid-async-flip-atomic") {
> +		test_init_ops(&data);
>  		data.atomic_path = true;
>  		/* TODO: support more vendors */
>  		igt_require(is_intel_device(data.drm_fd));
> @@ -885,16 +894,17 @@ igt_main
>  
>  	igt_describe("Use CRC to verify async flip scans out the correct framebuffer");
>  	igt_subtest_with_dynamic("crc") {
> +		test_init_ops(&data);
>  		/* Devices without CRC can't run this test */
>  		igt_require_pipe_crc(data.drm_fd);
>  
> -		data.atomic_path = false;
>  		run_test(&data, test_crc);
>  	}
>  
>  	igt_describe("Use CRC to verify async flip scans out the correct framebuffer "
>  		     "with atomic commit");
>  	igt_subtest_with_dynamic("crc-atomic") {
> +		test_init_ops(&data);
>  		/* Devices without CRC can't run this test */
>  		igt_require_pipe_crc(data.drm_fd);
>  
> @@ -904,6 +914,7 @@ igt_main
>  
>  	igt_describe("Verify the async flip functionality after suspend and resume cycle");
>  	igt_subtest_with_dynamic("async-flip-suspend-resume") {
> +		test_init_ops(&data);
>  		data.suspend_resume = true;
>  		run_test(&data, test_async_flip);
>  	}
> -- 
> 2.49.0
>