All of lore.kernel.org
 help / color / mirror / Atom feed
* [igt-dev] [PATCH i-g-t v1] tests/kms_universal_plane: Change num_primary and num_cursor asserts into warnings
@ 2022-04-21 21:34 Jessica Zhang
  2022-04-21 22:34 ` [igt-dev] ✗ Fi.CI.BAT: failure for " Patchwork
                   ` (4 more replies)
  0 siblings, 5 replies; 7+ messages in thread
From: Jessica Zhang @ 2022-04-21 21:34 UTC (permalink / raw)
  To: igt-dev; +Cc: robdclark, petri.latvala, quic_aravindh

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 <quic_jesszhan@quicinc.com>
---
 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 2e8958979dd6..3cb6d704a6ef 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);
-- 
2.31.0

^ permalink raw reply related	[flat|nested] 7+ messages in thread
end of thread, other threads:[~2022-04-22 18:47 UTC | newest]

Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-04-21 21:34 [igt-dev] [PATCH i-g-t v1] tests/kms_universal_plane: Change num_primary and num_cursor asserts into warnings Jessica Zhang
2022-04-21 22:34 ` [igt-dev] ✗ Fi.CI.BAT: failure for " Patchwork
2022-04-21 23:14 ` [igt-dev] [PATCH i-g-t v1] " Matt Roper
2022-04-22 18:47   ` Abhinav Kumar
2022-04-21 23:37 ` [igt-dev] ✗ GitLab.Pipeline: warning for tests/kms_universal_plane: Change num_primary and num_cursor asserts into warnings (rev2) Patchwork
2022-04-22  0:07 ` [igt-dev] ✓ Fi.CI.BAT: success " Patchwork
2022-04-22  3:26 ` [igt-dev] ✗ Fi.CI.IGT: failure " Patchwork

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.