[PATCH i-g-t 2/2] Fix bigjoiner compatibility checks for connector modes
Jeevan B
jeevan.b at intel.com
Thu Nov 21 10:45:54 UTC 2024
fix bigjoiner compatibility checks by adding drm_fd argument.
added unsupported config checks for bigjoiner modes in display tests.
v2: remove unrelated change.
Signed-off-by: Jeevan B <jeevan.b at intel.com>
---
tests/intel/kms_pm_lpsp.c | 4 ++--
tests/kms_flip.c | 4 ++--
tests/kms_setmode.c | 4 ++--
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/tests/intel/kms_pm_lpsp.c b/tests/intel/kms_pm_lpsp.c
index 889da42de..74e9d799a 100644
--- a/tests/intel/kms_pm_lpsp.c
+++ b/tests/intel/kms_pm_lpsp.c
@@ -166,11 +166,11 @@ static bool test_constraint(data_t *data)
if (igt_check_force_joiner_status(data->drm_fd, data->output->name))
return false;
- if (igt_bigjoiner_possible(mode, max_dotclock)) {
+ if (igt_bigjoiner_possible(data->drm_fd, mode, max_dotclock)) {
for_each_connector_mode(data->output) {
mode = &data->output->config.connector->modes[j__];
- if (igt_bigjoiner_possible(mode, max_dotclock))
+ if (igt_bigjoiner_possible(data->drm_fd, mode, max_dotclock))
continue;
igt_output_override_mode(data->output, mode);
diff --git a/tests/kms_flip.c b/tests/kms_flip.c
index 88cd41083..3ad4d0afb 100755
--- a/tests/kms_flip.c
+++ b/tests/kms_flip.c
@@ -1756,11 +1756,11 @@ static void run_test_on_crtc_set(struct test_output *o, int *crtc_idxs,
o->kconnector[i - 1]->connector_type_id);
if (((igt_check_force_joiner_status(drm_fd, conn_name) ||
- igt_bigjoiner_possible(&o->kmode[i], max_dotclock)) &&
+ igt_bigjoiner_possible(drm_fd, &o->kmode[i], max_dotclock)) &&
((crtc_idxs[i] >= (total_crtcs - 1)) ||
((i < (crtc_count - 1)) && (abs(crtc_idxs[i + 1] - crtc_idxs[i]) <= 1)))) ||
((i > 0) && (igt_check_force_joiner_status(drm_fd, prev_conn_name) ||
- igt_bigjoiner_possible(&o->kmode[i - 1], max_dotclock)) &&
+ igt_bigjoiner_possible(drm_fd, &o->kmode[i - 1], max_dotclock)) &&
(abs(crtc_idxs[i] - crtc_idxs[i - 1]) <= 1))) {
igt_debug("Combo: %s is not possible with selected mode(s).\n", test_name);
diff --git a/tests/kms_setmode.c b/tests/kms_setmode.c
index bc7b8fabb..d61cfeb9a 100644
--- a/tests/kms_setmode.c
+++ b/tests/kms_setmode.c
@@ -736,11 +736,11 @@ static void test_one_combination(const struct test_config *tconf,
* - current & previous crtcs are consecutive
*/
if (((igt_check_force_joiner_status(drm_fd, conn_name) ||
- igt_bigjoiner_possible(&crtc->mode, max_dotclock)) &&
+ igt_bigjoiner_possible(drm_fd, &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_check_force_joiner_status(drm_fd, prev_conn_name) ||
- igt_bigjoiner_possible(&crtc[i - 1].mode, max_dotclock)) &&
+ igt_bigjoiner_possible(drm_fd, &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.25.1
More information about the igt-dev
mailing list