[igt-dev] [PATCH i-g-t] tests/kms_feature_discovery: update display-1x

[Swati Sharma]

Use same logic to detect 1x display as 2x, 3x and 4x displays.

Signed-off-by: Swati Sharma <swati2.sharma at intel.com>
---
 tests/kms_feature_discovery.c | 20 ++++++--------------
 1 file changed, 6 insertions(+), 14 deletions(-)

diff --git a/tests/kms_feature_discovery.c b/tests/kms_feature_discovery.c
index 428f97ffe..9ed7ab5cd 100644
--- a/tests/kms_feature_discovery.c
+++ b/tests/kms_feature_discovery.c
@@ -29,14 +29,6 @@
  *		The subtests here should only skip or pass,
  *		anything else means we have a serious problem.
  *
- * SUBTEST: display
- * Description: Make sure that we have display support with
- * 		some outputs connected.
- * Driver requirement: i915, xe
- * Functionality: feature_discovery
- * Mega feature: General Display Features
- * Test category: functionality test
- *
  * SUBTEST: display-%dx
  * Description: Make sure that we have display support with %arg[1]
  * 		outputs connected.
@@ -73,7 +65,7 @@
  * Mega feature: General Display Features
  * Test category: functionality test
  *
- * arg[1].values: 2, 3, 4
+ * arg[1].values: 1, 2, 3, 4
  */
 
 #include "igt.h"
@@ -104,11 +96,6 @@ igt_main {
 			igt_display_require(&display, fd);
 		}
 
-		igt_describe("Make sure that we have display support with some outputs connected.");
-		igt_subtest("display") {
-			/* will skip because of the fixture */
-		}
-
 		igt_subtest_group {
 			volatile int output_count = 0;
 			igt_output_t *output;
@@ -131,6 +118,11 @@ igt_main {
 				}
 			}
 
+			igt_describe("Make sure that we have display support with some outputs connected.");
+			igt_subtest("display-1x") {
+				igt_require(output_count >= 1);
+			}
+
 			igt_describe("Make sure that we can use at least 2 outputs at the same time.");
 			igt_subtest("display-2x") {
 				igt_require(output_count >= 2);
-- 
2.25.1