From: Brian Starkey <brian.star...@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.star...@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
