[igt-dev] [PATCH i-g-t 2/2] tests/kms_concurrent: Use maximum number of planes that display/platform combination supports

[Petri Latvala]

On Tue, Mar 31, 2020 at 02:58:24PM +0300, Mika Kahola wrote:
> There was an error in
> 
> commit 0ab05a51a059 ("tests/kms_concurrent: Test for maximum number of planes")
> 
> that calculates the maximum number of supported planes. The patch proposes to
> test first if an atomic commit is successful with the selected number of planes.
> In case of a failure, the number of planes is reduced by one assuming that the
> failure was caused by bandwidth limit. The test loops at least as many iterations
> as there are planes defined by the platform.
> 
> Signed-off-by: Mika Kahola <mika.kahola at intel.com>
> ---
>  tests/kms_concurrent.c | 61 ++++++++++++------------------------------
>  1 file changed, 17 insertions(+), 44 deletions(-)
> 
> diff --git a/tests/kms_concurrent.c b/tests/kms_concurrent.c
> index c212f6ec..5de155f6 100644
> --- a/tests/kms_concurrent.c
> +++ b/tests/kms_concurrent.c
> @@ -204,19 +204,23 @@ test_plane_position_with_output(data_t *data, enum pipe pipe, int max_planes,
>  				igt_output_t *output)
>  {
>  	int i;
> -	int iterations = opt.iterations < 1 ? 1 : opt.iterations;
> +	int iterations = opt.iterations < 1 ? max_planes : opt.iterations;
>  	bool loop_forever = opt.iterations == LOOP_FOREVER ? true : false;
> +	int ret;
>  
>  	igt_pipe_refresh(&data->display, pipe, true);
>  
>  	i = 0;
>  	while (i < iterations || loop_forever) {
>  		prepare_planes(data, pipe, max_planes, output);
> -		igt_display_try_commit2(&data->display, COMMIT_ATOMIC);
> +		ret = igt_display_try_commit2(&data->display, COMMIT_ATOMIC);
>  
>  		for (int c = 0; c < max_planes; c++)
>  			igt_remove_fb(data->drm_fd, &data->fb[c]);
>  
> +		if (ret != 0)
> +			max_planes > 1 ? max_planes-- : 1;
> +
>  		i++;
>  	}
>  }
> @@ -249,44 +253,17 @@ get_lowres_mode(data_t *data, const drmModeModeInfo *mode_default,
>  	return mode;
>  }
>  
> -static int
> -test_resolution_with_output(data_t *data, enum pipe pipe, igt_output_t *output)
> +static void
> +test_resolution_with_output(data_t *data, enum pipe pipe, int max_planes, igt_output_t *output)
>  {
>  	const drmModeModeInfo *mode_hi, *mode_lo;
> -	int iterations = opt.iterations < 1 ? 1 : opt.iterations;
> +	int iterations = opt.iterations < 1 ? max_planes : opt.iterations;
>  	bool loop_forever = opt.iterations == LOOP_FOREVER ? true : false;
> -	int i, c, ret;
> -	int max_planes = data->display.pipes[pipe].n_planes;
> -	igt_plane_t *primary;
> -	drmModeModeInfo *mode;
> +	int i;
>  
>  	i = 0;
>  	while (i < iterations || loop_forever) {
>  		igt_output_set_pipe(output, pipe);
> -		for (c = 0; c < max_planes; c++) {
> -			igt_plane_t *plane = igt_output_get_plane(output, c);
> -
> -			if (plane->type != DRM_PLANE_TYPE_PRIMARY)
> -				continue;
> -			primary = igt_output_get_plane_type(output, DRM_PLANE_TYPE_PRIMARY);
> -			data->plane[primary->index] = primary;
> -			mode = igt_output_get_mode(output);
> -			igt_create_color_fb(data->drm_fd, mode->hdisplay, mode->vdisplay,
> -						DRM_FORMAT_XRGB8888,
> -						LOCAL_I915_FORMAT_MOD_X_TILED,
> -						0.0f, 0.0f, 1.0f,
> -						&data->fb[primary->index]);
> -			igt_plane_set_fb(data->plane[primary->index], &data->fb[primary->index]);
> -			ret = igt_display_try_commit2(&data->display, COMMIT_ATOMIC);
> -			if (ret) {
> -				igt_plane_set_fb(data->plane[i], NULL);
> -				igt_remove_fb(data->drm_fd, &data->fb[i]);
> -				data->plane[i] = NULL;
> -				break;
> -			}
> -		}
> -		max_planes = c;
> -		igt_assert_lt(0, max_planes);
>  
>  		mode_hi = igt_output_get_mode(output);
>  		mode_lo = get_lowres_mode(data, mode_hi, output);
> @@ -301,16 +278,12 @@ test_resolution_with_output(data_t *data, enum pipe pipe, igt_output_t *output)
>  
>  		i++;
>  	}
> -
> -	return max_planes;
>  }
>  
>  static void
> -run_test(data_t *data, enum pipe pipe, igt_output_t *output)
> +run_test(data_t *data, enum pipe pipe, int max_planes, igt_output_t *output)
>  {
>  	int connected_outs;
> -	int n_planes = data->display.pipes[pipe].n_planes;
> -	int max_planes = n_planes;
>  
>  	if (!opt.user_seed)
>  		opt.seed = time(NULL);
> @@ -320,18 +293,17 @@ run_test(data_t *data, enum pipe pipe, igt_output_t *output)
>  		igt_info("Testing resolution with connector %s using pipe %s with seed %d\n",
>  			 igt_output_name(output), kmstest_pipe_name(pipe), opt.seed);
>  
> -		test_init(data, pipe, n_planes, output);
> -		max_planes = test_resolution_with_output(data, pipe, output);
> +		test_init(data, pipe, max_planes, output);
>  
>  		igt_fork(child, 1) {
>  			test_plane_position_with_output(data, pipe, max_planes, output);
>  		}
>  
> -		test_resolution_with_output(data, pipe, output);
> +		test_resolution_with_output(data, pipe, max_planes, output);
>  
>  		igt_waitchildren();
>  
> -		test_fini(data, pipe, n_planes, output);
> +		test_fini(data, pipe, max_planes, output);
>  
>  		connected_outs++;
>  	}
> @@ -343,12 +315,13 @@ static void
>  run_tests_for_pipe(data_t *data, enum pipe pipe)
>  {
>  	igt_output_t *output;
> +	int n_planes = data->display.pipes[pipe].n_planes;


This was already communicated off-list but recording here as well:
data->display.pipes is invalid here if we're listing subtests.


-- 
Petri Latvala