Skip to contentSkip to conversation

tests/kms: IGT cleanup

PATCH In review Mohammed Thasleem 3 participants 4 messages Apr 20, 2022

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 tests/kms: IGT cleanup

Before starting the subtest, clean up the states to default by igt_display_reset().

Replace newly defined function in particular test with existing library function.

---
 tests/i915/kms_mmap_write_crc.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
tests/i915/kms_mmap_write_crc.c +4 -2
index b17e5fdb..f8825284 100644
@@ -169,6 +169,8 @@ static void prepare_crtc(data_t *data)
 	igt_output_t *output = data->output;
 	drmModeModeInfo *mode;
 
+	igt_display_reset(&data->display);
+
 	/* select the pipe we want to use */
 	igt_output_set_pipe(output, data->pipe);
 
@@ -204,8 +206,8 @@ static void cleanup_crtc(data_t *data)
 
 	igt_plane_set_fb(data->primary, NULL);
 
-	igt_output_set_pipe(output, PIPE_ANY);
-	igt_display_commit(display);
+	igt_output_set_pipe(output, PIPE_NONE);
+	igt_display_commit2(display, display->is_atomic ? COMMIT_ATOMIC : COMMIT_LEGACY);
 
 	igt_remove_fb(data->drm_fd, &data->fb[0]);
 	igt_remove_fb(data->drm_fd, &data->fb[1]);
Signature · 1 line
2.25.1
#1 lore raw

PATCH 2/2 tests/kms: IGT cleanup

Before starting the subtest, clean up the states to default by igt_display_reset().

Replace newly defined function in particular test with existing library function.

---
 tests/kms_lease.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
tests/kms_lease.c +4 -2
index 0bf102a6..6e8f06d5 100644
@@ -100,6 +100,8 @@ static int prepare_crtc(lease_t *lease, uint32_t connector_id, uint32_t crtc_id)
 	if (!output)
 		return -ENOENT;
 
+	igt_display_reset(display);
+
 	/* select the pipe we want to use */
 	igt_output_set_pipe(output, pipe);
 
@@ -136,8 +138,8 @@ static void cleanup_crtc(lease_t *lease, igt_output_t *output)
 	primary = igt_output_get_plane_type(output, DRM_PLANE_TYPE_PRIMARY);
 	igt_plane_set_fb(primary, NULL);
 
-	igt_output_set_pipe(output, PIPE_ANY);
-	igt_display_commit(display);
+	igt_output_set_pipe(output, PIPE_NONE);
+	igt_display_commit2(display, display->is_atomic ? COMMIT_ATOMIC : COMMIT_LEGACY);
 }
 
 static int create_lease(int fd, struct drm_mode_create_lease *mcl)
Signature · 1 line
2.25.1
#2 lore raw

[igt-dev] ✗ Fi.CI.BAT: failure for series starting with [i-g-t,1/2,i-g-t] tests/kms: IGT cleanup

In reply to Mohammed Thasleem
== Series Details ==

== Series Details ==

Series: series starting with [i-g-t,1/2,i-g-t] tests/kms: IGT cleanup
URL : https://patchwork.freedesktop.org/series/102871/
State : failure

== Summary ==

CI Bug Log - changes from IGT_6441 -> IGTPW_6955
====================================================

Summary
-------

**FAILURE**

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

If you think the reported changes have nothing to do with the changes introduced in IGTPW_6955, please notify your bug team 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_6955/index.html

Participating hosts (49 -> 46)
------------------------------

Additional (2): fi-cml-u2 fi-icl-u2
Missing (5): fi-hsw-4200u fi-tgl-u2 bat-adlm-1 fi-bsw-cyan fi-ctg-p8600

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

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

### IGT changes ###

#### Possible regressions ####

* igt@i915_selftest@live@memory_region:
- bat-dg1-5: NOTRUN -> [INCOMPLETE][1]
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_6955/bat-dg1-5/igt@i915_selftest@live@memory_region.html

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

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

### IGT changes ###

#### Issues hit ####

