From 44db0d842c30b59dd88ea1ebcd7106504303eccb Mon Sep 17 00:00:00 2001 From: Jessica Zhang Date: Thu, 21 Apr 2022 14:34:42 -0700 Subject: tests/kms_universal_plane: Change num_primary and num_cursor asserts into warnings This check was originally put in place to prevent accidental calls to drm_plane_init instead of drm_universal_plane_init to go uncaught due to similarities in parameters. However, both method signatures have now diverged enough so that accidental calls will be caught by the compiler. In addition, DRM allows drivers to support multiple primary planes, so demoting the assert to a warning instead will prevent subtests from being blocked for drivers where multiple primary planes are supported. Signed-off-by: Jessica Zhang Acked-by: Matt Roper --- tests/kms_universal_plane.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/kms_universal_plane.c b/tests/kms_universal_plane.c index 2e895897..3cb6d704 100644 --- a/tests/kms_universal_plane.c +++ b/tests/kms_universal_plane.c @@ -154,8 +154,8 @@ functional_test_pipe(data_t *data, enum pipe pipe, igt_output_t *output) else if (display->pipes[pipe].planes[i].type == DRM_PLANE_TYPE_CURSOR) num_cursor++; - igt_assert_eq(num_primary, 1); - igt_assert_lte(num_cursor, 1); + igt_warn_on(num_primary != 1); + igt_warn_on(num_cursor > 1); primary = igt_output_get_plane_type(output, DRM_PLANE_TYPE_PRIMARY); sprite = igt_output_get_plane_type(output, DRM_PLANE_TYPE_OVERLAY); -- cgit v1.2.3