diff options
| author | Jessica Zhang <quic_jesszhan@quicinc.com> | 2022-04-21 14:34:42 -0700 |
|---|---|---|
| committer | Petri Latvala <petri.latvala@intel.com> | 2022-04-22 14:42:24 +0300 |
| commit | 44db0d842c30b59dd88ea1ebcd7106504303eccb (patch) | |
| tree | 6b4b4dd5ab341b17968d40aaf3e481f0e9dc2b0b | |
| parent | fa0608879f2894fe6ad5954eb18738d44fa23f57 (diff) | |
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 <quic_jesszhan@quicinc.com>
Acked-by: Matt Roper <matthew.d.roper@intel.com>
| -rw-r--r-- | tests/kms_universal_plane.c | 4 |
1 files 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); |