From: robert.foss@collabora.com
To: marius.c.vlad@intel.com, daniel.vetter@ffwll.ch,
tomeu.vizoso@collabora.com
Cc: intel-gfx@lists.freedesktop.org
Subject: [PATCH i-g-t v3 2/4] lib/igt_kms: Fix plane counting in igt_display_init.
Date: Mon, 25 Apr 2016 11:05:11 -0400 [thread overview]
Message-ID: <1461596713-20384-3-git-send-email-robert.foss@collabora.com> (raw)
In-Reply-To: <1461596713-20384-1-git-send-email-robert.foss@collabora.com>
From: Robert Foss <robert.foss@collabora.com>
Fix issue where the plane counting fails due to the number and
configuration of planes being unlike the intel configuration.
Signed-off-by: Robert Foss <robert.foss@collabora.com>
---
lib/igt_kms.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/lib/igt_kms.c b/lib/igt_kms.c
index 36ecd4a..5751913 100644
--- a/lib/igt_kms.c
+++ b/lib/igt_kms.c
@@ -1289,6 +1289,7 @@ void igt_display_init(igt_display_t *display, int drm_fd)
igt_plane_t *plane;
int p = IGT_PLANE_2;
int j, type;
+ uint8_t n_planes = 0;
pipe->crtc_id = resources->crtcs[i];
pipe->display = display;
@@ -1336,8 +1337,10 @@ void igt_display_init(igt_display_t *display, int drm_fd)
break;
}
+ n_planes++;
plane->pipe = pipe;
plane->drm_plane = drm_plane;
+
if (is_atomic == 0) {
display->is_atomic = 1;
igt_atomic_fill_plane_props(display, plane, IGT_NUM_PLANE_PROPS, igt_plane_prop_names);
@@ -1386,8 +1389,7 @@ void igt_display_init(igt_display_t *display, int drm_fd)
plane->is_cursor = true;
}
- /* planes = 1 primary, (p-1) sprites, 1 cursor */
- pipe->n_planes = p + 1;
+ pipe->n_planes = n_planes;
/* make sure we don't overflow the plane array */
igt_assert(pipe->n_planes <= IGT_MAX_PLANES);
--
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-25 15:05 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-04-25 15:05 [PATCH i-g-t v3 0/4] kms_flip_event_leak and kms_vblank fixes for VC4 robert.foss
2016-04-25 15:05 ` [PATCH i-g-t v3 1/4] lib/igt_kms: Add support for up to 10 planes robert.foss
2016-04-26 11:47 ` Tomeu Vizoso
2016-04-25 15:05 ` robert.foss [this message]
2016-04-25 15:05 ` [PATCH i-g-t v3 3/4] lib/igt_kms: Switch to verbose assert robert.foss
2016-04-25 15:05 ` [PATCH i-g-t v3 4/4] kms_vblank: Switch from using crtc0 statically to explicitly setting mode robert.foss
2016-04-26 12:32 ` Tomeu Vizoso
2016-04-26 15:46 ` Robert Foss
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=1461596713-20384-3-git-send-email-robert.foss@collabora.com \
--to=robert.foss@collabora.com \
--cc=daniel.vetter@ffwll.ch \
--cc=intel-gfx@lists.freedesktop.org \
--cc=marius.c.vlad@intel.com \
--cc=tomeu.vizoso@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