From 8507d0f922c202cabdda9071550999512f46c331 Mon Sep 17 00:00:00 2001 From: Kunal Joshi Date: Mon, 22 Apr 2024 11:04:52 +0530 Subject: tests/intel/kms_big_joiner: use kmstest_force_connector_bigjoiner MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit use kmstest_force_connector_bigjoiner instead of kmstest_force_connector_bigjoiner v2: use igt_reset_connectors (Bhanu) Cc: Ville Syrjälä Cc: Ankit Nautiyal Cc: Bhanuprakash Modem Signed-off-by: Kunal Joshi Reviewed-by: Bhanuprakash Modem --- tests/intel/kms_big_joiner.c | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/tests/intel/kms_big_joiner.c b/tests/intel/kms_big_joiner.c index f325a9839..4979cac06 100644 --- a/tests/intel/kms_big_joiner.c +++ b/tests/intel/kms_big_joiner.c @@ -87,7 +87,7 @@ static void set_all_master_pipes_for_platform(data_t *data) } } -static void toggle_force_joiner_on_all_non_big_joiner_outputs(data_t *data, bool toggle) +static void enable_force_joiner_on_all_non_big_joiner_outputs(data_t *data) { bool status; igt_output_t *output; @@ -95,7 +95,7 @@ static void toggle_force_joiner_on_all_non_big_joiner_outputs(data_t *data, bool for (i = 0; i < data->non_big_joiner_output_count; i++) { output = data->non_big_joiner_output[i]; - status = igt_force_and_check_bigjoiner_status(data->drm_fd, output->name, toggle); + status = kmstest_force_connector_bigjoiner(data->drm_fd, output->config.connector); igt_assert_f(status, "Failed to toggle force joiner\n"); } } @@ -383,15 +383,15 @@ igt_main igt_require_f(data.n_pipes > 1, "Minimum 2 pipes required\n"); igt_dynamic_f("single") { - toggle_force_joiner_on_all_non_big_joiner_outputs(&data, true); + enable_force_joiner_on_all_non_big_joiner_outputs(&data); test_single_joiner(&data, data.non_big_joiner_output_count, true); - toggle_force_joiner_on_all_non_big_joiner_outputs(&data, false); + igt_reset_connectors(); } if (data.non_big_joiner_output_count > 1) { igt_dynamic_f("multi") { - toggle_force_joiner_on_all_non_big_joiner_outputs(&data, true); + enable_force_joiner_on_all_non_big_joiner_outputs(&data); test_multi_joiner(&data, data.non_big_joiner_output_count, true); - toggle_force_joiner_on_all_non_big_joiner_outputs(&data, false); + igt_reset_connectors(); } } } @@ -405,16 +405,16 @@ igt_main "Minimum of 2 pipes are required\n"); if (data.non_big_joiner_output_count >= 1) { igt_dynamic_f("big_joiner_on_last_pipe") { - toggle_force_joiner_on_all_non_big_joiner_outputs(&data, true); + enable_force_joiner_on_all_non_big_joiner_outputs(&data); test_joiner_on_last_pipe(&data, true); - toggle_force_joiner_on_all_non_big_joiner_outputs(&data, false); + igt_reset_connectors(); } } if (data.non_big_joiner_output_count > 1) { igt_dynamic_f("invalid_combinations") { - toggle_force_joiner_on_all_non_big_joiner_outputs(&data, true); + enable_force_joiner_on_all_non_big_joiner_outputs(&data); test_invalid_modeset_two_joiner(&data, false, true); - toggle_force_joiner_on_all_non_big_joiner_outputs(&data, false); + igt_reset_connectors(); } } } @@ -422,5 +422,6 @@ igt_main igt_fixture { igt_display_fini(&data.display); drm_close_driver(data.drm_fd); + igt_reset_connectors(); } } -- cgit v1.2.3