tests/kms_frontbuffer_tracking: Make sure GPU is quiescent before handling assertions, v2.

PATCH New Maarten Lankhorst 2 participants 3 messages Dec 13, 2018

Share & tools

Maarten Lankhorst

author

2018-12-13 13:32 UTC #0 lore raw

PATCH 1/1 tests/kms_frontbuffer_tracking: Make sure GPU is quiescent before handling assertions, v2.

Typically PSR enables in around 136 ms, but on some tests the we have to explicitly make sure that the gpu is idle before rendering.

Otherwise, sometimes we wait for the background flusher to finish, which will take at least a second longer, and causes the wait for PSR to timeout.

On kms_frontbuffer_tracking:
Starting subtest: psr-2p-scndscrn-shrfb-plflip-blt psr_active(debugfs_fd, true) took 136ms psr_active(debugfs_fd, true) took 136ms psr_active(debugfs_fd, true) took 350ms psr_active(debugfs_fd, true) took 136ms psr_active(debugfs_fd, true) took 1598ms

Changes since v1:
- Do not call gem_quiescent_gpu on modesetfrombusy subtest, or we get a timeout.

Cc: Dhinakaran Pandiyan <[email protected]>
Cc: José Roberto de Souza <[email protected]>
Cc: Chris Wilson <[email protected]>
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=108733

Reviewed-by Daniel Vetter <[email protected]> #v1

---
 tests/kms_frontbuffer_tracking.c | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

tests/kms_frontbuffer_tracking.c +8 -2

index 276ef83ce386..5ab283197685 100644
@@ -1551,9 +1551,11 @@ static void do_flush(const struct test_mode *t)
 
 #define DRRS_ASSERT_FLAGS		(7 << 8)
 #define ASSERT_DRRS_HIGH		(1 << 8)
-#define ASSERT_DRRS_LOW		(1 << 9)
+#define ASSERT_DRRS_LOW			(1 << 9)
 #define ASSERT_DRRS_INACTIVE		(1 << 10)
 
