[1/2] tests/kms_dp_dsc: Create subtest if connector is connected.

Submitted by Srivatsa, Anusha on May 30, 2019, 8:38 p.m.

Details

Message ID 20190530203824.5431-1-anusha.srivatsa@intel.com
State New
Headers show
Series "Series without cover letter" ( rev: 1 ) in IGT - Trybot

Not browsing as part of any series.

Commit Message

Srivatsa, Anusha May 30, 2019, 8:38 p.m.
From: Anusha Srivatsa <anusha.srivatsa@intel.com>

Instead of creating a subtest and skipping, check the
conditions and only if they satisfy, go ahead and create
the subtest.

Check if the connector is connected, supports DSC and
if DP then it supports FEC as well. Only if these three
conditions are satisfied then create then try to force
DSC on the connector.

Cc: Petri Latvala <petri.latvala@intel.com>
Cc: Manasi Navare <manasi.d.navare@intel.com>
Signed-off-by: Anusha Srivatsa <anusha.srivatsa@intel.com>
---
 tests/kms_dp_dsc.c | 54 ++++++++++++++++++++++------------------------
 1 file changed, 26 insertions(+), 28 deletions(-)

Patch hide | download patch | download mbox

diff --git a/tests/kms_dp_dsc.c b/tests/kms_dp_dsc.c
index e2e3aaa0..b99037af 100644
--- a/tests/kms_dp_dsc.c
+++ b/tests/kms_dp_dsc.c
@@ -271,35 +271,33 @@  igt_main
 	}
 
 	for (test_cnt = 0; test_cnt < ARRAY_SIZE(tests); test_cnt++) {
-
-		igt_subtest_f("basic-dsc-enable-%s",
-			      kmstest_connector_type_str(tests[test_cnt])) {
-			test_conn_cnt = 0;
-			for (i = 0; i < res->count_connectors; i++) {
-				connector = drmModeGetConnectorCurrent(data.drm_fd,
-								       res->connectors[i]);
-				if (connector->connection != DRM_MODE_CONNECTED ||
-				    connector->connector_type !=
-				    tests[test_cnt])
-					continue;
-				output = igt_output_from_connector(&data.display, connector);
-				sprintf(data.conn_name, "%s-%d",
-					kmstest_connector_type_str(connector->connector_type),
-					connector->connector_type_id);
-				if(!is_dp_dsc_supported(&data)) {
-					igt_debug("DSC not supported on connector %s \n",
-						  data.conn_name);
-					continue;
-				}
-				if (connector->connector_type == DRM_MODE_CONNECTOR_DisplayPort &&
-				    !is_dp_fec_supported(&data)) {
-					igt_debug("DSC cannot be enabled without FEC on %s\n",
-						  data.conn_name);
-					continue;
-				}
-				test_conn_cnt++;
-				run_test(&data, output, test_basic_dsc_enable);
+		test_conn_cnt = 0;
+		for (i = 0; i < res->count_connectors; i++) {
+			connector = drmModeGetConnectorCurrent(data.drm_fd,
+							       res->connectors[i]);
+			if (connector->connection != DRM_MODE_CONNECTED ||
+			    connector->connector_type !=
+			    tests[test_cnt])
+				continue;
+			output = igt_output_from_connector(&data.display, connector);
+			sprintf(data.conn_name, "%s-%d",
+				kmstest_connector_type_str(connector->connector_type),
+				connector->connector_type_id);
+			if(!is_dp_dsc_supported(&data)) {
+				igt_debug("DSC not supported on connector %s \n",
+					  data.conn_name);
+				continue;
+			}
+			if (connector->connector_type == DRM_MODE_CONNECTOR_DisplayPort &&
+			    !is_dp_fec_supported(&data)) {
+				igt_debug("DSC cannot be enabled without FEC on %s\n",
+					  data.conn_name);
+				continue;
 			}
+			test_conn_cnt++;
+			igt_subtest_f("basic-dsc-enable-%s",
+				      kmstest_connector_type_str(tests[test_cnt]))
+			run_test(&data, output, test_basic_dsc_enable);
 			igt_skip_on(test_conn_cnt == 0);
 		}
 	}