Skip to contentSkip to conversation

make display test dynamic

PATCH In review Kunal Joshi 3 participants 6 messages Jan 30, 2024 – Feb 5, 2024

lore
Share & tools
lore
#0 lore raw

cover make display test dynamic

currently kms_feature_discovery@display checks for number of display from 1 to 4, make it dynamic to check from 1 to n also reducing unwanted skips.

anyone who needs to check number of displays for a particular config can check kms_feature_discovery@display test result.

Kunal Joshi (2):
tests/kms_feature_discovery: make display test dynamic
HAX: please do not merge

 tests/intel-ci/fast-feedback.testlist |  2 +-
 tests/kms_feature_discovery.c         | 36 ++++++---------------------
 2 files changed, 8 insertions(+), 30 deletions(-)
Signature · 1 line
2.25.1
#1 lore raw

PATCH 1/2 tests/kms_feature_discovery: make display test dynamic

currently kms_feature_discovery@display checks for number of display from 1 to 4, make it dynamic to check from 1 to n also reducing unwanted skips.

anyone who needs to check number of displays for a particular config can check kms_feature_discovery@display test result.

v2: skip if 0 outputs
test name fix

---
 tests/kms_feature_discovery.c | 36 +++++++----------------------------
 1 file changed, 7 insertions(+), 29 deletions(-)
tests/kms_feature_discovery.c +7 -29
index 5bca9ad76..2dd4efea4 100644
@@ -47,10 +47,6 @@
  * SUBTEST: display
  * Description: Make sure that we have display support.
  *
- * SUBTEST: display-%dx
- * Description: Make sure that we have display support with %arg[1]
- * 		outputs connected.
- *
  * SUBTEST: chamelium
  * Description: Make sure that Chamelium is configured and reachable.
  * Functionality: feature_discovery, chamelium
@@ -69,8 +65,6 @@
  * Description: Make sure that we have DP-MST configuration.
  * Functionality: feature_discovery, mst
  * Test category: functionality test
- *
- * arg[1].values: 1, 2, 3, 4
  */
 
 static igt_display_t display;
@@ -92,11 +86,6 @@ igt_main {
 			igt_display_require(&display, fd);
 		}
 
-		igt_describe("Make sure that we have display support.");
-		igt_subtest("display") {
-			/* will skip because of the fixture */
-		}
-
 		igt_subtest_group {
 			volatile int output_count = 0;
 			igt_output_t *output;
@@ -117,26 +106,15 @@ igt_main {
 				for (int i = 0; i < display.n_outputs; i++) {
 					igt_output_set_pipe(&display.outputs[i], PIPE_NONE);
 				}
+				igt_require_f(output_count >= 0, "No display's connected\n");
 			}
 
-			igt_describe("Make sure that we can use at least 1 output at the same time.");
-			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);
-			}
-
-			igt_describe("Make sure that we can use at least 3 outputs at the same time.");
-			igt_subtest("display-3x") {
-				igt_require(output_count >= 3);
-			}
-
-			igt_describe("Make sure that we can use at least 4 outputs at the same time.");
-			igt_subtest("display-4x") {
-				igt_require(output_count >= 4);
+			igt_describe("Make sure that we can use at least n output at the same time.");
+			igt_subtest_with_dynamic("display") {
+				int i;
+				for(i = 1; i <= output_count; i++)
+					igt_dynamic_f("%dx", i)
+						igt_require(output_count >= i);
 			}
 		}
 
Signature · 1 line
2.25.1
Reviewed-by on v1 1/2
#2 lore raw

RE: [PATCH i-g-t 1/2] tests/kms_feature_discovery: make display test dynamic

LGTM

Quoted 102 lines

-----Original Message-----
From: igt-dev <[email protected]> On Behalf Of Kunal Joshi
Sent: Tuesday, January 30, 2024 11:08 AM
To: [email protected]
Cc: Joshi, Kunal1 <[email protected]>
Subject: [PATCH i-g-t 1/2] tests/kms_feature_discovery: make display test dynamic

currently kms_feature_discovery@display checks for number of display from 1 to 4, make it dynamic to check from 1 to n also reducing unwanted skips.

anyone who needs to check number of displays for a particular config can check kms_feature_discovery@display test result.

v2: skip if 0 outputs
test name fix