+#define ASSERT_NO_IDLE_GPU		(1 << 11)
+
 static int adjust_assertion_flags(const struct test_mode *t, int flags)
 {
 	if (!(flags & DONT_ASSERT_FEATURE_STATUS)) {

@@ -1642,6 +1644,10 @@ static void __do_assertions(const struct test_mode *t, int flags,
 {
 	flags = adjust_assertion_flags(t, flags);
 
+	/* Make sure any submitted rendering is now idle. */
+	if (!(flags & ASSERT_NO_IDLE_GPU))
+		gem_quiescent_gpu(drm.fd);
+
 	igt_debug("checking asserts in line %i\n", line);
 
 	wait_user(2, "Paused before assertions.");

@@ -2691,7 +2697,7 @@ static void modesetfrombusy_subtest(const struct test_mode *t)
 	params->primary.fb = &fb2;
 	set_mode_for_params(params);
 
-	do_assertions(0);
+	do_assertions(ASSERT_NO_IDLE_GPU);
 
 	stop_busy_thread();

Signature · 6 lines

2.19.2

_______________________________________________
igt-dev mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/igt-dev

Patchwork

2018-12-13 13:54 UTC #1 lore raw

[igt-dev] ✓ Fi.CI.BAT: success for tests/kms_frontbuffer_tracking: Make sure GPU is quiescent before handling assertions, v2.

== Series Details ==

Series: tests/kms_frontbuffer_tracking: Make sure GPU is quiescent before handling assertions, v2.
URL : https://patchwork.freedesktop.org/series/53995/
State : success

== Summary ==

CI Bug Log - changes from CI_DRM_5311 -> IGTPW_2153
====================================================

Summary
-------

**WARNING**

Minor unknown changes coming with IGTPW_2153 need to be verified manually.

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

External URL: https://patchwork.freedesktop.org/api/1.0/series/53995/revisions/1/mbox/

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

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

### IGT changes ###

#### Warnings ####

* igt@kms_pipe_crc_basic@nonblocking-crc-pipe-c:
- fi-kbl-7567u: PASS -> SKIP +33

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

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

### IGT changes ###

#### Issues hit ####

* igt@i915_module_load@reload-with-fault-injection:
- fi-kbl-7567u: PASS -> DMESG-WARN [fdo#105602] / [fdo#108529] +1

* igt@kms_chamelium@common-hpd-after-suspend:
- fi-skl-6700k2: PASS -> INCOMPLETE [fdo#104108] / [fdo#105524] / [k.org#199541]

* igt@kms_flip@basic-flip-vs-dpms:
- fi-icl-u3: NOTRUN -> DMESG-WARN [fdo#108924] / [fdo#109044]

* igt@pm_rpm@module-reload:
- fi-kbl-7567u: PASS -> DMESG-WARN [fdo#108529]

* {igt@runner@aborted}:
- fi-icl-u3: NOTRUN -> FAIL [fdo#108924]
- fi-icl-y: NOTRUN -> FAIL [fdo#108070]

#### Possible fixes ####

* igt@gem_ctx_create@basic-files:
- fi-kbl-7560u: INCOMPLETE [fdo#103665] -> PASS

{name}: This element is suppressed. This means it is ignored when computing
the status of the difference (SUCCESS, WARNING, or FAILURE).

Participating hosts (47 -> 45)
------------------------------

Additional (2): fi-icl-y fi-icl-u3
Missing (4): fi-kbl-soraka fi-ctg-p8600 fi-byt-squawks fi-ilk-m540

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

* IGT: IGT_4746 -> IGTPW_2153

CI_DRM_5311: a42fd8bf199784ee4ff1cdb5ee03eedd9a535d4a @ git://anongit.freedesktop.org/gfx-ci/linux
IGTPW_2153: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_2153/
IGT_4746: 2c793666d8c8328733f5769b16ae5858fee97f3f @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools

== Logs ==

For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_2153/
_______________________________________________
igt-dev mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/igt-dev

Patchwork

2018-12-13 17:23 UTC #2 lore raw

[igt-dev] ✓ Fi.CI.IGT: success for tests/kms_frontbuffer_tracking: Make sure GPU is quiescent before handling assertions, v2.

In reply to Maarten Lankhorst

== Series Details ==

Series: tests/kms_frontbuffer_tracking: Make sure GPU is quiescent before handling assertions, v2.
URL : https://patchwork.freedesktop.org/series/53995/
State : success

== Summary ==

CI Bug Log - changes from CI_DRM_5311_full -> IGTPW_2153_full
====================================================

Summary
-------

**WARNING**

Minor unknown changes coming with IGTPW_2153_full need to be verified manually.

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

External URL: https://patchwork.freedesktop.org/api/1.0/series/53995/revisions/1/mbox/

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

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

### IGT changes ###

#### Warnings ####

* igt@pm_rc6_residency@rc6-accuracy:
- shard-kbl: SKIP -> PASS
- shard-snb: SKIP -> PASS

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

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

### IGT changes ###

#### Issues hit ####

* igt@gem_exec_schedule@pi-ringfull-bsd:
- shard-apl: NOTRUN -> FAIL [fdo#103158]

* igt@kms_busy@extended-modeset-hang-newfb-with-reset-render-b:
- shard-snb: NOTRUN -> DMESG-WARN [fdo#107956]

* igt@kms_ccs@pipe-a-crc-sprite-planes-basic:
- shard-glk: PASS -> FAIL [fdo#108145]

* igt@kms_cursor_crc@cursor-128x128-random:
- shard-apl: PASS -> FAIL [fdo#103232] +1

* igt@kms_cursor_crc@cursor-128x42-random:
- shard-glk: PASS -> FAIL [fdo#103232] +5

* igt@kms_cursor_crc@cursor-256x256-suspend:
- shard-glk: PASS -> INCOMPLETE [fdo#103359] / [k.org#198133]

* igt@kms_cursor_crc@cursor-256x85-onscreen:
- shard-kbl: PASS -> FAIL [fdo#103232]

* igt@kms_flip@2x-flip-vs-expired-vblank:
- shard-glk: PASS -> FAIL [fdo#105363]

* igt@kms_frontbuffer_tracking@fbc-1p-primscrn-spr-indfb-draw-mmap-wc:
- shard-apl: PASS -> FAIL [fdo#103167]

* igt@kms_frontbuffer_tracking@fbc-1p-primscrn-spr-indfb-move:
- shard-glk: PASS -> FAIL [fdo#103167] +8

* igt@kms_plane@pixel-format-pipe-a-planes-source-clamping:
- shard-glk: PASS -> FAIL [fdo#108948]
- shard-apl: PASS -> FAIL [fdo#108948]

* igt@kms_plane_multiple@atomic-pipe-b-tiling-y:
- shard-glk: PASS -> FAIL [fdo#103166] +5

* igt@kms_plane_multiple@atomic-pipe-c-tiling-y:
- shard-apl: PASS -> FAIL [fdo#103166] +1

* igt@perf@oa-exponents:
- shard-glk: PASS -> FAIL [fdo#105483]

#### Possible fixes ####

* igt@kms_busy@extended-pageflip-modeset-hang-oldfb-render-a:
- shard-glk: DMESG-WARN [fdo#107956] -> PASS

* igt@kms_cursor_crc@cursor-256x256-sliding:
- shard-glk: FAIL [fdo#103232] -> PASS

* igt@kms_cursor_crc@cursor-256x85-sliding:
- shard-kbl: FAIL [fdo#103232] -> PASS
- shard-apl: FAIL [fdo#103232] -> PASS +1

* igt@kms_cursor_crc@cursor-512x512-onscreen:
- shard-apl: INCOMPLETE [fdo#103927] -> SKIP

* igt@kms_flip@modeset-vs-vblank-race:
- shard-apl: FAIL [fdo#103060] -> PASS

* igt@kms_frontbuffer_tracking@fbc-1p-primscrn-spr-indfb-draw-mmap-cpu:
- shard-apl: FAIL [fdo#103167] -> PASS +1

* igt@kms_frontbuffer_tracking@fbc-2p-primscrn-spr-indfb-onoff:
- shard-glk: FAIL [fdo#103167] -> PASS

* igt@kms_frontbuffer_tracking@fbcpsr-1p-primscrn-indfb-pgflip-blt:
- shard-snb: INCOMPLETE [fdo#105411] / [fdo#107469] -> SKIP

* igt@kms_plane@plane-position-covered-pipe-a-planes:
- shard-apl: FAIL [fdo#103166] -> PASS +2

* igt@kms_plane@plane-position-covered-pipe-b-planes:
- shard-glk: FAIL [fdo#103166] -> PASS +1

* igt@kms_plane_alpha_blend@pipe-b-constant-alpha-max:
- shard-glk: FAIL [fdo#108145] -> PASS +2

* igt@kms_rotation_crc@multiplane-rotation-cropping-top:
- shard-glk: DMESG-FAIL [fdo#105763] / [fdo#106538] -> PASS

* igt@kms_vblank@pipe-b-ts-continuation-suspend:
- shard-kbl: INCOMPLETE [fdo#103665] -> PASS

#### Warnings ####

* igt@i915_suspend@shrink:
- shard-glk: DMESG-WARN [fdo#108784] -> INCOMPLETE [fdo#103359] / [fdo#106886] / [k.org#198133]

Participating hosts (7 -> 5)
------------------------------

Missing (2): shard-skl shard-iclb

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

* IGT: IGT_4746 -> IGTPW_2153
* Piglit: piglit_4509 -> None

== Logs ==