From: Brian Starkey <brian.starkey@arm.com>
To: intel-gfx@lists.freedesktop.org
Subject: [PATCH i-g-t v2 2/5] lib/igt_kms: Neaten up pipe->planes[] assignment
Date: Mon, 20 Feb 2017 11:02:45 +0000 [thread overview]
Message-ID: <1487588568-5033-2-git-send-email-brian.starkey@arm.com> (raw)
In-Reply-To: <1487588568-5033-1-git-send-email-brian.starkey@arm.com>
Remove a bunch of branches, functionally equivalent.
Changes since v1:
- Added back display->has_cursor_plane assignment
Signed-off-by: Brian Starkey <brian.starkey@arm.com>
Reviewed-by: Robert Foss <robert.foss@collabora.com>
---
lib/igt_kms.c | 33 ++++++++++-----------------------
1 file changed, 10 insertions(+), 23 deletions(-)
diff --git a/lib/igt_kms.c b/lib/igt_kms.c
index 9e59e35f2e2f..585aad7aafb3 100644
--- a/lib/igt_kms.c
+++ b/lib/igt_kms.c
@@ -1639,32 +1639,19 @@ void igt_display_init(igt_display_t *display, int drm_fd)
type = get_drm_plane_type(display->drm_fd,
plane_resources->planes[j]);
- switch (type) {
- case DRM_PLANE_TYPE_PRIMARY:
- if (pipe->plane_primary == -1) {
- plane = &pipe->planes[0];
- plane->index = 0;
- pipe->plane_primary = 0;
- } else {
- plane = &pipe->planes[p];
- plane->index = p++;
- }
- break;
- case DRM_PLANE_TYPE_CURSOR:
- if (pipe->plane_cursor == -1) {
- plane = &pipe->planes[last_plane];
- plane->index = last_plane;
- pipe->plane_cursor = last_plane;
- } else {
- plane = &pipe->planes[p];
- plane->index = p++;
- }
+
+ if (type == DRM_PLANE_TYPE_PRIMARY && pipe->plane_primary == -1) {
+ plane = &pipe->planes[0];
+ plane->index = 0;
+ pipe->plane_primary = 0;
+ } else if (type == DRM_PLANE_TYPE_CURSOR && pipe->plane_cursor == -1) {
+ plane = &pipe->planes[last_plane];
+ plane->index = last_plane;
+ pipe->plane_cursor = last_plane;
display->has_cursor_plane = true;
- break;
- default:
+ } else {
plane = &pipe->planes[p];
plane->index = p++;
- break;
}
igt_assert_f(plane->index < n_planes, "n_planes < plane->index failed\n");
--
1.7.9.5
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
next prev parent reply other threads:[~2017-02-20 11:02 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-02-20 11:02 [PATCH i-g-t v2 1/5] lib/igt_kms: Fix drm_plane leak Brian Starkey
2017-02-20 11:02 ` Brian Starkey [this message]
2017-02-20 11:02 ` [PATCH i-g-t v2 3/5] lib/igt_kms: Fix possible out-of-bounds access Brian Starkey
2017-02-20 11:02 ` [PATCH i-g-t v2 4/5] lib/igt_kms: Fix memory corruption when there's no cursor plane Brian Starkey
2017-02-20 11:02 ` [PATCH i-g-t v2 5/5] lib/igt_kms: Remove redundant cursor code Brian Starkey
2017-02-21 10:12 ` [PATCH i-g-t v2 1/5] lib/igt_kms: Fix drm_plane leak Brian Starkey
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=1487588568-5033-2-git-send-email-brian.starkey@arm.com \
--to=brian.starkey@arm.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;
as well as URLs for NNTP newsgroup(s).