From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by gabe.freedesktop.org (Postfix) with ESMTPS id 0DD8F6EC11 for ; Fri, 9 Apr 2021 11:39:53 +0000 (UTC) From: Bhanuprakash Modem Date: Sat, 10 Apr 2021 01:00:47 +0530 Message-Id: <20210409193048.6857-5-bhanuprakash.modem@intel.com> In-Reply-To: <20210409193048.6857-1-bhanuprakash.modem@intel.com> References: <20210409193048.6857-1-bhanuprakash.modem@intel.com> MIME-Version: 1.0 Subject: [igt-dev] [PATCH i-g-t 4/5] tests/kms_frontbuffer_tracking: 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 Signed-off-by: Bhanuprakash Modem --- tests/kms_frontbuffer_tracking.c | 35 ++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/tests/kms_frontbuffer_tracking.c b/tests/kms_frontbuffer_tracking.c index 2e74bec6f..1c9b76a18 100644 --- a/tests/kms_frontbuffer_tracking.c +++ b/tests/kms_frontbuffer_tracking.c @@ -1683,6 +1683,33 @@ static void enable_prim_screen_and_wait(const struct test_mode *t) do_assertions(ASSERT_NO_ACTION_CHANGE); } +static void update_modeset_cached_params(void) +{ + bool found = false; + + igt_output_set_pipe(prim_mode_params.output, prim_mode_params.pipe); + igt_output_set_pipe(scnd_mode_params.output, scnd_mode_params.pipe); + + found = override_all_active_output_modes_to_fit_link_bw(&drm.display); + igt_require_f(found, "No valid mode combo found.\n"); + + prim_mode_params.mode_copy = *igt_output_get_mode(prim_mode_params.output); + prim_mode_params.mode = &prim_mode_params.mode_copy; + prim_mode_params.primary.w = prim_mode_params.mode->hdisplay; + prim_mode_params.primary.h = prim_mode_params.mode->vdisplay; + + scnd_mode_params.mode_copy = *igt_output_get_mode(scnd_mode_params.output); + scnd_mode_params.mode = &scnd_mode_params.mode_copy; + scnd_mode_params.primary.w = scnd_mode_params.mode->hdisplay; + scnd_mode_params.primary.h = scnd_mode_params.mode->vdisplay; + + fill_fb_region(&prim_mode_params.primary, COLOR_PRIM_BG); + fill_fb_region(&scnd_mode_params.primary, COLOR_SCND_BG); + + __set_mode_for_params(&prim_mode_params); + __set_mode_for_params(&scnd_mode_params); +} + static void enable_both_screens_and_wait(const struct test_mode *t) { fill_fb_region(&prim_mode_params.primary, COLOR_PRIM_BG); @@ -1691,6 +1718,14 @@ static void enable_both_screens_and_wait(const struct test_mode *t) __set_mode_for_params(&prim_mode_params); __set_mode_for_params(&scnd_mode_params); + if (prim_mode_params.output->link_group_id != 0 && + prim_mode_params.output->link_group_id == scnd_mode_params.output->link_group_id && + igt_display_try_commit_atomic(&drm.display, + DRM_MODE_ATOMIC_TEST_ONLY | + DRM_MODE_ATOMIC_ALLOW_MODESET, + NULL) != 0) + update_modeset_cached_params(); + igt_display_commit2(&drm.display, drm.display.is_atomic ? COMMIT_ATOMIC : COMMIT_LEGACY); wanted_crc = &blue_crcs[t->format].crc; -- 2.20.1 _______________________________________________ igt-dev mailing list igt-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/igt-dev