From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mgamail.intel.com (mgamail.intel.com [134.134.136.31]) by gabe.freedesktop.org (Postfix) with ESMTPS id B8C8D10E0DA for ; Mon, 18 Sep 2023 05:13:18 +0000 (UTC) From: Swati Sharma To: igt-dev@lists.freedesktop.org Date: Mon, 18 Sep 2023 10:43:31 +0530 Message-Id: <20230918051332.231485-6-swati2.sharma@intel.com> In-Reply-To: <20230918051332.231485-1-swati2.sharma@intel.com> References: <20230918051332.231485-1-swati2.sharma@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [igt-dev] [PATCH i-g-t 5/6] tests/kms_atomic: check validity of pipe-output combo List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: igt-dev-bounces@lists.freedesktop.org Sender: "igt-dev" List-ID: Check validity of pipe-output combination. Signed-off-by: Swati Sharma --- tests/kms_atomic.c | 43 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) diff --git a/tests/kms_atomic.c b/tests/kms_atomic.c index e9159ded2..bed468e4b 100644 --- a/tests/kms_atomic.c +++ b/tests/kms_atomic.c @@ -1393,6 +1393,22 @@ static bool has_zpos(igt_plane_t *plane) return igt_plane_has_prop(plane, IGT_PLANE_ZPOS); } +static bool +pipe_output_combo_valid(igt_display_t *display, + enum pipe pipe, igt_output_t *output) +{ + bool ret = true; + + igt_display_reset(display); + + igt_output_set_pipe(output, pipe); + if (!i915_pipe_output_combo_valid(display)) + ret = false; + igt_output_set_pipe(output, PIPE_NONE); + + return ret; +} + igt_main { enum pipe pipe = PIPE_NONE; @@ -1415,6 +1431,8 @@ igt_main igt_pipe_get_plane_type(&data.display.pipes[pipe], DRM_PLANE_TYPE_OVERLAY); uint32_t format = plane_get_igt_format(overlay); + if (!pipe_output_combo_valid(&data.display, pipe, output)) + continue; if (!overlay || !format) continue; igt_dynamic_f("pipe-%s-%s", kmstest_pipe_name(pipe), igt_output_name(output)) { @@ -1430,6 +1448,8 @@ igt_main "the legacy and atomic interfaces."); igt_subtest_with_dynamic("plane-primary-legacy") { for_each_pipe_with_single_output(&data.display, pipe, output) { + if (!pipe_output_combo_valid(&data.display, pipe, output)) + continue; igt_dynamic_f("pipe-%s-%s", kmstest_pipe_name(pipe), igt_output_name(output)) { atomic_setup(&data, pipe, output); plane_primary(&data); @@ -1446,6 +1466,9 @@ igt_main igt_plane_t *overlay = igt_pipe_get_plane_type(&data.display.pipes[pipe], DRM_PLANE_TYPE_OVERLAY); + if (!pipe_output_combo_valid(&data.display, pipe, output)) + continue; + atomic_setup(&data, pipe, output); if (!overlay) continue; @@ -1469,6 +1492,8 @@ igt_main for_each_pipe_with_single_output(&data.display, pipe, output) { int n_planes = data.display.pipes[pipe].n_planes; + if (!pipe_output_combo_valid(&data.display, pipe, output)) + continue; if (n_planes < 2) continue; igt_dynamic_f("pipe-%s-%s", kmstest_pipe_name(pipe), igt_output_name(output)) { @@ -1486,6 +1511,9 @@ igt_main for_each_pipe_with_single_output(&data.display, pipe, output) { uint32_t format; + if (!pipe_output_combo_valid(&data.display, pipe, output)) + continue; + atomic_setup(&data, pipe, output); format = plane_get_igt_format(data.primary); @@ -1506,6 +1534,8 @@ igt_main igt_plane_t *cursor = igt_pipe_get_plane_type(&data.display.pipes[pipe], DRM_PLANE_TYPE_CURSOR); + if (!pipe_output_combo_valid(&data.display, pipe, output)) + continue; if (!cursor) continue; igt_dynamic_f("pipe-%s-%s", kmstest_pipe_name(pipe), igt_output_name(output)) { @@ -1520,6 +1550,8 @@ igt_main igt_describe("Test error handling when invalid plane parameters are passed"); igt_subtest_with_dynamic("plane-invalid-params") { for_each_pipe_with_single_output(&data.display, pipe, output) { + if (!pipe_output_combo_valid(&data.display, pipe, output)) + continue; igt_dynamic_f("pipe-%s-%s", kmstest_pipe_name(pipe), igt_output_name(output)) { atomic_setup(&data, pipe, output); plane_invalid_params(&data, output); @@ -1532,6 +1564,8 @@ igt_main igt_describe("Test error handling when invalid plane fence parameters are passed"); igt_subtest_with_dynamic("plane-invalid-params-fence") { for_each_pipe_with_single_output(&data.display, pipe, output) { + if (!pipe_output_combo_valid(&data.display, pipe, output)) + continue; igt_dynamic_f("pipe-%s-%s", kmstest_pipe_name(pipe), igt_output_name(output)) { atomic_setup(&data, pipe, output); plane_invalid_params_fence(&data, output); @@ -1544,6 +1578,8 @@ igt_main igt_describe("Test error handling when invalid crtc parameters are passed"); igt_subtest_with_dynamic("crtc-invalid-params") { for_each_pipe_with_single_output(&data.display, pipe, output) { + if (!pipe_output_combo_valid(&data.display, pipe, output)) + continue; igt_dynamic_f("pipe-%s-%s", kmstest_pipe_name(pipe), igt_output_name(output)) { atomic_setup(&data, pipe, output); crtc_invalid_params(&data, output); @@ -1556,6 +1592,8 @@ igt_main igt_describe("Test error handling when invalid crtc fence parameters are passed"); igt_subtest_with_dynamic("crtc-invalid-params-fence") { for_each_pipe_with_single_output(&data.display, pipe, output) { + if (!pipe_output_combo_valid(&data.display, pipe, output)) + continue; igt_dynamic_f("pipe-%s-%s", kmstest_pipe_name(pipe), igt_output_name(output)) { atomic_setup(&data, pipe, output); crtc_invalid_params_fence(&data, output); @@ -1570,6 +1608,8 @@ igt_main "allow us to create."); igt_subtest_with_dynamic("atomic-invalid-params") { for_each_pipe_with_single_output(&data.display, pipe, output) { + if (!pipe_output_combo_valid(&data.display, pipe, output)) + continue; igt_dynamic_f("pipe-%s-%s", kmstest_pipe_name(pipe), igt_output_name(output)) { atomic_setup(&data, pipe, output); atomic_invalid_params(&data, output); @@ -1582,6 +1622,9 @@ igt_main igt_describe("Simple test cases to use FB_DAMAGE_CLIPS plane property"); igt_subtest_with_dynamic("atomic-plane-damage") { for_each_pipe_with_single_output(&data.display, pipe, output) { + if (!pipe_output_combo_valid(&data.display, pipe, output)) + continue; + atomic_setup(&data, pipe, output); if (!igt_plane_has_prop(data.primary, IGT_PLANE_FB_DAMAGE_CLIPS)) -- 2.25.1