From: Liviu Dudau <liviu.dudau@arm.com>
To: Petri Latvala <petri.latvala@intel.com>
Cc: intel-gfx@lists.freedesktop.org
Subject: [PATCH 1/4] lib/igt_kms: Fix erroneous assert
Date: Mon, 5 Jun 2017 14:28:37 +0100 [thread overview]
Message-ID: <20170605132840.9125-2-liviu.dudau@arm.com> (raw)
In-Reply-To: <20170605132840.9125-1-liviu.dudau@arm.com>
From: Brian Starkey <brian.starkey@arm.com>
In trying to fix igt_display_init() for devices without cursors, I
actually made matters worse. Fix the assert.
Fixes: 545aa3398223 lib/igt_kms: Remove redundant cursor code
Signed-off-by: Brian Starkey <brian.starkey@arm.com>
---
lib/igt_kms.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/lib/igt_kms.c b/lib/igt_kms.c
index c77716b4..5e2ef97b 100644
--- a/lib/igt_kms.c
+++ b/lib/igt_kms.c
@@ -1794,11 +1794,11 @@ void igt_display_init(igt_display_t *display, int drm_fd)
*/
igt_assert_eq(pipe->plane_primary, 0);
- /*
- * There should be no gaps. If there is, something happened
- * which we can't handle (e.g. all planes are cursors).
- */
- igt_assert_eq(p, last_plane);
+ /* Check that we filled every slot exactly once */
+ if (display->has_cursor_plane)
+ igt_assert_eq(p, last_plane);
+ else
+ igt_assert_eq(p, n_planes);
pipe->n_planes = n_planes;
--
2.13.0
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
next prev parent reply other threads:[~2017-06-05 13:48 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-06-05 13:28 [PATCH 0/4] Cleanups and fixes Liviu Dudau
2017-06-05 13:28 ` Liviu Dudau [this message]
2017-06-06 10:32 ` [PATCH 1/4] lib/igt_kms: Fix erroneous assert Arkadiusz Hiler
2017-06-05 13:28 ` [PATCH 2/4] lib/igt_kms: Fix override_mode handling Liviu Dudau
2017-06-06 10:30 ` Arkadiusz Hiler
2017-06-06 10:54 ` Liviu Dudau
2017-06-16 14:00 ` [PATCH v2] " Liviu Dudau
2017-06-20 13:28 ` Arkadiusz Hiler
2017-06-20 15:22 ` Liviu Dudau
2017-06-05 13:28 ` [PATCH 3/4] lib/igt_debugfs: Remove igt_debugfs_t Liviu Dudau
2017-06-06 10:37 ` Arkadiusz Hiler
2017-06-05 13:28 ` [PATCH 4/4] lib/igt_debugfs: Only use valid values in igt_crc_to_str() Liviu Dudau
2017-06-06 11:06 ` Arkadiusz Hiler
2017-06-09 12:34 ` [PATCH 0/4] Cleanups and fixes Arkadiusz Hiler
2017-06-09 12:37 ` Arkadiusz Hiler
2017-06-09 12:47 ` Liviu Dudau
2017-06-12 10:33 ` Liviu Dudau
2017-06-16 11:08 ` Arkadiusz Hiler
2017-06-16 11:34 ` Liviu Dudau
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=20170605132840.9125-2-liviu.dudau@arm.com \
--to=liviu.dudau@arm.com \
--cc=intel-gfx@lists.freedesktop.org \
--cc=petri.latvala@intel.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;
as well as URLs for NNTP newsgroup(s).