From: Daniel Vetter <daniel@ffwll.ch>
To: robert.foss@collabora.com
Cc: daniel.vetter@intel.com, intel-gfx@lists.freedesktop.org
Subject: Re: [PATCH i-g-t v2 1/6] lib/igt_kms: Move IGT_MAX_PLANES into the igt_plane enum
Date: Tue, 26 Apr 2016 15:51:23 +0200 [thread overview]
Message-ID: <20160426135123.GI8291@phenom.ffwll.local> (raw)
In-Reply-To: <1461333296-9226-2-git-send-email-robert.foss@collabora.com>
On Fri, Apr 22, 2016 at 09:54:51AM -0400, robert.foss@collabora.com wrote:
> 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,
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@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx
--
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
_______________________________________________
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-26 13:51 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 ` [PATCH i-g-t v2 1/6] lib/igt_kms: Move IGT_MAX_PLANES into the igt_plane enum robert.foss
2016-04-26 13:51 ` Daniel Vetter [this message]
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=20160426135123.GI8291@phenom.ffwll.local \
--to=daniel@ffwll.ch \
--cc=daniel.vetter@intel.com \
--cc=intel-gfx@lists.freedesktop.org \
--cc=robert.foss@collabora.com \
/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