[igt-dev] [v3 1/6] Revert "syncobj_timeline: don't expect EINVAL for WAIT_UNSUBMITTED, | WAIT_AVAILABLE"

Sujaritha Sundaresan sujaritha.sundaresan at intel.com
Tue Nov 14 04:52:19 UTC 2023


From: Bhanuprakash Modem <bhanuprakash.modem at intel.com>

This reverts commit f6f5903348eff6510f8877043f9397a2a5cb94b3.

This patch is causing the regression in CI.

[1767/1775] Generating i915_tests.rst with a custom command
FAILED: docs/testplan/i915_tests.rst
./igt_doc.py --config ../tests/intel/i915_test_config.json --rest docs/testplan/i915_tests.rst --check-testlist --igt-build-path ./build
Warning: Documented igt at syncobj_timeline@invalid-multi-wait-all-available-unsubmitted doesn't exist on source files
Warning: Documented igt at syncobj_timeline@invalid-multi-wait-all-available-unsubmitted-signaled doesn't exist on source files
Warning: Documented igt at syncobj_timeline@invalid-multi-wait-all-available-unsubmitted-submitted doesn't exist on source files
Warning: Documented igt at syncobj_timeline@invalid-multi-wait-all-available-unsubmitted-submitted-signaled doesn't exist on source files
Warning: Documented igt at syncobj_timeline@invalid-multi-wait-available-unsubmitted doesn't exist on source files
Warning: Documented igt at syncobj_timeline@invalid-multi-wait-available-unsubmitted-signaled doesn't exist on source files
Warning: Documented igt at syncobj_timeline@invalid-multi-wait-available-unsubmitted-submitted doesn't exist on source files
Warning: Documented igt at syncobj_timeline@invalid-multi-wait-available-unsubmitted-submitted-signaled doesn't exist on source files
Warning: Documented igt at syncobj_timeline@invalid-single-wait-all-available-unsubmitted doesn't exist on source files
Warning: Documented igt at syncobj_timeline@invalid-single-wait-available-unsubmitted doesn't exist on source files
Warning: Missing documentation for igt at syncobj_timeline@etime-multi-wait-all-available-unsubmitted
Warning: Missing documentation for igt at syncobj_timeline@etime-multi-wait-all-available-unsubmitted-signaled
Warning: Missing documentation for igt at syncobj_timeline@etime-multi-wait-all-available-unsubmitted-submitted
Warning: Missing documentation for igt at syncobj_timeline@etime-multi-wait-all-available-unsubmitted-submitted-signaled
Warning: Missing documentation for igt at syncobj_timeline@etime-multi-wait-available-unsubmitted
Warning: Missing documentation for igt at syncobj_timeline@etime-single-wait-all-available-unsubmitted
Warning: Missing documentation for igt at syncobj_timeline@etime-single-wait-available-unsubmitted
Warning: Missing documentation for igt at syncobj_timeline@multi-wait-available-unsubmitted-signaled
Warning: Missing documentation for igt at syncobj_timeline@multi-wait-available-unsubmitted-submitted
Warning: Missing documentation for igt at syncobj_timeline@multi-wait-available-unsubmitted-submitted-signaled
Please refer: docs/test_documentation.md for more details
[1771/1775] Compiling C object runner/runner_test.p/runner_tests.c.o
ninja: build stopped: subcommand failed.

Cc: Erik Kurzinger <ekurzinger at nvidia.com>
Cc: Zbigniew Kempczyński <zbigniew.kempczynski at intel.com>
Cc: Simon Ser <contact at emersion.fr>
Signed-off-by: Bhanuprakash Modem <bhanuprakash.modem at intel.com>
Acked-by: Juha-Pekka Heikkila <juhapekka.heikkila at gmail.com>
---
 tests/syncobj_timeline.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/syncobj_timeline.c b/tests/syncobj_timeline.c
index 0422bca51..b4e1d093a 100644
--- a/tests/syncobj_timeline.c
+++ b/tests/syncobj_timeline.c
@@ -1782,7 +1782,7 @@ igt_main
 						WAIT_SIGNALED)) != 1)
 			continue;
 
-		if ((flags & WAIT_UNSUBMITTED) && !((flags & WAIT_FOR_SUBMIT) || (flags & WAIT_AVAILABLE)))
+		if ((flags & WAIT_UNSUBMITTED) && !(flags & WAIT_FOR_SUBMIT))
 			err = -EINVAL;
 		else if (!(flags & WAIT_SIGNALED) && !((flags & WAIT_SUBMITTED) && (flags & WAIT_AVAILABLE)))
 			err = -ETIME;
@@ -1851,7 +1851,7 @@ igt_main
 			continue;
 
 		err = 0;
-		if ((flags & WAIT_UNSUBMITTED) && !((flags & WAIT_FOR_SUBMIT) || (flags & WAIT_AVAILABLE))) {
+		if ((flags & WAIT_UNSUBMITTED) && !(flags & WAIT_FOR_SUBMIT)) {
 			err = -EINVAL;
 		} else if (flags & WAIT_ALL) {
 			if (flags & (WAIT_UNSUBMITTED | WAIT_SUBMITTED))
-- 
2.25.1



More information about the igt-dev mailing list