[Intel-gfx] [PATCH i-g-t v2 1/6] lib/igt_kms: Move IGT_MAX_PLANES into the igt_plane enum

[Daniel Vetter]

On Fri, Apr 22, 2016 at 09:54:51AM -0400, robert.foss at collabora.com wrote:
> From: Robert Foss <robert.foss at collabora.com>
> 
> Makes sure we automatically extend that when adding more planes.
> Inspired by a patch from Robert Foss who extended the max, but forgot
> all about the enum.
> 
> While at it, also fix up the whitespace damage.
> 
> Cc: robert.foss at collabora.com
> Author: Daniel Vetter <daniel.vetter at intel.com>
> Signed-off-by: Daniel Vetter <daniel.vetter at intel.com>
> ---
>  lib/igt_kms.h | 12 ++++++------
>  1 file changed, 6 insertions(+), 6 deletions(-)
> 
> diff --git a/lib/igt_kms.h b/lib/igt_kms.h
> index 2c189ed..5c83401 100644
> --- a/lib/igt_kms.h
> +++ b/lib/igt_kms.h
> @@ -50,11 +50,12 @@ const char *kmstest_pipe_name(enum pipe pipe);
>  
>  /* We namespace this enum to not conflict with the Android i915_drm.h */
>  enum igt_plane {
> -        IGT_PLANE_1 = 0,
> -        IGT_PLANE_PRIMARY = IGT_PLANE_1,
> -        IGT_PLANE_2,
> -        IGT_PLANE_3,
> -        IGT_PLANE_CURSOR,
> +	IGT_PLANE_1 = 0,
> +	IGT_PLANE_PRIMARY = IGT_PLANE_1,

Aside: Primary == Plane1 is an assumption that  will fall apart on chips
where you can freely reassing planes. But this is good enough to get
going, getting igt_kms to understand reassignable planes will be an entire
pile of fun on top.
-Daniel

> +	IGT_PLANE_2,
> +	IGT_PLANE_3,
> +	IGT_PLANE_CURSOR,
> +	IGT_MAX_PLANES,
>  };
>  
>  const char *kmstest_plane_name(enum igt_plane plane);
> @@ -267,7 +268,6 @@ struct igt_pipe {
>  	igt_display_t *display;
>  	enum pipe pipe;
>  	bool enabled;
> -#define IGT_MAX_PLANES	4
>  	int n_planes;
>  	igt_plane_t planes[IGT_MAX_PLANES];
>  	uint64_t background; /* Background color MSB BGR 16bpc LSB */
> -- 
> 2.5.0
> 
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx

-- 
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch