From: robert.foss@collabora.com
To: daniel.vetter@intel.com
Cc: intel-gfx@lists.freedesktop.org
Subject: [PATCH i-g-t v2 1/6] lib/igt_kms: Move IGT_MAX_PLANES into the igt_plane enum
Date: Fri, 22 Apr 2016 09:54:51 -0400 [thread overview]
Message-ID: <1461333296-9226-2-git-send-email-robert.foss@collabora.com> (raw)
In-Reply-To: <1461333296-9226-1-git-send-email-robert.foss@collabora.com>
From: Robert Foss <robert.foss@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@collabora.com
Author: Daniel Vetter <daniel.vetter@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@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,
+ 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@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
next prev parent reply other threads:[~2016-04-22 13:55 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-04-22 13:54 [PATCH i-g-t v2 0/6] kms_flip_event_leak and kms_vblank fixes for VC4 robert.foss
2016-04-22 13:54 ` robert.foss [this message]
2016-04-26 13:51 ` [PATCH i-g-t v2 1/6] lib/igt_kms: Move IGT_MAX_PLANES into the igt_plane enum Daniel Vetter
2016-04-22 13:54 ` [PATCH i-g-t v2 2/6] lib/igt_kms: Add support for up to 10 planes robert.foss
2016-04-22 13:54 ` [PATCH i-g-t v2 3/6] lib/igt_kms: Fix plane counting in igt_display_init robert.foss
2016-04-22 13:54 ` [PATCH i-g-t v2 4/6] lib/igt_kms: Switch to verbose assert robert.foss
2016-04-22 13:54 ` [PATCH i-g-t v2 5/6] kms_flip_event_leak: Enable test on DRIVER_ANY robert.foss
2016-04-22 13:54 ` [PATCH i-g-t v2 6/6] kms_vblank: Switch from using crtc0 statically to explicitly setting mode robert.foss
2016-04-26 13:52 ` [PATCH i-g-t v2 0/6] kms_flip_event_leak and kms_vblank fixes for VC4 Daniel Vetter
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1461333296-9226-2-git-send-email-robert.foss@collabora.com \
--to=robert.foss@collabora.com \
--cc=daniel.vetter@intel.com \
--cc=intel-gfx@lists.freedesktop.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox