[i-g-t V4 6/7] tests/kms_setmode: Force joiner support in bigjoiner checks
Bhanuprakash Modem
bhanuprakash.modem at intel.com
Tue Apr 23 12:26:35 UTC 2024
As we recently introduced the option (through debugfs) to
force the bigjoiner, needs to extend the support in bigjoiner
checks to handle the force joiner.
V2: - Fix connector name
Cc: Kunal Joshi <kunal1.joshi at intel.com>
Signed-off-by: Bhanuprakash Modem <bhanuprakash.modem at intel.com>
---
tests/kms_setmode.c | 22 ++++++++++++++++++----
1 file changed, 18 insertions(+), 4 deletions(-)
diff --git a/tests/kms_setmode.c b/tests/kms_setmode.c
index 490bfd3dd..95c5bfadc 100644
--- a/tests/kms_setmode.c
+++ b/tests/kms_setmode.c
@@ -709,24 +709,38 @@ static void test_one_combination(const struct test_config *tconf,
for (i = 0; i < crtc_count; i++) {
struct crtc_config *crtc = &crtcs[i];
+ char conn_name[24], prev_conn_name[24];
+
+ snprintf(conn_name, sizeof(conn_name),
+ "%s-%d",
+ kmstest_connector_type_str(crtcs[i].cconfs->connector->connector_type),
+ crtcs[i].cconfs->connector->connector_type_id);
+
+ if (i > 0)
+ snprintf(prev_conn_name, sizeof(prev_conn_name),
+ "%s-%d",
+ kmstest_connector_type_str(crtcs[i - 1].cconfs->connector->connector_type),
+ crtcs[i - 1].cconfs->connector->connector_type_id);
/*
* Handle BW limitations on intel hardware:
*
- * if mode resolution > 5K (or) mode clock > max_dotclock,
+ * if force joiner (or) 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 resolution > 5K (or)
+ * - previous crtc (force joiner (or) mode resolution > 5K (or)
* mode clock > max_dotclock) and
* - current & previous crtcs are consecutive
*/
- if ((igt_bigjoiner_possible(&crtc->mode, max_dotclock) &&
+ if (((igt_check_force_joiner_status(drm_fd, conn_name) ||
+ 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) && igt_bigjoiner_possible(&crtc[i - 1].mode, max_dotclock) &&
+ ((i > 0) && (igt_check_force_joiner_status(drm_fd, prev_conn_name) ||
+ 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;
--
2.43.2
More information about the igt-dev
mailing list