lib/igt_gt: Move assert with setting 'reset' parameter after IGT env check
PATCH 1/1 lib/igt_gt: Move assert with setting 'reset' parameter after IGT env check
We are trying to set reset parameter earlier than checking IGT env. Let's move it after checking IGT env to avoid setting reset parameter when hang injection is disabled.
--- lib/igt_gt.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
lib/igt_gt.c +3 -3
@@ -170,15 +170,15 @@ igt_hang_t igt_allow_hang(int fd, unsigned ctx, unsigned flags)*/ igt_require_gem (fd); -igt_assert (igt_sysfs_set_parameter - (fd,"reset" ,"%d" ,INT_MAX /* any reset method */ )); -if (!igt_check_boolean_env_var ("IGT_HANG" , true))igt_skip ("hang injection disabled by user" );gem_context_require_bannable (fd);if (!igt_check_boolean_env_var ("IGT_HANG_WITHOUT_RESET" , false))igt_require (has_gpu_reset (fd)); +igt_assert (igt_sysfs_set_parameter + (fd,"reset" ,"%d" ,INT_MAX /* any reset method */ )); +if ((flags &HANG_ALLOW_CAPTURE ) ==0 ) { param.param =I915_CONTEXT_PARAM_NO_ERROR_CAPTURE ; param.value =1 ;
Signature · 6 lines
2.17.2 _______________________________________________ igt-dev mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/igt-dev
Quoting Katarzyna Dec (2019-01-23 14:04:04)
Quoted 6 lines
We are trying to set reset parameter earlier than checking IGT env. Let's move it after checking IGT env to avoid setting reset parameter when hang injection is disabled.
Cc Chris Wilson <[email protected]>Signed-off-by Katarzyna Dec <[email protected]>
I can see the sense in that. Can we kill the env var though?
If the system is not suitable for reset tests, can we not derive that from querying the system rather than rely on the user? We have better means of test selection now than just setting env var (and if not, why not) so afaik CI is not using it.
-Chris
_______________________________________________
igt-dev mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/igt-dev
Quoted 9 lines · Chris Wilson
Quoting Katarzyna Dec (2019-01-23 14:04:04)
Quoted 6 lines
We are trying to set reset parameter earlier than checking IGT env. Let's move it after checking IGT env to avoid setting reset parameter when hang injection is disabled.
Cc Chris Wilson <[email protected]>Signed-off-by Katarzyna Dec <[email protected]>
Quoted 7 lines
I can see the sense in that. Can we kill the env var though?
Reviewed-by Chris Wilson <[email protected]>If the system is not suitable for reset tests, can we not derive that from querying the system rather than rely on the user? We have better means of test selection now than just setting env var (and if not, why not) so afaik CI is not using it.
Yeah I thought the plan for these was to add some kernel patch (in drm-intel-internal only ofc) which tells igt that reset isn't a thing. We've definitely had this years ago, when there was no reset on gen2. But maybe the wheels fell off on that one due to lack of use, dunno. -Daniel
Signature · 7 lines
Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch _______________________________________________ igt-dev mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/igt-dev
Patchwork
CI[igt-dev] ✓ Fi.CI.BAT: success for lib/igt_gt: Move assert with setting 'reset' parameter after IGT env check
In reply to Katarzyna Dec== Series Details ==
== Series Details ==
Series: lib/igt_gt: Move assert with setting 'reset' parameter after IGT env check
URL : https://patchwork.freedesktop.org/series/55642/
State : success
== Summary ==
CI Bug Log - changes from IGT_4786 -> IGTPW_2282
====================================================
Summary
-------
**SUCCESS**
No regressions found.
External URL: https://patchwork.freedesktop.org/api/1.0/series/55642/revisions/1/mbox/
Known issues
------------
Here are the changes found in IGTPW_2282 that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@amdgpu/amd_basic@userptr:
- fi-kbl-8809g: PASS -> DMESG-WARN [fdo#108965]
* igt@i915_module_load@reload:
- fi-blb-e6850: PASS -> INCOMPLETE [fdo#107718]
* igt@kms_flip@basic-flip-vs-dpms:
- fi-skl-6700hq: PASS -> DMESG-WARN [fdo#105998]
* igt@prime_vgem@basic-fence-flip:
- fi-ilk-650: PASS -> FAIL [fdo#104008]
{name}: This element is suppressed. This means it is ignored when computing
the status of the difference (SUCCESS, WARNING, or FAILURE).
[fdo#104008]: https://bugs.freedesktop.org/show_bug.cgi?id=104008
[fdo#105998]: https://bugs.freedesktop.org/show_bug.cgi?id=105998
[fdo#107718]: https://bugs.freedesktop.org/show_bug.cgi?id=107718
[fdo#108569]: https://bugs.freedesktop.org/show_bug.cgi?id=108569
[fdo#108915]: https://bugs.freedesktop.org/show_bug.cgi?id=108915
[fdo#108965]: https://bugs.freedesktop.org/show_bug.cgi?id=108965
[fdo#109271]: https://bugs.freedesktop.org/show_bug.cgi?id=109271
[fdo#109276]: https://bugs.freedesktop.org/show_bug.cgi?id=109276
[fdo#109278]: https://bugs.freedesktop.org/show_bug.cgi?id=109278
[fdo#109284]: https://bugs.freedesktop.org/show_bug.cgi?id=109284
[fdo#109285]: https://bugs.freedesktop.org/show_bug.cgi?id=109285
[fdo#109289]: https://bugs.freedesktop.org/show_bug.cgi?id=109289
[fdo#109315]: https://bugs.freedesktop.org/show_bug.cgi?id=109315
Participating hosts (41 -> 41)
------------------------------
Additional (4): fi-icl-y fi-byt-clapper fi-gdg-551 fi-icl-u3
Missing (4): fi-kbl-soraka fi-ilk-m540 fi-byt-squawks fi-bsw-cyan
Build changes
-------------
* IGT: IGT_4786 -> IGTPW_2282
CI_DRM_5470: bfac8844379563353df6f77b0cde827ed74653eb @ git://anongit.freedesktop.org/gfx-ci/linux
IGTPW_2282: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_2282/
IGT_4786: 85cf76182087c09604bcae2bbee9e58b33bcb4f2 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_2282/
_______________________________________________
igt-dev mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/igt-dev
Patchwork
CI[igt-dev] ✓ Fi.CI.IGT: success for lib/igt_gt: Move assert with setting 'reset' parameter after IGT env check
In reply to Katarzyna Dec== Series Details ==
== Series Details ==
Series: lib/igt_gt: Move assert with setting 'reset' parameter after IGT env check
URL : https://patchwork.freedesktop.org/series/55642/
State : success
== Summary ==
CI Bug Log - changes from IGT_4786_full -> IGTPW_2282_full
====================================================
Summary
-------
**SUCCESS**
No regressions found.
External URL: https://patchwork.freedesktop.org/api/1.0/series/55642/revisions/1/mbox/
Known issues
------------
Here are the changes found in IGTPW_2282_full that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@gem_exec_suspend@basic-s3-devices:
- shard-glk: PASS -> INCOMPLETE [fdo#103359] / [k.org#198133]
* igt@kms_available_modes_crc@available_mode_test_crc:
- shard-glk: PASS -> FAIL [fdo#106641]
* igt@kms_busy@extended-modeset-hang-newfb-with-reset-render-b:
- shard-kbl: NOTRUN -> DMESG-WARN [fdo#107956] +2
* igt@kms_busy@extended-pageflip-hang-newfb-render-c:
- shard-apl: PASS -> DMESG-WARN [fdo#107956]
* igt@kms_color@pipe-a-ctm-max:
- shard-apl: PASS -> FAIL [fdo#108147]
* igt@kms_cursor_crc@cursor-256x256-random:
- shard-glk: PASS -> FAIL [fdo#103232] +4
* igt@kms_cursor_crc@cursor-256x85-sliding:
- shard-apl: PASS -> FAIL [fdo#103232] +4
* igt@kms_cursor_crc@cursor-64x64-suspend:
- shard-apl: PASS -> FAIL [fdo#103191] / [fdo#103232]
* igt@kms_plane@pixel-format-pipe-c-planes-source-clamping:
- shard-glk: PASS -> FAIL [fdo#108948]
* igt@kms_plane_alpha_blend@pipe-b-alpha-7efc:
- shard-kbl: NOTRUN -> FAIL [fdo#108145] / [fdo#108590]
* igt@kms_plane_alpha_blend@pipe-c-constant-alpha-max:
- shard-glk: PASS -> FAIL [fdo#108145] +1
* igt@kms_plane_multiple@atomic-pipe-a-tiling-x:
- shard-apl: PASS -> FAIL [fdo#103166] +3
* igt@kms_plane_multiple@atomic-pipe-a-tiling-yf:
- shard-kbl: PASS -> FAIL [fdo#103166] +2
* igt@kms_plane_multiple@atomic-pipe-c-tiling-x:
- shard-glk: PASS -> FAIL [fdo#103166] +7
* igt@kms_rotation_crc@multiplane-rotation-cropping-top:
- shard-kbl: NOTRUN -> FAIL [fdo#109381]
* igt@kms_vblank@pipe-c-ts-continuation-suspend:
- shard-hsw: PASS -> FAIL [fdo#104894]
* igt@perf@oa-exponents:
- shard-glk: PASS -> FAIL [fdo#105483]
#### Possible fixes ####
* igt@gem_pwrite@big-cpu-backwards:
- shard-snb: INCOMPLETE [fdo#105411] -> PASS
* igt@kms_cursor_crc@cursor-128x128-random:
- shard-apl: FAIL [fdo#103232] -> PASS +1
* igt@kms_cursor_crc@cursor-256x256-sliding:
- shard-glk: FAIL [fdo#103232] -> PASS +3
* igt@kms_cursor_crc@cursor-64x21-onscreen:
- shard-kbl: FAIL [fdo#103232] -> PASS +1
* igt@kms_cursor_legacy@2x-long-nonblocking-modeset-vs-cursor-atomic:
- shard-glk: FAIL [fdo#105454] / [fdo#106509] -> PASS
* igt@kms_plane@plane-panning-bottom-right-suspend-pipe-c-planes:
- shard-kbl: INCOMPLETE [fdo#103665] -> PASS +1
* igt@kms_plane@plane-position-covered-pipe-a-planes:
- shard-apl: FAIL [fdo#103166] -> PASS +1
* igt@kms_plane_multiple@atomic-pipe-a-tiling-none:
- shard-kbl: FAIL [fdo#103166] -> PASS +1
* igt@kms_plane_multiple@atomic-pipe-a-tiling-y:
- shard-glk: FAIL [fdo#103166] -> PASS +1
* igt@perf_pmu@rc6:
- shard-kbl: {SKIP} [fdo#109271] -> PASS
{name}: This element is suppressed. This means it is ignored when computing
the status of the difference (SUCCESS, WARNING, or FAILURE).
[fdo#103166]: https://bugs.freedesktop.org/show_bug.cgi?id=103166
[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#103665]: https://bugs.freedesktop.org/show_bug.cgi?id=103665
[fdo#104894]: https://bugs.freedesktop.org/show_bug.cgi?id=104894
[fdo#105411]: https://bugs.freedesktop.org/show_bug.cgi?id=105411
[fdo#105454]: https://bugs.freedesktop.org/show_bug.cgi?id=105454
[fdo#105483]: https://bugs.freedesktop.org/show_bug.cgi?id=105483
[fdo#106509]: https://bugs.freedesktop.org/show_bug.cgi?id=106509
[fdo#106641]: https://bugs.freedesktop.org/show_bug.cgi?id=106641
[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#108590]: https://bugs.freedesktop.org/show_bug.cgi?id=108590
[fdo#108948]: https://bugs.freedesktop.org/show_bug.cgi?id=108948
[fdo#109271]: https://bugs.freedesktop.org/show_bug.cgi?id=109271
[fdo#109278]: https://bugs.freedesktop.org/show_bug.cgi?id=109278
[fdo#109381]: https://bugs.freedesktop.org/show_bug.cgi?id=109381
[k.org#198133]: https://bugzilla.kernel.org/show_bug.cgi?id=198133
Participating hosts (7 -> 5)
------------------------------
Missing (2): shard-skl shard-iclb
Build changes
-------------
* IGT: IGT_4786 -> IGTPW_2282
CI_DRM_5470: bfac8844379563353df6f77b0cde827ed74653eb @ git://anongit.freedesktop.org/gfx-ci/linux
IGTPW_2282: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_2282/
IGT_4786: 85cf76182087c09604bcae2bbee9e58b33bcb4f2 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_2282/
_______________________________________________
igt-dev mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/igt-dev