---
 tests/kms_feature_discovery.c | 36 +++++++----------------------------
 1 file changed, 7 insertions(+), 29 deletions(-)
tests/kms_feature_discovery.c +0 -4
index 5bca9ad76..2dd4efea4 100644
@@ -47,10 +47,6 @@
  * SUBTEST: display
  * Description: Make sure that we have display support.
  *
- * SUBTEST: display-%dx
- * Description: Make sure that we have display support with %arg[1]
- * 		outputs connected.
- *
  * SUBTEST: chamelium
  * Description: Make sure that Chamelium is configured and reachable.
  * Functionality: feature_discovery, chamelium @@ -69,8 +65,6 @@

* Description: Make sure that we have DP-MST configuration.
* Functionality: feature_discovery, mst
* Test category: functionality test
- *
- * arg[1].values: 1, 2, 3, 4
*/

static igt_display_t display;

tests/kms_feature_discovery.c +1 -21
@@ -92,11 +86,6 @@ igt_main {
 			igt_display_require(&display, fd);
 		}
 
-		igt_describe("Make sure that we have display support.");
-		igt_subtest("display") {
-			/* will skip because of the fixture */
-		}
-
 		igt_subtest_group {
 			volatile int output_count = 0;
 			igt_output_t *output;
@@ -117,26 +106,15 @@ igt_main {
 				for (int i = 0; i < display.n_outputs; i++) {
 
 	igt_output_set_pipe(&display.outputs[i], PIPE_NONE);
 				}
+				igt_require_f(output_count >= 0, "No
 display's connected\n");
 			}
 
-			igt_describe("Make sure that we can use at least 1
 output at the same time.");
-			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);
-			}
-
-			igt_describe("Make sure that we can use at least 3
 outputs at the same time.");
-			igt_subtest("display-3x") {
-				igt_require(output_count >= 3);
-			}
-
-			igt_describe("Make sure that we can use at least 4

outputs at the same time.");

tests/kms_feature_discovery.c +1 -2
-			igt_subtest("display-4x") {
-				igt_require(output_count >= 4);
+			igt_describe("Make sure that we can use at least n

output at the same time.");

tests/kms_feature_discovery.c +5 -0
+			igt_subtest_with_dynamic("display") {
+				int i;
+				for(i = 1; i <= output_count; i++)
+					igt_dynamic_f("%dx", i)
+						igt_require(output_count >=

i);

tests/kms_feature_discovery.c +0 -1
 			}
 		}
 
--

2.25.1

#3 lore raw

PATCH 2/2 HAX: please do not merge

In reply to Kunal Joshi

Only for testing please don't merge

---
 tests/intel-ci/fast-feedback.testlist | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
tests/intel-ci/fast-feedback.testlist +1 -1
index 662e49cc3..d0a0a9df1 100644
@@ -1,6 +1,6 @@
 # Try to load the driver if it's not available yet.
 igt@i915_module_load@load
-
+igt@kms_feature_discovery@display
 # Keep alphabetically sorted by default
 igt@core_auth@basic-auth
 igt@debugfs_test@read_all_entries
Signature · 1 line
2.25.1
#4 lore raw

✓ CI.xeBAT: success for make display test dynamic (rev2)

In reply to Kunal Joshi
== Series Details ==

== Series Details ==

Series: make display test dynamic (rev2)
URL : https://patchwork.freedesktop.org/series/129275/
State : success

== Summary ==

CI Bug Log - changes from XEIGT_7698_BAT -> XEIGTPW_10601_BAT
====================================================

Summary
-------

**SUCCESS**

No regressions found.

Participating hosts (4 -> 4)
------------------------------

No changes in participating hosts

Changes
-------

No changes found

Build changes
-------------

* IGT: IGT_7698 -> IGTPW_10601
* Linux: xe-696-a0325b172ae7077c52b074d9b531f4e3aa585d82 -> xe-699-c655e0fd28045dbaa581d04bf7cc266eec1c3457

IGTPW_10601: 10601
IGT_7698: af750f5e7eaad98d40d8c924eb5f05e99d3c668b @ https://gitlab.freedesktop.org/drm/igt-gpu-tools.git
xe-696-a0325b172ae7077c52b074d9b531f4e3aa585d82: a0325b172ae7077c52b074d9b531f4e3aa585d82 xe-699-c655e0fd28045dbaa581d04bf7cc266eec1c3457: c655e0fd28045dbaa581d04bf7cc266eec1c3457

== Logs ==

For more details see: https://intel-gfx-ci.01.org/tree/intel-xe/IGTPW_10601/index.html

#5 lore raw

✗ Fi.CI.BAT: failure for make display test dynamic (rev2)

In reply to Kunal Joshi
== Series Details ==

== Series Details ==

Series: make display test dynamic (rev2)
URL : https://patchwork.freedesktop.org/series/129275/
State : failure

== Summary ==

CI Bug Log - changes from CI_DRM_14193 -> IGTPW_10601
====================================================

Summary
-------

**FAILURE**

Serious unknown changes coming with IGTPW_10601 absolutely need to be verified manually.

If you think the reported changes have nothing to do with the changes
introduced in IGTPW_10601, please notify your bug team ([email protected]) to allow them to document this new failure mode, which will reduce false positives in CI.

External URL: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_10601/index.html

Participating hosts (34 -> 32)
------------------------------

Missing (2): fi-snb-2520m fi-pnv-d510

Possible new issues
-------------------

Here are the unknown changes that may have been introduced in IGTPW_10601:

### IGT changes ###

#### Possible regressions ####

* igt@kms_feature_discovery@display:
- bat-adlm-1: NOTRUN -> [SKIP][1]
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_10601/bat-adlm-1/igt@[email protected]
- fi-tgl-1115g4: NOTRUN -> [SKIP][2]
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_10601/fi-tgl-1115g4/igt@[email protected]

New tests
---------

New tests have been introduced between CI_DRM_14193 and IGTPW_10601:

### New IGT tests (2) ###

* igt@kms_feature_discovery@display@1x:
- Statuses : 26 pass(s)
- Exec time: [0.0] s

* igt@kms_feature_discovery@display@2x:
- Statuses : 4 pass(s)
- Exec time: [0.0] s

Known issues
------------

Here are the changes found in IGTPW_10601 that come from known issues:

### IGT changes ###

#### Issues hit ####

* igt@i915_selftest@live@gt_pm:
- bat-rpls-2: [PASS][3] -> [DMESG-FAIL][4] ([i915#10010])
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_14193/bat-rpls-2/igt@i915_selftest@live@gt_pm.html
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_10601/bat-rpls-2/igt@i915_selftest@live@gt_pm.html

* igt@kms_feature_discovery@display:
- fi-kbl-x1275: NOTRUN -> [SKIP][5] ([fdo#109271])
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_10601/fi-kbl-x1275/igt@[email protected]
- fi-kbl-guc: NOTRUN -> [SKIP][6] ([fdo#109271])
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_10601/fi-kbl-guc/igt@[email protected]
- bat-mtlp-6: NOTRUN -> [SKIP][7] ([i915#9792])
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_10601/bat-mtlp-6/igt@[email protected]

#### Possible fixes ####

* igt@i915_selftest@live@hangcheck:
- fi-skl-guc: [DMESG-FAIL][8] ([i915#10112]) -> [PASS][9]
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_14193/fi-skl-guc/igt@i915_selftest@[email protected]
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_10601/fi-skl-guc/igt@i915_selftest@[email protected]

[fdo#109271]: https://bugs.freedesktop.org/show_bug.cgi?id=109271
[i915#10010]: https://gitlab.freedesktop.org/drm/intel/issues/10010
[i915#10112]: https://gitlab.freedesktop.org/drm/intel/issues/10112
[i915#9792]: https://gitlab.freedesktop.org/drm/intel/issues/9792

Build changes
-------------

* CI: CI-20190529 -> None
* IGT: IGT_7698 -> IGTPW_10601

CI-20190529: 20190529
CI_DRM_14193: c655e0fd28045dbaa581d04bf7cc266eec1c3457 @ git://anongit.freedesktop.org/gfx-ci/linux
IGTPW_10601: 10601
IGT_7698: af750f5e7eaad98d40d8c924eb5f05e99d3c668b @ https://gitlab.freedesktop.org/drm/igt-gpu-tools.git

Testlist changes
----------------

-igt@kms_feature_discovery@display-1x
-igt@kms_feature_discovery@display-2x
-igt@kms_feature_discovery@display-3x
-igt@kms_feature_discovery@display-4x

== Logs ==

For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_10601/index.html