From: Bhanuprakash Modem <bhanuprakash.modem@intel.com>
To: igt-dev@lists.freedesktop.org, swati2.sharma@intel.com,
ankit.k.nautiyal@intel.com, karthik.b.s@intel.com
Subject: [igt-dev] [i-g-t V2 6/6] tests/kms_setmode: Fix Bigjoiner checks
Date: Tue, 28 Mar 2023 18:02:10 +0530 [thread overview]
Message-ID: <20230328123210.3781976-7-bhanuprakash.modem@intel.com> (raw)
In-Reply-To: <20230328123210.3781976-1-bhanuprakash.modem@intel.com>
Bigjoiner will come in the picture when the resolution > 5K or
clock > max dot-clock. Add a support to check the selected mode
clock is greater than the max dot-clock.
Signed-off-by: Bhanuprakash Modem <bhanuprakash.modem@intel.com>
---
tests/kms_setmode.c | 15 +++++++++------
1 file changed, 9 insertions(+), 6 deletions(-)
diff --git a/tests/kms_setmode.c b/tests/kms_setmode.c
index bfa108916ce..7932a3ec285 100644
--- a/tests/kms_setmode.c
+++ b/tests/kms_setmode.c
@@ -40,13 +40,12 @@
/* restricted pipe count */
#define CRTC_RESTRICT_CNT 2
-#define MAX_HDISPLAY_PER_CRTC 5120
-
static int drm_fd;
static drmModeRes *drm_resources;
static int filter_test_id;
static bool dry_run;
static bool extended = false;
+static int max_dotclock;
const drmModeModeInfo mode_640_480 = {
.name = "640x480",
@@ -664,18 +663,20 @@ static void test_one_combination(const struct test_config *tconf,
struct crtc_config *crtc = &crtcs[i];
/*
- * if mode.hdisplay > 5120, then ignore
+ * if mode resolution > 5K (or) mode clock > max_dotclock,
+ * then ignore
* - last crtc in single/multi-connector config
* - consecutive crtcs in multi-connector config
*
* in multi-connector config ignore if
- * - previous crtc mode.hdisplay > 5120 and
+ * - previous crtc (mode resolution > 5K (or)
+ * mode clock > max_dotclock) and
* - current & previous crtcs are consecutive
*/
- if (((crtc->mode.hdisplay > MAX_HDISPLAY_PER_CRTC) &&
+ if ((igt_bigjoiner_possible(&crtc->mode, max_dotclock) &&
((crtc->crtc_idx >= (tconf->resources->count_crtcs - 1)) ||
((i < (crtc_count - 1)) && (abs(crtcs[i + 1].crtc_idx - crtc->crtc_idx) <= 1)))) ||
- ((i > 0) && (crtc[i - 1].mode.hdisplay > MAX_HDISPLAY_PER_CRTC) &&
+ ((i > 0) && igt_bigjoiner_possible(&crtc[i - 1].mode, max_dotclock) &&
(abs(crtc->crtc_idx - crtcs[i - 1].crtc_idx) <= 1))) {
igt_info("Combo: %s is not possible with selected mode(s).\n", test_name);
goto out;
@@ -954,6 +955,8 @@ igt_main_args("det:", NULL, help_str, opt_handler, NULL)
drm_resources = drmModeGetResources(drm_fd);
igt_require(drm_resources);
+
+ max_dotclock = igt_get_max_dotclock(drm_fd);
}
for (i = 0; i < ARRAY_SIZE(tests); i++) {
--
2.40.0
next prev parent reply other threads:[~2023-03-28 12:36 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-03-28 12:32 [igt-dev] [i-g-t V2 0/6] Fix Bigjoiner checks Bhanuprakash Modem
2023-03-28 12:32 ` [igt-dev] [i-g-t V2 1/6] lib/igt_kms: " Bhanuprakash Modem
2023-03-28 12:32 ` [igt-dev] [i-g-t V2 2/6] tests/i915/kms_big_joiner: " Bhanuprakash Modem
2023-04-05 7:38 ` Karthik B S
2023-03-28 12:32 ` [igt-dev] [i-g-t V2 3/6] tests/i915/kms_dsc: Update bigjoiner pipe constraint Bhanuprakash Modem
2023-03-29 15:48 ` Sharma, Swati2
2023-03-30 5:18 ` Modem, Bhanuprakash
2023-03-28 12:32 ` [igt-dev] [i-g-t V2 4/6] tests/kms_invalid_mode: Use helpers from IGT lib Bhanuprakash Modem
2023-03-28 12:32 ` [igt-dev] [i-g-t V2 5/6] tests/kms_flip: Fix Bigjoiner checks Bhanuprakash Modem
2023-03-28 12:32 ` Bhanuprakash Modem [this message]
2023-03-28 13:15 ` [igt-dev] ✓ Fi.CI.BAT: success for Fix Bigjoiner checks (rev2) Patchwork
2023-03-28 23:14 ` [igt-dev] ✓ Fi.CI.IGT: " Patchwork
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230328123210.3781976-7-bhanuprakash.modem@intel.com \
--to=bhanuprakash.modem@intel.com \
--cc=ankit.k.nautiyal@intel.com \
--cc=igt-dev@lists.freedesktop.org \
--cc=karthik.b.s@intel.com \
--cc=swati2.sharma@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox