[PATCH i-g-t 2/2] tests/intel/kms_sharpness_filter: Use stable non-joiner mode for joiner bypass

[Pranay Samala <pranay.samala@intel.com>]

When joiner mode is detected, fetch a non-joiner mode into local
variable and store it into the caller-owned copy.

Also override the selected mode before commit so the programmed
output mode matches the mode used by the test.

Fixes: 10dccc7fc82f ("tests/intel/kms_sharpness_filter: Detect and bypass joiner modes")
Signed-off-by: Pranay Samala <pranay.samala@intel.com>
---
 tests/intel/kms_sharpness_filter.c | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/tests/intel/kms_sharpness_filter.c b/tests/intel/kms_sharpness_filter.c
index 96fb139ae..881fab746 100644
--- a/tests/intel/kms_sharpness_filter.c
+++ b/tests/intel/kms_sharpness_filter.c
@@ -430,6 +430,7 @@ run_sharpness_filter_test(data_t *data, enum test_type type)
 	igt_display_t *display = &data->display;
 	igt_output_t *output;
 	igt_crtc_t *crtc;
+	drmModeModeInfo selected_mode;
 	char name[40];
 
 	for_each_connected_output(display, output) {
@@ -438,15 +439,17 @@ run_sharpness_filter_test(data_t *data, enum test_type type)
 
 			data->output = output;
 			data->crtc = crtc;
-			data->mode = igt_output_get_mode(data->output);
 
 			/*
 			 * FIXME: Joiner + CASF currently unsupported.
 			 * Remove this check once support is implemented.
 			 * Until then, run on non-joiner mode in joiner configuration.
 			 */
-			if (is_joiner_mode(data->drm_fd, data->output)) {
-				data->mode = igt_get_non_joiner_mode(data->drm_fd, data->output);
+			if (is_joiner_mode(data->drm_fd, data->output) &&
+			    igt_get_non_joiner_mode(data->drm_fd,
+						    data->output,
+						    &selected_mode)) {
+				data->mode = &selected_mode;
 				igt_info("Executing on mode %dx%d@%d\n",
 					 data->mode->hdisplay,
 					 data->mode->vdisplay,
@@ -463,6 +466,7 @@ run_sharpness_filter_test(data_t *data, enum test_type type)
 
 			igt_output_set_crtc(data->output,
 					    data->crtc);
+			igt_output_override_mode(data->output, data->mode);
 
 			if (!intel_pipe_output_combo_valid(display)) {
 				igt_output_set_crtc(data->output, NULL);
-- 
2.34.1