@@ -54,31 +54,25 @@ typedef struct {
 	int x, y;
 } data_t;
 
-static drmModeModeInfo
-get_lowres_mode(int drmfd, igt_output_t *output,
-		const drmModeModeInfo *mode_default)
+static drmModeModeInfo *
+get_mode(int drmfd, igt_output_t *output, bool lowres)
 {
-	const drmModeModeInfo *mode;
-	bool found = false;
-	int limit = mode_default->vdisplay - SIZE;
+	drmModeModeInfo *mode, *tmp;
 	int j;
 
-	for (j = 0; j < output->config.connector->count_modes; j++) {
-		mode = &output->config.connector->modes[j];
-		if (mode->vdisplay < limit) {
-			found = true;
-			break;
+	mode = &output->config.connector->modes[0];
+	for (j = 1; j < output->config.connector->count_modes; j++) {
+		tmp = &output->config.connector->modes[j];
+		if (lowres) {
+			if (tmp->vdisplay < mode->vdisplay)
+				mode = tmp;
+		} else {
+			if (tmp->vdisplay > mode->vdisplay)
+				mode = tmp;
 		}
 	}
 
-	if (!found) {
-		igt_require_f(mode_default->vdisplay - SIZE > 768,
-			      "Current mode not tall enough; plane would still be onscreen after switch to 10x7.\n");
-
-		return *igt_std_1024_mode_get();
-	}
-
-	return *mode;
+	return mode;
 }
 
 static igt_plane_t *first_sdr_plane(igt_output_t *output, uint32_t devid)

@@ -164,8 +158,7 @@ static void create_ref_fb(data_t *data, uint64_t modifier,
 static unsigned
 test_planes_on_pipe_with_output(data_t *data, igt_plane_t *plane, uint64_t modifier)
 {
-	const drmModeModeInfo *mode;
-	drmModeModeInfo mode_lowres;
+	drmModeModeInfo *mode, *mode_lowres;
 	igt_pipe_crc_t *pipe_crc;
 	unsigned tested = 0;
 	igt_plane_t *primary;

@@ -174,8 +167,11 @@ test_planes_on_pipe_with_output(data_t *data, igt_plane_t *plane, uint64_t modif
 	igt_output_set_pipe(data->output, data->pipe);
 
 	primary = compatible_main_plane(plane, data->output, data->devid);
-	mode = igt_output_get_mode(data->output);
-	mode_lowres = get_lowres_mode(data->drm_fd, data->output, mode);
+	mode = get_mode(data->drm_fd, data->output, false);
+	mode_lowres = get_mode(data->drm_fd, data->output, true);
+
+	igt_require_f(mode->vdisplay - mode_lowres->vdisplay > SIZE,
+		      "Current mode not tall enough; plane would still be onscreen after switch to the lowest resolution.\n");
 
 	igt_create_color_pattern_fb(data->drm_fd, mode->hdisplay, mode->vdisplay,
 				    DRM_FORMAT_XRGB8888, modifier, 0.0, 0.0, 1.0,

@@ -194,17 +190,17 @@ test_planes_on_pipe_with_output(data_t *data, igt_plane_t *plane, uint64_t modif
 				    1.0, 1.0, 0.0, &data->fb_plane[1]);
 
 	create_ref_fb(data, modifier, mode, &data->ref_hires.fb);
-	create_ref_fb(data, modifier, &mode_lowres, &data->ref_lowres.fb);
+	create_ref_fb(data, modifier, mode_lowres, &data->ref_lowres.fb);
 
 	pipe_crc = igt_pipe_crc_new(data->drm_fd, data->pipe,
 				    INTEL_PIPE_CRC_SOURCE_AUTO);
 
-	igt_output_override_mode(data->output, &mode_lowres);
+	igt_output_override_mode(data->output, mode_lowres);
 	igt_plane_set_fb(primary, &data->ref_lowres.fb);
 	igt_display_commit2(&data->display, COMMIT_ATOMIC);
 	igt_pipe_crc_collect_crc(pipe_crc, &data->ref_lowres.crc);
 
-	igt_output_override_mode(data->output, NULL);
+	igt_output_override_mode(data->output, mode);
 	igt_plane_set_fb(primary, &data->ref_hires.fb);
 	igt_display_commit2(&data->display, COMMIT_ATOMIC);
 	igt_pipe_crc_collect_crc(pipe_crc, &data->ref_hires.crc);

@@ -221,13 +217,13 @@ test_planes_on_pipe_with_output(data_t *data, igt_plane_t *plane, uint64_t modif
 	igt_pipe_crc_collect_crc(pipe_crc, &crc_hires1);
 
 	/* switch to lower resolution */
-	igt_output_override_mode(data->output, &mode_lowres);
+	igt_output_override_mode(data->output, mode_lowres);
 	igt_display_commit2(&data->display, COMMIT_ATOMIC);
 
 	igt_pipe_crc_collect_crc(pipe_crc, &crc_lowres);
 
 	/* switch back to higher resolution */
-	igt_output_override_mode(data->output, NULL);
+	igt_output_override_mode(data->output, mode);
 	igt_display_commit2(&data->display, COMMIT_ATOMIC);
 
 	igt_pipe_crc_collect_crc(pipe_crc, &crc_hires2);