lib/psr: Fix skips on kms_frontbuffer_tracking on !PSR capable platforms.
PATCH 1/1 lib/psr: Fix skips on kms_frontbuffer_tracking on !PSR capable platforms.
We unconditionally call psr_disable in kms_frontbuffer_tracking, which causes a skipping of all tests on PSR incapable platforms. Use a proper int in psr_set() and use -1 to denote disable.
--- lib/igt_psr.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
lib/igt_psr.c +4 -4
@@ -100,13 +100,13 @@ static void restore_psr_debugfs(int sig)psr_write (psr_restore_debugfs_fd,"0" ); } -static bool psr_set (int debugfs_fd,enum psr_mode mode) +static bool psr_set (int debugfs_fd,int mode) {int ret; ret =has_psr_debugfs (debugfs_fd);if (ret == -ENODEV ) { -igt_skip ("PSR not available\n" ); +igt_skip_on_f (mode >=PSR_MODE_1 ,"PSR not available\n" );return false; }
@@ -117,7 +117,7 @@ static bool psr_set(int debugfs_fd, enum psr_mode mode)* version enabled and the PSR version of the test, it will * fail in the first psr_wait_entry() of the test. */ - ret =psr_modparam_set (mode <=PSR_MODE_2 ); + ret =psr_modparam_set (mode >=PSR_MODE_1 ); }else {const char *debug_val;
@@ -155,7 +155,7 @@ bool psr_enable(int debugfs_fd, enum psr_mode mode)bool psr_disable (int debugfs_fd) {/* Any mode different than PSR_MODE_1/2 will disable PSR */ -return psr_set (debugfs_fd,PSR_MODE_2 +1 ); +return psr_set (debugfs_fd,-1 ); }bool psr_sink_support (int debugfs_fd,enum psr_mode mode)
Signature · 6 lines
2.20.1 _______________________________________________ igt-dev mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/igt-dev
Patchwork
CI[igt-dev] ✗ Fi.CI.BAT: failure for lib/psr: Fix skips on kms_frontbuffer_tracking on !PSR capable platforms.
== Series Details ==
== Series Details ==
Series: lib/psr: Fix skips on kms_frontbuffer_tracking on !PSR capable platforms.
URL : https://patchwork.freedesktop.org/series/55837/
State : failure
== Summary ==
CI Bug Log - changes from IGT_4794 -> IGTPW_2307
====================================================
Summary
-------
**FAILURE**
Serious unknown changes coming with IGTPW_2307 absolutely need to be verified manually.
If you think the reported changes have nothing to do with the changes introduced in IGTPW_2307, 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/55837/revisions/1/mbox/
Possible new issues
-------------------
Here are the unknown changes that may have been introduced in IGTPW_2307:
### IGT changes ###
#### Possible regressions ####
* igt@kms_chamelium@hdmi-hpd-fast:
- fi-kbl-7500u: PASS -> FAIL
Known issues
------------
Here are the changes found in IGTPW_2307 that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@amdgpu/amd_basic@userptr:
- fi-kbl-8809g: PASS -> DMESG-WARN [fdo#108965]
* igt@kms_busy@basic-flip-b:
- fi-gdg-551: PASS -> FAIL [fdo#103182]
* igt@kms_frontbuffer_tracking@basic:
- fi-byt-clapper: PASS -> FAIL [fdo#103167]
* igt@kms_pipe_crc_basic@suspend-read-crc-pipe-a:
- fi-byt-clapper: PASS -> FAIL [fdo#103191] / [fdo#107362]
[fdo#103167]: https://bugs.freedesktop.org/show_bug.cgi?id=103167
[fdo#103182]: https://bugs.freedesktop.org/show_bug.cgi?id=103182
[fdo#103191]: https://bugs.freedesktop.org/show_bug.cgi?id=103191
[fdo#107362]: https://bugs.freedesktop.org/show_bug.cgi?id=107362
[fdo#108965]: https://bugs.freedesktop.org/show_bug.cgi?id=108965
Participating hosts (45 -> 41)
------------------------------
Missing (4): fi-kbl-soraka fi-ilk-m540 fi-byt-squawks fi-bsw-cyan
Build changes
-------------
* IGT: IGT_4794 -> IGTPW_2307
CI_DRM_5492: bc2fcdf82a5b94f015126dfa9db03f88feb9ae17 @ git://anongit.freedesktop.org/gfx-ci/linux
IGTPW_2307: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_2307/
IGT_4794: 4a94878797999d1d2f7d224c6cf2e2855cd3109a @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_2307/
_______________________________________________
igt-dev mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/igt-dev
Patchwork
CI[igt-dev] ✓ Fi.CI.BAT: success for lib/psr: Fix skips on kms_frontbuffer_tracking on !PSR capable platforms. (rev2)
In reply to Maarten Lankhorst== Series Details ==
== Series Details ==
Series: lib/psr: Fix skips on kms_frontbuffer_tracking on !PSR capable platforms. (rev2)
URL : https://patchwork.freedesktop.org/series/55837/
State : success
== Summary ==
CI Bug Log - changes from CI_DRM_5494 -> IGTPW_2308
====================================================
Summary
-------
**SUCCESS**
No regressions found.
External URL: https://patchwork.freedesktop.org/api/1.0/series/55837/revisions/2/mbox/
Known issues
------------
Here are the changes found in IGTPW_2308 that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@kms_chamelium@common-hpd-after-suspend:
- fi-skl-6700k2: PASS -> INCOMPLETE [fdo#104108]
* igt@kms_frontbuffer_tracking@basic:
- fi-byt-clapper: PASS -> FAIL [fdo#103167]
* igt@kms_pipe_crc_basic@suspend-read-crc-pipe-b:
- fi-byt-clapper: PASS -> FAIL [fdo#103191] / [fdo#107362] +2
#### Possible fixes ####
* igt@kms_busy@basic-flip-a:
- fi-kbl-7567u: {SKIP} [fdo#109271] / [fdo#109278] -> PASS +2
* igt@kms_busy@basic-flip-b:
- fi-gdg-551: FAIL [fdo#103182] -> PASS
* igt@kms_chamelium@common-hpd-after-suspend:
- fi-kbl-7567u: WARN [fdo#109380] -> PASS
* igt@kms_pipe_crc_basic@nonblocking-crc-pipe-c:
- fi-kbl-7567u: {SKIP} [fdo#109271] -> PASS +33
{name}: This element is suppressed. This means it is ignored when computing
the status of the difference (SUCCESS, WARNING, or FAILURE).
[fdo#103167]: https://bugs.freedesktop.org/show_bug.cgi?id=103167
[fdo#103182]: https://bugs.freedesktop.org/show_bug.cgi?id=103182
[fdo#103191]: https://bugs.freedesktop.org/show_bug.cgi?id=103191
[fdo#104108]: https://bugs.freedesktop.org/show_bug.cgi?id=104108
[fdo#107362]: https://bugs.freedesktop.org/show_bug.cgi?id=107362
[fdo#109271]: https://bugs.freedesktop.org/show_bug.cgi?id=109271
[fdo#109278]: https://bugs.freedesktop.org/show_bug.cgi?id=109278
[fdo#109380]: https://bugs.freedesktop.org/show_bug.cgi?id=109380
Participating hosts (43 -> 40)
------------------------------
Additional (1): fi-skl-6700hq
Missing (4): fi-kbl-soraka fi-kbl-7560u fi-bsw-cyan fi-ilk-m540
Build changes
-------------
* IGT: IGT_4795 -> IGTPW_2308
CI_DRM_5494: 543c074ff6a401b2bca5333234a9c13c4b0a5152 @ git://anongit.freedesktop.org/gfx-ci/linux
IGTPW_2308: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_2308/
IGT_4795: 031715e369cf01aecbe293910211e80e51995ffb @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_2308/
_______________________________________________
igt-dev mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/igt-dev
Patchwork
CI[igt-dev] ✓ Fi.CI.IGT: success for lib/psr: Fix skips on kms_frontbuffer_tracking on !PSR capable platforms. (rev2)
In reply to Maarten Lankhorst== Series Details ==
== Series Details ==
Series: lib/psr: Fix skips on kms_frontbuffer_tracking on !PSR capable platforms. (rev2)
URL : https://patchwork.freedesktop.org/series/55837/
State : success
== Summary ==
CI Bug Log - changes from CI_DRM_5494_full -> IGTPW_2308_full
====================================================
Summary
-------
**SUCCESS**
No regressions found.
External URL: https://patchwork.freedesktop.org/api/1.0/series/55837/revisions/2/mbox/
Known issues
------------
Here are the changes found in IGTPW_2308_full that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@gem_eio@in-flight-contexts-10ms:
- shard-apl: NOTRUN -> DMESG-WARN [fdo#109467]
* igt@kms_available_modes_crc@available_mode_test_crc:
- shard-apl: PASS -> FAIL [fdo#106641]
- shard-glk: PASS -> FAIL [fdo#106641]
* igt@kms_busy@extended-modeset-hang-newfb-render-a:
- shard-kbl: NOTRUN -> DMESG-WARN [fdo#107956]
- shard-apl: NOTRUN -> DMESG-WARN [fdo#107956]
* igt@kms_busy@extended-pageflip-modeset-hang-oldfb-render-c:
- shard-glk: NOTRUN -> DMESG-WARN [fdo#107956] +1
* igt@kms_ccs@pipe-b-crc-sprite-planes-basic:
- shard-glk: PASS -> FAIL [fdo#108145]
* igt@kms_color@pipe-b-ctm-max:
- shard-apl: PASS -> FAIL [fdo#108147]
* igt@kms_color@pipe-b-degamma:
- shard-apl: PASS -> FAIL [fdo#104782] +1
* igt@kms_color@pipe-c-degamma:
- shard-kbl: PASS -> FAIL [fdo#104782]
- shard-apl: NOTRUN -> FAIL [fdo#104782]
* igt@kms_cursor_crc@cursor-128x42-onscreen:
- shard-glk: PASS -> FAIL [fdo#103232] +6
* igt@kms_cursor_crc@cursor-128x42-random:
- shard-apl: NOTRUN -> FAIL [fdo#103232]
* igt@kms_cursor_crc@cursor-64x21-onscreen:
- shard-kbl: PASS -> FAIL [fdo#103232] +1
* igt@kms_cursor_crc@cursor-64x21-random:
- shard-apl: PASS -> FAIL [fdo#103232] +6
* igt@kms_cursor_crc@cursor-alpha-transparent:
- shard-glk: NOTRUN -> FAIL [fdo#109350]
- shard-apl: NOTRUN -> FAIL [fdo#109350]
- shard-kbl: NOTRUN -> FAIL [fdo#109350] * igt@kms_cursor_legacy@2x-long-nonblocking-modeset-vs-cursor-atomic:
- shard-glk: NOTRUN -> FAIL [fdo#105454] / [fdo#106509]
* igt@kms_pipe_crc_basic@suspend-read-crc-pipe-b:
- shard-glk: PASS -> INCOMPLETE [fdo#103359] / [k.org#198133]
* igt@kms_plane_multiple@atomic-pipe-a-tiling-none:
- shard-glk: NOTRUN -> FAIL [fdo#103166]
* igt@kms_plane_multiple@atomic-pipe-a-tiling-x:
- shard-apl: PASS -> FAIL [fdo#103166] +1
* igt@kms_plane_multiple@atomic-pipe-b-tiling-none:
- shard-apl: NOTRUN -> FAIL [fdo#103166] +1
* igt@kms_plane_multiple@atomic-pipe-c-tiling-y:
- shard-glk: PASS -> FAIL [fdo#103166] +2
* igt@kms_properties@crtc-properties-legacy:
- shard-hsw: PASS -> DMESG-WARN [fdo#102614]
* igt@sw_sync@sync_busy_fork:
- shard-hsw: PASS -> INCOMPLETE [fdo#103540]
#### Possible fixes ####
* igt@kms_cursor_crc@cursor-256x256-suspend:
- shard-kbl: FAIL [fdo#103191] / [fdo#103232] -> PASS
- shard-glk: FAIL [fdo#103232] -> PASS
- shard-apl: FAIL [fdo#103191] / [fdo#103232] -> PASS * igt@kms_cursor_crc@cursor-64x21-sliding:
- shard-apl: FAIL [fdo#103232] -> PASS
* igt@kms_flip@flip-vs-expired-vblank:
- shard-apl: INCOMPLETE [fdo#103927] -> PASS
* igt@kms_frontbuffer_tracking@fbc-1p-primscrn-spr-indfb-draw-render:
- shard-snb: {SKIP} [fdo#109271] -> PASS +67
* igt@kms_frontbuffer_tracking@fbc-1p-shrfb-fliptrack:
- shard-glk: {SKIP} [fdo#109271] -> PASS +117
* igt@kms_frontbuffer_tracking@fbc-2p-primscrn-cur-indfb-draw-pwrite:
- shard-hsw: {SKIP} [fdo#109271] -> PASS +143
* igt@kms_frontbuffer_tracking@fbc-farfromfence:
- shard-kbl: {SKIP} [fdo#109271] -> PASS +67
* igt@kms_frontbuffer_tracking@fbc-rgb101010-draw-render:
- shard-apl: {SKIP} [fdo#109271] -> PASS +63
* igt@kms_plane_multiple@atomic-pipe-a-tiling-y:
- shard-apl: FAIL [fdo#103166] -> PASS +1
* igt@kms_rotation_crc@multiplane-rotation-cropping-top:
- shard-kbl: FAIL [fdo#109016] -> PASS
* igt@kms_setmode@basic:
- shard-kbl: FAIL [fdo#99912] -> PASS
* igt@prime_busy@hang-bsd:
- shard-hsw: FAIL [fdo#108807] -> PASS
* igt@prime_mmap_kms@buffer-sharing:
- shard-snb: INCOMPLETE [fdo#105411] / [fdo#107469] -> PASS
#### Warnings ####
* igt@gem_eio@in-flight-immediate:
- shard-kbl: DMESG-FAIL [fdo#109467] -> DMESG-WARN [fdo#109467]
* igt@kms_frontbuffer_tracking@fbc-1p-primscrn-spr-indfb-draw-pwrite:
- shard-apl: {SKIP} [fdo#109271] -> FAIL [fdo#103167] +2
* igt@kms_frontbuffer_tracking@fbc-2p-primscrn-spr-indfb-onoff:
- shard-glk: {SKIP} [fdo#109271] -> FAIL [fdo#103167] +9
* igt@kms_frontbuffer_tracking@fbc-stridechange:
- shard-hsw: {SKIP} [fdo#109271] -> FAIL [fdo#105682]
{name}: This element is suppressed. This means it is ignored when computing
the status of the difference (SUCCESS, WARNING, or FAILURE).
[fdo#102614]: https://bugs.freedesktop.org/show_bug.cgi?id=102614
[fdo#103166]: https://bugs.freedesktop.org/show_bug.cgi?id=103166
[fdo#103167]: https://bugs.freedesktop.org/show_bug.cgi?id=103167
[fdo#103191]: https://bugs.freedesktop.org/show_bug.cgi?id=103191
[fdo#103232]: https://bugs.freedesktop.org/show_bug.cgi?id=103232
[fdo#103359]: https://bugs.freedesktop.org/show_bug.cgi?id=103359
[fdo#103540]: https://bugs.freedesktop.org/show_bug.cgi?id=103540
[fdo#103927]: https://bugs.freedesktop.org/show_bug.cgi?id=103927
[fdo#104782]: https://bugs.freedesktop.org/show_bug.cgi?id=104782
[fdo#105411]: https://bugs.freedesktop.org/show_bug.cgi?id=105411
[fdo#105454]: https://bugs.freedesktop.org/show_bug.cgi?id=105454
[fdo#105682]: https://bugs.freedesktop.org/show_bug.cgi?id=105682
[fdo#106509]: https://bugs.freedesktop.org/show_bug.cgi?id=106509
[fdo#106641]: https://bugs.freedesktop.org/show_bug.cgi?id=106641
[fdo#107469]: https://bugs.freedesktop.org/show_bug.cgi?id=107469
[fdo#107956]: https://bugs.freedesktop.org/show_bug.cgi?id=107956
[fdo#108145]: https://bugs.freedesktop.org/show_bug.cgi?id=108145
[fdo#108147]: https://bugs.freedesktop.org/show_bug.cgi?id=108147
[fdo#108807]: https://bugs.freedesktop.org/show_bug.cgi?id=108807
[fdo#109016]: https://bugs.freedesktop.org/show_bug.cgi?id=109016
[fdo#109271]: https://bugs.freedesktop.org/show_bug.cgi?id=109271
[fdo#109278]: https://bugs.freedesktop.org/show_bug.cgi?id=109278
[fdo#109350]: https://bugs.freedesktop.org/show_bug.cgi?id=109350
[fdo#109467]: https://bugs.freedesktop.org/show_bug.cgi?id=109467
[fdo#99912]: https://bugs.freedesktop.org/show_bug.cgi?id=99912
[k.org#198133]: https://bugzilla.kernel.org/show_bug.cgi?id=198133
Participating hosts (6 -> 5)
------------------------------
Missing (1): shard-skl
Build changes
-------------
* IGT: IGT_4795 -> IGTPW_2308
* Piglit: piglit_4509 -> None
CI_DRM_5494: 543c074ff6a401b2bca5333234a9c13c4b0a5152 @ git://anongit.freedesktop.org/gfx-ci/linux
IGTPW_2308: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_2308/
IGT_4795: 031715e369cf01aecbe293910211e80e51995ffb @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
piglit_4509: fdc5a4ca11124ab8413c7988896eec4c97336694 @ git://anongit.freedesktop.org/piglit
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_2308/
_______________________________________________
igt-dev mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/igt-dev
Quoted 5 lines · Maarten Lankhorst
We unconditionally call
psr_disableinkms_frontbuffer_tracking, which
causes a skipping of all tests on PSR incapable platforms. Use a proper
int inpsr_set()and use -1 to denote disable.
The call to disable_features() is the one causing problems? Could share one report with this problem?
If this is the case would not be easier just do this?
static bool disable_features(const struct test_mode *t)
{
bool ret = true;
if (t->feature == FEATURE_DEFAULT)
return false;
fbc_disable();
drrs_disable();
if (psr.can_test)
ret = psr_disable(drm.debugfs);
return ret;
}Quoted 49 lines
Cc Dhinakaran Pandiyan <[email protected]>Cc José Roberto de Souza <[email protected]>Signed-off-by Maarten Lankhorst <[email protected]>--- lib/igt_psr.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)lib/igt_psr.c +2
-2@@ -100,13 +100,13 @@ static void restore_psr_debugfs(int sig)psr_write (psr_restore_debugfs_fd,"0" ); } -static bool psr_set (int debugfs_fd,enum psr_mode mode) +static bool psr_set (int debugfs_fd,int mode) {int ret; ret =has_psr_debugfs (debugfs_fd);if (ret == -ENODEV ) { -igt_skip ("PSR not available\n" ); +igt_skip_on_f (mode >=PSR_MODE_1 ,"PSR not available\n");return false; }@@ -117,7 +117,7 @@ static bool psr_set(int debugfs_fd, enum psr_mode mode) * version enabled and the PSR version of the test, itwill
lib/igt_psr.c +2
-2* fail in the first psr_wait_entry() of the test. */ - ret =psr_modparam_set (mode <=PSR_MODE_2 ); + ret =psr_modparam_set (mode >=PSR_MODE_1 ); }else {const char *debug_val;@@ -155,7 +155,7 @@ bool psr_enable(int debugfs_fd, enum psr_mode mode)bool psr_disable (int debugfs_fd) {/* Any mode different than PSR_MODE_1/2 will disable PSR */ -return psr_set (debugfs_fd,PSR_MODE_2 +1 ); +return psr_set (debugfs_fd,-1 ); }
Quoted 1 line
bool
psr_sink_support(int debugfs_fd, enum psr_mode mode)
_______________________________________________
igt-dev mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/igt-dev