* igt@gem_exec_fence@basic-busy@bcs0:
- fi-cml-u2: NOTRUN -> [SKIP][2] ([i915#1208]) +1 similar issue
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_6955/fi-cml-u2/igt@gem_exec_fence@[email protected]

* igt@gem_huc_copy@huc-copy:
- fi-cml-u2: NOTRUN -> [SKIP][3] ([i915#2190])
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_6955/fi-cml-u2/igt@[email protected]
- fi-icl-u2: NOTRUN -> [SKIP][4] ([i915#2190])
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_6955/fi-icl-u2/igt@[email protected]

* igt@gem_lmem_swapping@parallel-random-engines:
- fi-icl-u2: NOTRUN -> [SKIP][5] ([i915#4613]) +3 similar issues
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_6955/fi-icl-u2/igt@[email protected]
- fi-cml-u2: NOTRUN -> [SKIP][6] ([i915#4613]) +3 similar issues
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_6955/fi-cml-u2/igt@[email protected]

* igt@i915_selftest@live@hangcheck:
- fi-bdw-5557u: NOTRUN -> [INCOMPLETE][7] ([i915#3921])
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_6955/fi-bdw-5557u/igt@i915_selftest@[email protected]

* igt@kms_chamelium@dp-crc-fast:
- fi-bdw-5557u: NOTRUN -> [SKIP][8] ([fdo#109271] / [fdo#111827]) +8 similar issues
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_6955/fi-bdw-5557u/igt@[email protected]

* igt@kms_chamelium@dp-hpd-fast:
- fi-cml-u2: NOTRUN -> [SKIP][9] ([fdo#109284] / [fdo#111827]) +8 similar issues
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_6955/fi-cml-u2/igt@[email protected]

* igt@kms_chamelium@hdmi-hpd-fast:
- fi-icl-u2: NOTRUN -> [SKIP][10] ([fdo#111827]) +8 similar issues
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_6955/fi-icl-u2/igt@[email protected]

* igt@kms_cursor_legacy@basic-busy-flip-before-cursor-atomic:
- fi-cml-u2: NOTRUN -> [SKIP][11] ([fdo#109278]) +1 similar issue
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_6955/fi-cml-u2/igt@[email protected]

* igt@kms_cursor_legacy@basic-busy-flip-before-cursor-legacy:
- fi-icl-u2: NOTRUN -> [SKIP][12] ([fdo#109278]) +2 similar issues
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_6955/fi-icl-u2/igt@[email protected]

* igt@kms_force_connector_basic@force-load-detect:
- fi-cml-u2: NOTRUN -> [SKIP][13] ([fdo#109285])
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_6955/fi-cml-u2/igt@[email protected]
- fi-icl-u2: NOTRUN -> [SKIP][14] ([fdo#109285])
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_6955/fi-icl-u2/igt@[email protected]

* igt@kms_frontbuffer_tracking@basic:
- fi-cml-u2: NOTRUN -> [DMESG-WARN][15] ([i915#4269])
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_6955/fi-cml-u2/igt@[email protected]

* igt@kms_pipe_crc_basic@compare-crc-sanitycheck-pipe-d:
- fi-cml-u2: NOTRUN -> [SKIP][16] ([fdo#109278] / [i915#533])
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_6955/fi-cml-u2/igt@[email protected]

* igt@kms_setmode@basic-clone-single-crtc:
- fi-icl-u2: NOTRUN -> [SKIP][17] ([i915#3555])
[17]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_6955/fi-icl-u2/igt@[email protected]
- fi-bdw-5557u: NOTRUN -> [SKIP][18] ([fdo#109271]) +14 similar issues
[18]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_6955/fi-bdw-5557u/igt@[email protected]
- fi-cml-u2: NOTRUN -> [SKIP][19] ([i915#3555])
[19]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_6955/fi-cml-u2/igt@[email protected]

* igt@prime_vgem@basic-userptr:
- fi-icl-u2: NOTRUN -> [SKIP][20] ([i915#3301])
[20]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_6955/fi-icl-u2/igt@[email protected]
- fi-cml-u2: NOTRUN -> [SKIP][21] ([i915#3301])
[21]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_6955/fi-cml-u2/igt@[email protected]

#### Possible fixes ####

* igt@i915_selftest@live@gt_engines:
- bat-dg1-5: [INCOMPLETE][22] ([i915#4418]) -> [PASS][23]
[22]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_6441/bat-dg1-5/igt@i915_selftest@live@gt_engines.html
[23]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_6955/bat-dg1-5/igt@i915_selftest@live@gt_engines.html

* igt@i915_selftest@live@gt_lrc:
- {bat-adlp-6}: [INCOMPLETE][24] ([i915#5513]) -> [PASS][25]
[24]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_6441/bat-adlp-6/igt@i915_selftest@live@gt_lrc.html
[25]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_6955/bat-adlp-6/igt@i915_selftest@live@gt_lrc.html

* igt@i915_selftest@live@hangcheck:
- fi-snb-2600: [INCOMPLETE][26] ([i915#3921]) -> [PASS][27]
[26]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_6441/fi-snb-2600/igt@i915_selftest@[email protected]
[27]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_6955/fi-snb-2600/igt@i915_selftest@[email protected]

* igt@kms_busy@basic@modeset:
- {bat-adlp-6}: [DMESG-WARN][28] ([i915#3576]) -> [PASS][29]
[28]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_6441/bat-adlp-6/igt@kms_busy@[email protected]
[29]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_6955/bat-adlp-6/igt@kms_busy@[email protected]

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

[fdo#109271]: https://bugs.freedesktop.org/show_bug.cgi?id=109271
[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#109308]: https://bugs.freedesktop.org/show_bug.cgi?id=109308
[fdo#111825]: https://bugs.freedesktop.org/show_bug.cgi?id=111825
[fdo#111827]: https://bugs.freedesktop.org/show_bug.cgi?id=111827
[i915#1072]: https://gitlab.freedesktop.org/drm/intel/issues/1072
[i915#1155]: https://gitlab.freedesktop.org/drm/intel/issues/1155
[i915#1208]: https://gitlab.freedesktop.org/drm/intel/issues/1208
[i915#1845]: https://gitlab.freedesktop.org/drm/intel/issues/1845
[i915#1849]: https://gitlab.freedesktop.org/drm/intel/issues/1849
[i915#2190]: https://gitlab.freedesktop.org/drm/intel/issues/2190
[i915#2582]: https://gitlab.freedesktop.org/drm/intel/issues/2582
[i915#3282]: https://gitlab.freedesktop.org/drm/intel/issues/3282
[i915#3301]: https://gitlab.freedesktop.org/drm/intel/issues/3301
[i915#3555]: https://gitlab.freedesktop.org/drm/intel/issues/3555
[i915#3576]: https://gitlab.freedesktop.org/drm/intel/issues/3576
[i915#3637]: https://gitlab.freedesktop.org/drm/intel/issues/3637
[i915#3708]: https://gitlab.freedesktop.org/drm/intel/issues/3708
[i915#3921]: https://gitlab.freedesktop.org/drm/intel/issues/3921
[i915#4103]: https://gitlab.freedesktop.org/drm/intel/issues/4103
[i915#4269]: https://gitlab.freedesktop.org/drm/intel/issues/4269
[i915#4312]: https://gitlab.freedesktop.org/drm/intel/issues/4312
[i915#4391]: https://gitlab.freedesktop.org/drm/intel/issues/4391
[i915#4418]: https://gitlab.freedesktop.org/drm/intel/issues/4418
[i915#4613]: https://gitlab.freedesktop.org/drm/intel/issues/4613
[i915#4897]: https://gitlab.freedesktop.org/drm/intel/issues/4897
[i915#5329]: https://gitlab.freedesktop.org/drm/intel/issues/5329
[i915#533]: https://gitlab.freedesktop.org/drm/intel/issues/533
[i915#5341]: https://gitlab.freedesktop.org/drm/intel/issues/5341
[i915#5513]: https://gitlab.freedesktop.org/drm/intel/issues/5513
[i915#5537]: https://gitlab.freedesktop.org/drm/intel/issues/5537

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

* CI: CI-20190529 -> None
* IGT: IGT_6441 -> IGTPW_6955

CI-20190529: 20190529
CI_DRM_11526: 6094ebd5db15c51e89ce9960d782613f8df57c63 @ git://anongit.freedesktop.org/gfx-ci/linux
IGTPW_6955: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_6955/index.html
IGT_6441: a44d1d4c9e7198a2d59d7dcaae38e340f7cadcf9 @ https://gitlab.freedesktop.org/drm/igt-gpu-tools.git

== Logs ==

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

#3 lore raw
In reply to Mohammed Thasleem

Hi Thasleem,

Thanks for the patch. I think, commit subject shouldn't be the same for all commits in this series. Please try to follow: https://cbea.ms/git-commit/

Also commit subject should start with "tests/<test_name>:"
Ex: tests/kms_vrr: Introduce dynamic subtests

As you started to cleanup the IGT, please try to make sure below points:
- Convert to dynamic subtests
- Sanitize the state before starting the subtest. (igt_display_reset)
- Clear the states before exiting the subtest.
- Update existing libdrm APIs with IGT kms APIs.
- Other misc (Ex: update deprecated APIs/macros/enums, FB leaks etc..)

- Bhanu

Quoted 35 lines · Mohammed Thasleem

Before starting the subtest, clean up the states to default by igt_display_reset().

Replace newly defined function in particular test with existing library function.

---
  tests/i915/kms_mmap_write_crc.c | 6 ++++--
  1 file changed, 4 insertions(+), 2 deletions(-)
tests/i915/kms_mmap_write_crc.c +4 -2
index b17e5fdb..f8825284 100644
@@ -169,6 +169,8 @@ static void prepare_crtc(data_t *data)
  	igt_output_t *output = data->output;
  	drmModeModeInfo *mode;
 
+	igt_display_reset(&data->display);
+
  	/* select the pipe we want to use */
  	igt_output_set_pipe(output, data->pipe);
 
@@ -204,8 +206,8 @@ static void cleanup_crtc(data_t *data)
 
  	igt_plane_set_fb(data->primary, NULL);
 
-	igt_output_set_pipe(output, PIPE_ANY);
-	igt_display_commit(display);
+	igt_output_set_pipe(output, PIPE_NONE);
+	igt_display_commit2(display, display->is_atomic ? COMMIT_ATOMIC : COMMIT_LEGACY);
 
  	igt_remove_fb(data->drm_fd, &data->fb[0]);
  	igt_remove_fb(data->drm_fd, &data->fb[1]);