[PATCH i-g-t v2] tests/intel/kms_sharpness_filter: Fix stale mode pointer in joiner bypass

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

Set the output on CRTC before getting mode and override it on output,
so the selected mode is used consistently during validation.

Also handle the joiner bypass case where no non-joiner mode is available.

This avoids failures when CASF is run on joiner-capable outputs and
keeps execution on a valid non-joiner configuration.

v2:
- Get mode after setting output on CRTC (Karthik)

Fixes: 10dccc7fc82f ("tests/intel/kms_sharpness_filter: Detect and bypass joiner modes")
Closes: https://gitlab.freedesktop.org/drm/xe/kernel/-/issues/7045
Signed-off-by: Pranay Samala <pranay.samala@intel.com>
---
 tests/intel/kms_sharpness_filter.c | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/tests/intel/kms_sharpness_filter.c b/tests/intel/kms_sharpness_filter.c
index 96fb139ae..c9fc191fd 100644
--- a/tests/intel/kms_sharpness_filter.c
+++ b/tests/intel/kms_sharpness_filter.c
@@ -438,7 +438,8 @@ 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);
+
+			igt_output_set_crtc(data->output, data->crtc);
 
 			/*
 			 * FIXME: Joiner + CASF currently unsupported.
@@ -447,7 +448,13 @@ run_sharpness_filter_test(data_t *data, enum test_type type)
 			 */
 			if (is_joiner_mode(data->drm_fd, data->output)) {
 				data->mode = igt_get_non_joiner_mode(data->drm_fd, data->output);
-				igt_info("Executing on mode %dx%d@%d\n",
+				if (!data->mode) {
+					igt_info("No non-joiner mode found on output %s\n",
+						 igt_output_name(data->output));
+					continue;
+				}
+
+				igt_info("Executing on non-joiner mode %dx%d@%d\n",
 					 data->mode->hdisplay,
 					 data->mode->vdisplay,
 					 data->mode->vrefresh);
@@ -455,15 +462,14 @@ run_sharpness_filter_test(data_t *data, enum test_type type)
 				data->mode = igt_output_get_mode(data->output);
 			}
 
+			igt_output_override_mode(data->output, data->mode);
+
 			if (!has_sharpness_filter(data->crtc)) {
 				igt_info("%s: Doesn't support IGT_CRTC_SHARPNESS_STRENGTH.\n",
 				igt_crtc_name(data->crtc));
 				continue;
 			}
 
-			igt_output_set_crtc(data->output,
-					    data->crtc);
-
 			if (!intel_pipe_output_combo_valid(display)) {
 				igt_output_set_crtc(data->output, NULL);
 				continue;
-- 
2.34.1