From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from NAM11-DM6-obe.outbound.protection.outlook.com (mail-dm6nam11on2069.outbound.protection.outlook.com [40.107.223.69]) by gabe.freedesktop.org (Postfix) with ESMTPS id 81AF210E088 for ; Tue, 18 Apr 2023 15:20:29 +0000 (UTC) From: Alex Hung To: , Date: Tue, 18 Apr 2023 09:19:59 -0600 Message-ID: <20230418151959.112929-1-alex.hung@amd.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain Subject: [igt-dev] [PATCH][V2] tests/kms_universal_plane: Enable sanity_test_pipe for all devices List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: markyacoub@google.com Errors-To: igt-dev-bounces@lists.freedesktop.org Sender: "igt-dev" List-ID: This subtest can run on non-Intel devices. Signed-off-by: Alex Hung Reviewed-by: Mark Yacoub --- tests/kms_universal_plane.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/tests/kms_universal_plane.c b/tests/kms_universal_plane.c index 114918d9..b2435b51 100644 --- a/tests/kms_universal_plane.c +++ b/tests/kms_universal_plane.c @@ -377,7 +377,7 @@ sanity_test_pipe(data_t *data, enum pipe pipe, igt_output_t *output) igt_plane_t *primary; drmModeModeInfo *mode; int i; - int expect; + int expect = 0; igt_require_pipe(&data->display, pipe); @@ -400,9 +400,9 @@ sanity_test_pipe(data_t *data, enum pipe pipe, igt_output_t *output) * doesn't cover CRTC (should fail on pre-gen9 and succeed on * gen9+). */ - igt_require_intel(data->drm_fd); igt_plane_set_fb(primary, &test.undersized_fb); - expect = (data->display_ver < 9) ? -EINVAL : 0; + if (is_intel_device(data->drm_fd)) + expect = (data->display_ver < 9) ? -EINVAL : 0; igt_assert(igt_display_try_commit2(&data->display, COMMIT_UNIVERSAL) == expect); /* Same as above, but different plane positioning. */ @@ -412,7 +412,8 @@ sanity_test_pipe(data_t *data, enum pipe pipe, igt_output_t *output) igt_plane_set_position(primary, 0, 0); /* Try to use universal plane API to scale down (should fail on pre-gen9) */ - expect = (data->display_ver < 9) ? -ERANGE : 0; + if (is_intel_device(data->drm_fd)) + expect = (data->display_ver < 9) ? -ERANGE : 0; igt_assert(drmModeSetPlane(data->drm_fd, primary->drm_plane->plane_id, output->config.crtc->crtc_id, test.oversized_fb.fb_id, 0, -- 2.40.0