Return-Path: Received: from mga17.intel.com (mga17.intel.com [192.55.52.151]) by gabe.freedesktop.org (Postfix) with ESMTPS id 7C8FE6E82E for ; Mon, 26 Apr 2021 10:31:33 +0000 (UTC) From: Bhanuprakash Modem Date: Mon, 26 Apr 2021 23:51:29 +0530 Message-Id: <20210426182136.2815-8-bhanuprakash.modem@intel.com> In-Reply-To: <20210426182136.2815-1-bhanuprakash.modem@intel.com> References: <20210426182136.2815-1-bhanuprakash.modem@intel.com> MIME-Version: 1.0 Subject: [igt-dev] [v3 i-g-t 07/14] tests/kms_atomic_transition: Fix mode selection for 2x tests List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: igt-dev-bounces@lists.freedesktop.org Sender: "igt-dev" To: igt-dev@lists.freedesktop.org List-ID: When two monitors connected through MST, the second monitor also tries to use the same mode. So two such modes may not fit into the link bandwidth. This patch will find a combination of modes that fit into the BW. Cc: Imre Deak Cc: Ankit Nautiyal Cc: Daniel Vetter Signed-off-by: Bhanuprakash Modem --- tests/kms_atomic_transition.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/tests/kms_atomic_transition.c b/tests/kms_atomic_transition.c index be60940d7..dd3c26307 100644 --- a/tests/kms_atomic_transition.c +++ b/tests/kms_atomic_transition.c @@ -100,6 +100,7 @@ run_primary_test(data_t *data, enum pipe pipe, igt_output_t *output) igt_plane_set_fb(primary, NULL); igt_output_set_pipe(output, PIPE_NONE); igt_remove_fb(data->drm_fd, &fb); + igt_display_commit2(&data->display, COMMIT_ATOMIC); } static void *fence_inc_thread(void *arg) @@ -793,6 +794,7 @@ static void run_modeset_tests(data_t *data, int howmany, bool nonblocking, bool for (i = 0; i < data->display.n_outputs; i++) igt_output_set_pipe(&data->display.outputs[i], PIPE_NONE); +retry: for_each_connected_output(&data->display, output) { drmModeModeInfo *mode = igt_output_get_mode(output); @@ -839,6 +841,14 @@ static void run_modeset_tests(data_t *data, int howmany, bool nonblocking, bool iter_max = 1 << j; + if (igt_display_try_commit_atomic(&data->display, + DRM_MODE_ATOMIC_TEST_ONLY | + DRM_MODE_ATOMIC_ALLOW_MODESET, + NULL) != 0) { + bool found = override_all_active_output_modes_to_fit_link_bw(&data->display); + igt_require_f(found, "No valid mode combo found.\n"); + goto retry; + } igt_display_commit2(&data->display, COMMIT_ATOMIC); for (i = 0; i < iter_max; i++) { -- 2.20.1 _______________________________________________ igt-dev mailing list igt-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/igt-dev