[igt-dev] [PATCH i-g-t] tests/i915/kms_dsc: IGT clean up for kms_dsc

[venkata.sai.patnana at intel.com]

From: Patnana Venkata Sai <venkata.sai.patnana at intel.com>

Remove redundent code and clean up added in individual test
block.

Cc: Vandita Kulkarni <vandita.kulkarni at intel.com>
Cc: Karthik B S <karthik.b.s at intel.com>
Cc: Bhanuprakash Modem <bhanuprakash.modem at intel.com>
Signed-off-by: Patnana Venkata Sai <venkata.sai.patnana at intel.com>
---
 tests/i915/kms_dsc.c | 28 ++++++----------------------
 1 file changed, 6 insertions(+), 22 deletions(-)

diff --git a/tests/i915/kms_dsc.c b/tests/i915/kms_dsc.c
index ee52ffcc09..107b175b43 100644
--- a/tests/i915/kms_dsc.c
+++ b/tests/i915/kms_dsc.c
@@ -121,19 +121,6 @@ static void restore_force_dsc_en(void)
 	force_dsc_restore_fd = -1;
 }
 
-static void test_cleanup(data_t *data)
-{
-	igt_plane_t *primary;
-
-	if (data->output) {
-		primary = igt_output_get_plane_type(data->output,
-						    DRM_PLANE_TYPE_PRIMARY);
-		igt_plane_set_fb(primary, NULL);
-		igt_output_set_pipe(data->output, PIPE_NONE);
-		igt_display_commit(&data->display);
-	}
-}
-
 static void kms_dsc_exit_handler(int sig)
 {
 	restore_force_dsc_en();
@@ -211,9 +198,8 @@ static void update_display(data_t *data, enum dsc_test_type test_type)
 	bool enabled;
 	igt_plane_t *primary;
 
-	/* Disable the output first */
-	igt_output_set_pipe(data->output, PIPE_NONE);
-	igt_display_commit(&data->display);
+	/* Sanitize the state before starting the subtest. */
+	igt_display_reset(&data->display);
 
 	igt_debug("DSC is supported on %s\n", data->conn_name);
 	save_force_dsc_en(data);
@@ -253,6 +239,10 @@ static void update_display(data_t *data, enum dsc_test_type test_type)
 		     "Default DSC enable failed on Connector: %s Pipe: %s\n",
 		     data->conn_name,
 		     kmstest_pipe_name(data->pipe));
+
+	igt_plane_set_fb(primary, NULL);
+	igt_output_set_pipe(data->output, PIPE_NONE);
+	igt_display_commit(&data->display);
 }
 
 static void run_test(data_t *data, enum dsc_test_type test_type)
@@ -307,7 +297,6 @@ igt_main
 {
 	data_t data = {};
 	drmModeRes *res;
-	drmModeConnector *connector = NULL;
 	int i, j;
 	igt_fixture {
 		data.drm_fd = drm_open_driver_master(DRIVER_INTEL);
@@ -350,11 +339,6 @@ igt_main
 	}
 
 	igt_fixture {
-		if (connector)
-			drmModeFreeConnector(connector);
-		test_cleanup(&data);
-		drmModeFreeResources(res);
-		close(data.drm_fd);
 		igt_display_fini(&data.display);
 	}
 }
-- 
2.25.1