summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorDaniel Vetter <daniel.vetter@ffwll.ch>2016-04-21 17:48:53 +0200
committerDaniel Vetter <daniel.vetter@ffwll.ch>2016-04-22 14:57:20 +0200
commitd9dca5f12a3f4f88f30f2134cc13376f56549912 (patch)
tree50495e7d21371ec042f130eabf25a84d4f7bc9eb /lib
parentea7dac11b736df2292fdaf112d157937546adf5f (diff)
lib/igt_kms: Move IGT_MAX_PLANES into the igt_plane enum
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@collabora.com Acked-by: robert.foss@collabora.com Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
Diffstat (limited to 'lib')
-rw-r--r--lib/igt_kms.h12
1 files changed, 6 insertions, 6 deletions
diff --git a/lib/igt_kms.h b/lib/igt_kms.h
index 2c189ed4..5c834017 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,
+ 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 */