[Intel-gfx] [PATCH i-g-t 3/5] kms_plane: Update for universal plane changes

[Damien Lespiau]

On Thu, May 29, 2014 at 08:09:15AM -0700, Matt Roper wrote:
> Recent changes in igt_kms to support universal planes have removed the
> plane list order guarantees that kms_plane depended upon.  Ensure that
> we loop over the entire plane list properly and then selectively skip
> non-overlay planes.
> 
> While we're at it, update a couple igt_output_get_plane() calls to use
> plane enums rather than integer values to make it clear what we're
> actually doing.
> 
> Signed-off-by: Matt Roper <matthew.d.roper at intel.com>

I've hard time deciding if I'm happy with losing the ordering of planes.
I think I'm not :) Can we have the init function keep the plane
ordering?

-- 
Damien

> ---
>  tests/kms_plane.c | 11 ++++++++---
>  1 file changed, 8 insertions(+), 3 deletions(-)
> 
> diff --git a/tests/kms_plane.c b/tests/kms_plane.c
> index 5db0947..1d334ab 100644
> --- a/tests/kms_plane.c
> +++ b/tests/kms_plane.c
> @@ -94,7 +94,7 @@ test_position_init(test_position_t *test, igt_output_t *output, enum pipe pipe)
>  	test->pipe_crc = igt_pipe_crc_new(pipe, INTEL_PIPE_CRC_SOURCE_AUTO);
>  
>  	igt_output_set_pipe(output, pipe);
> -	primary = igt_output_get_plane(output, 0);
> +	primary = igt_output_get_plane(output, IGT_PLANE_PRIMARY);
>  
>  	mode = igt_output_get_mode(output);
>  	igt_create_color_fb(data->drm_fd, mode->hdisplay, mode->vdisplay,
> @@ -146,9 +146,14 @@ test_plane_position_with_output(data_t *data,
>  	test_position_init(&test, output, pipe);
>  
>  	mode = igt_output_get_mode(output);
> -	primary = igt_output_get_plane(output, 0);
> +	primary = igt_output_get_plane(output, IGT_PLANE_PRIMARY);
>  	sprite = igt_output_get_plane(output, plane);
>  
> +	if (sprite->is_primary) {
> +		test_position_fini(&test, output);
> +		igt_skip("Skipping primary plane\n");
> +	}
> +
>  	create_fb_for_mode__position(data, mode, 100, 100, 64, 64,
>  				     &primary_fb);
>  	igt_plane_set_fb(primary, &primary_fb);
> @@ -213,7 +218,7 @@ run_tests_for_pipe(data_t *data, enum pipe pipe)
>  {
>  	int plane;
>  
> -	for (plane = 1; plane < IGT_MAX_PLANES; plane++)
> +	for (plane = 0; plane < IGT_MAX_PLANES; plane++)
>  		run_tests_for_pipe_plane(data, pipe, plane);
>  }
>  
> -- 
> 1.8.5.1
> 
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/intel-gfx