[PATCH i-g-t] tests/kms_invalid_mode: Test Cleanup

[Nidhi Gupta]

Test every mode listed by connector to be more
sure everything is really getting rejected.

Signed-off-by: Nidhi Gupta <nidhi1.gupta at intel.com>
---
 tests/kms_invalid_mode.c | 41 ++++++++++++++++++++--------------------
 1 file changed, 20 insertions(+), 21 deletions(-)

diff --git a/tests/kms_invalid_mode.c b/tests/kms_invalid_mode.c
index 40042d4e..47b70eef 100644
--- a/tests/kms_invalid_mode.c
+++ b/tests/kms_invalid_mode.c
@@ -182,33 +182,32 @@ static void
 test_output(data_t *data)
 {
 	igt_output_t *output = data->output;
-	drmModeModeInfo mode;
 	struct igt_fb fb;
 	int ret;
 	uint32_t crtc_id;
-
-	/*
-	 * FIXME test every mode we have to be more
-	 * sure everything is really getting rejected?
-	 */
-	mode = *igt_output_get_mode(output);
-	igt_require(data->adjust_mode(data, &mode));
-
+	drmModeModeInfo *mode;
 	igt_create_fb(data->drm_fd,
-		      max_t(uint16_t, mode.hdisplay, 64),
-		      max_t(uint16_t, mode.vdisplay, 64),
-		      DRM_FORMAT_XRGB8888,
-		      DRM_FORMAT_MOD_LINEAR,
-		      &fb);
-
-	kmstest_unset_all_crtcs(data->drm_fd, data->res);
+                      max_t(uint16_t, mode.hdisplay, 64),
+                      max_t(uint16_t, mode.vdisplay, 64),
+                      DRM_FORMAT_XRGB8888,
+                      DRM_FORMAT_MOD_LINEAR,
+                      &fb);
+
+	igt_output_set_pipe(output, data->pipe);
+
+	for_each_connector_mode(output) {
+		mode = &output->config.connector->modes[j__];
+		igt_require(data->adjust_mode(data, mode));
+		igt_output_override_mode(output, mode);
+		ret = igt_display_try_commit2(&data->display, data->display.is_atomic ? COMMIT_ATOMIC : COMMIT_LEGACY);
+		igt_assert(ret == -EINVAL);
+	}
 
-	crtc_id = data->display.pipes[data->pipe].crtc_id;
+	igt_output_override_mode(output, NULL);
+	/*unset_all_crtcs*/
+	igt_display_reset(&data->display);
+	igt_display_commit(&data->display);
 
-	ret = drmModeSetCrtc(data->drm_fd, crtc_id,
-			     fb.fb_id, 0, 0,
-			     &output->id, 1, &mode);
-	igt_assert_lt(ret, 0);
 
 	igt_remove_fb(data->drm_fd, &fb);
 }
-- 
2.17.1