From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from alexa-out-sd-02.qualcomm.com (alexa-out-sd-02.qualcomm.com [199.106.114.39]) by gabe.freedesktop.org (Postfix) with ESMTPS id 7291810E00D for ; Thu, 21 Apr 2022 21:34:55 +0000 (UTC) From: Jessica Zhang To: Date: Thu, 21 Apr 2022 14:34:42 -0700 Message-ID: <20220421213442.366-1-quic_jesszhan@quicinc.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain Subject: [igt-dev] [PATCH i-g-t v1] tests/kms_universal_plane: Change num_primary and num_cursor asserts into warnings List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: robdclark@chromium.org, petri.latvala@intel.com, quic_aravindh@quicinc.com Errors-To: igt-dev-bounces@lists.freedesktop.org Sender: "igt-dev" List-ID: 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 --- 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