tests/i915_pm_rpm: Fix plane_subtest assertion

PATCH In review Anshuman Gupta 3 participants 4 messages May 20, 2020

Share & tools

Anshuman Gupta

author

2020-05-20 06:44 UTC #0 lore raw

PATCH 1/1 tests/i915_pm_rpm: Fix plane_subtest assertion

I have added igt_assert_lte() assertion on planes_tested unintentionally by mistake, while applying the patch and fixing the conflicts.

Fixes 32498f12ab04 ("tests/i915_pm_rpm: Fix the universal-plane cap setting in plane tests")

Cc Imre Deak <[email protected]>

Signed-off-by Anshuman Gupta <[email protected]>

---
 tests/i915/i915_pm_rpm.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

tests/i915/i915_pm_rpm.c +1 -2

index 0a641640..6d46c320 100644
@@ -1786,7 +1786,7 @@ static void test_one_plane(bool dpms, uint32_t plane_id,
 /* This one also triggered WARNs on our driver at some point in time. */
 static void planes_subtest(bool universal, bool dpms)
 {
-	int i, planes_tested = 0, crtc_idx;
+	int i, crtc_idx;
 	drmModePlaneResPtr planes;
 
 	igt_require(default_mode_params);

@@ -1817,7 +1817,6 @@ static void planes_subtest(bool universal, bool dpms)
 
 	igt_assert_eq(drmSetClientCap(drm_fd, DRM_CLIENT_CAP_UNIVERSAL_PLANES,
 				      1), 0);
-	igt_assert_lte(universal ? 3 : 1, planes_tested);
 }
 
 static void pm_test_tiling(void)

Signature · 6 lines

2.26.0

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

Imre Deak

Reviewed-by on v1 1/1

2020-05-20 06:56 UTC #1 lore raw

Quoted 7 lines · Anshuman Gupta

I have added igt_assert_lte() assertion on planes_tested unintentionally by mistake, while applying the patch and fixing the conflicts.
Fixes 32498f12ab04 ("tests/i915_pm_rpm: Fix the universal-plane cap setting in plane tests")
Cc Imre Deak <[email protected]>
Signed-off-by Anshuman Gupta <[email protected]>

Reviewed-by Imre Deak <[email protected]>

Quoted 28 lines

---
 tests/i915/i915_pm_rpm.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

tests/i915/i915_pm_rpm.c +1 -2

index 0a641640..6d46c320 100644
@@ -1786,7 +1786,7 @@ static void test_one_plane(bool dpms, uint32_t plane_id,
 /* This one also triggered WARNs on our driver at some point in time. */
 static void planes_subtest(bool universal, bool dpms)
 {
-	int i, planes_tested = 0, crtc_idx;
+	int i, crtc_idx;
 	drmModePlaneResPtr planes;
 
 	igt_require(default_mode_params);

@@ -1817,7 +1817,6 @@ static void planes_subtest(bool universal, bool dpms)
 
 	igt_assert_eq(drmSetClientCap(drm_fd, DRM_CLIENT_CAP_UNIVERSAL_PLANES,
 				      1), 0);
-	igt_assert_lte(universal ? 3 : 1, planes_tested);
 }
 
 static void pm_test_tiling(void)

Signature · 1 line

2.26.0

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

Patchwork

2020-05-20 07:39 UTC #2 lore raw

[igt-dev] ✓ Fi.CI.BAT: success for tests/i915_pm_rpm: Fix plane_subtest assertion

In reply to Anshuman Gupta

== Series Details ==

Series: tests/i915_pm_rpm: Fix plane_subtest assertion
URL : https://patchwork.freedesktop.org/series/77447/
State : success

== Summary ==

CI Bug Log - changes from CI_DRM_8509 -> IGTPW_4597
====================================================

Summary
-------

**SUCCESS**

No regressions found.

External URL: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4597/index.html

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

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

### IGT changes ###

#### Issues hit ####

* igt@i915_selftest@live@active:
- fi-icl-y: [PASS][1] -> [DMESG-FAIL][2] ([i915#765])
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8509/fi-icl-y/igt@i915_selftest@[email protected]
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4597/fi-icl-y/igt@i915_selftest@[email protected]

#### Possible fixes ####

* igt@i915_selftest@live@execlists:
- {fi-tgl-dsi}: [INCOMPLETE][3] ([i915#1803]) -> [PASS][4]
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8509/fi-tgl-dsi/igt@i915_selftest@[email protected]
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4597/fi-tgl-dsi/igt@i915_selftest@[email protected]

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

[i915#1803]: https://gitlab.freedesktop.org/drm/intel/issues/1803
[i915#765]: https://gitlab.freedesktop.org/drm/intel/issues/765

Participating hosts (48 -> 42)
------------------------------

Missing (6): fi-hsw-4200u fi-byt-squawks fi-bsw-cyan fi-hsw-4770 fi-byt-clapper fi-bdw-samus

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

* CI: CI-20190529 -> None
* IGT: IGT_5662 -> IGTPW_4597

CI-20190529: 20190529
CI_DRM_8509: ea6a2729d3d286137415319de4161042b0337e87 @ git://anongit.freedesktop.org/gfx-ci/linux
IGTPW_4597: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4597/index.html
IGT_5662: e79462659e0f45cd3f4f766f58cb792303c6bf9b @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools

== Logs ==

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

Patchwork

2020-05-20 19:06 UTC #3 lore raw

[igt-dev] ✓ Fi.CI.IGT: success for tests/i915_pm_rpm: Fix plane_subtest assertion

In reply to Anshuman Gupta

== Series Details ==

Series: tests/i915_pm_rpm: Fix plane_subtest assertion
URL : https://patchwork.freedesktop.org/series/77447/
State : success

== Summary ==

CI Bug Log - changes from CI_DRM_8509_full -> IGTPW_4597_full
====================================================

Summary
-------

**SUCCESS**

No regressions found.

External URL: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4597/index.html

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

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

### IGT changes ###

#### Issues hit ####

* igt@gen9_exec_parse@allowed-all:
- shard-glk: [PASS][1] -> [DMESG-WARN][2] ([i915#1436] / [i915#716])
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8509/shard-glk2/igt@[email protected]
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4597/shard-glk4/igt@[email protected]

* igt@i915_pm_rpm@system-suspend-execbuf:
- shard-kbl: [PASS][3] -> [INCOMPLETE][4] ([i915#151] / [i915#155] / [i915#95])
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8509/shard-kbl7/igt@[email protected]
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4597/shard-kbl4/igt@[email protected]

* igt@i915_suspend@fence-restore-tiled2untiled:
- shard-apl: [PASS][5] -> [DMESG-WARN][6] ([i915#180]) +1 similar issue
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8509/shard-apl2/igt@[email protected]
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4597/shard-apl1/igt@[email protected]

* igt@i915_suspend@forcewake:
- shard-kbl: [PASS][7] -> [DMESG-WARN][8] ([i915#180] / [i915#93] / [i915#95])
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8509/shard-kbl4/igt@[email protected]
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4597/shard-kbl7/igt@[email protected]

* igt@kms_cursor_crc@pipe-a-cursor-64x64-offscreen:
- shard-kbl: [PASS][9] -> [FAIL][10] ([i915#54] / [i915#93] / [i915#95])
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8509/shard-kbl3/igt@[email protected]
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4597/shard-kbl3/igt@[email protected]

* igt@kms_cursor_legacy@flip-vs-cursor-crc-atomic:
- shard-kbl: [PASS][11] -> [FAIL][12] ([i915#1566] / [i915#93] / [i915#95])
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8509/shard-kbl1/igt@[email protected]
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4597/shard-kbl3/igt@[email protected]

* igt@kms_cursor_legacy@pipe-d-torture-bo:
- shard-tglb: [PASS][13] -> [DMESG-WARN][14] ([i915#128])
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8509/shard-tglb3/igt@[email protected]
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4597/shard-tglb1/igt@[email protected]

* igt@kms_draw_crc@draw-method-xrgb8888-mmap-cpu-untiled:
- shard-kbl: [PASS][15] -> [FAIL][16] ([i915#177] / [i915#52] / [i915#54] / [i915#93] / [i915#95])
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8509/shard-kbl3/igt@[email protected]
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4597/shard-kbl3/igt@[email protected]
- shard-apl: [PASS][17] -> [FAIL][18] ([i915#52] / [i915#54] / [i915#95])
[17]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8509/shard-apl6/igt@[email protected]
[18]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4597/shard-apl8/igt@[email protected]

* igt@kms_plane_alpha_blend@pipe-a-coverage-vs-premult-vs-constant:
- shard-kbl: [PASS][19] -> [FAIL][20] ([fdo#108145] / [i915#265] / [i915#93] / [i915#95])
[19]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8509/shard-kbl6/igt@kms_plane_alpha_blend@pipe-a-coverage-vs-premult-vs-constant.html
[20]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4597/shard-kbl7/igt@kms_plane_alpha_blend@pipe-a-coverage-vs-premult-vs-constant.html
- shard-apl: [PASS][21] -> [FAIL][22] ([fdo#108145] / [i915#265] / [i915#95])
[21]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8509/shard-apl8/igt@kms_plane_alpha_blend@pipe-a-coverage-vs-premult-vs-constant.html
[22]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4597/shard-apl3/igt@kms_plane_alpha_blend@pipe-a-coverage-vs-premult-vs-constant.html

* igt@kms_plane_cursor@pipe-a-overlay-size-128:
- shard-kbl: [PASS][23] -> [FAIL][24] ([i915#1559] / [i915#93] / [i915#95])
[23]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8509/shard-kbl2/igt@[email protected]
[24]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4597/shard-kbl6/igt@[email protected]
- shard-apl: [PASS][25] -> [FAIL][26] ([i915#1559] / [i915#95])
[25]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8509/shard-apl3/igt@[email protected]
[26]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4597/shard-apl2/igt@[email protected]

* igt@kms_psr2_su@frontbuffer:
- shard-iclb: [PASS][27] -> [SKIP][28] ([fdo#109642] / [fdo#111068])
[27]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8509/shard-iclb2/igt@[email protected]
[28]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4597/shard-iclb3/igt@[email protected]

* igt@kms_psr@psr2_primary_mmap_cpu:
- shard-iclb: [PASS][29] -> [SKIP][30] ([fdo#109441])
[29]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8509/shard-iclb2/igt@kms_psr@psr2_primary_mmap_cpu.html
[30]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4597/shard-iclb3/igt@kms_psr@psr2_primary_mmap_cpu.html

* igt@kms_vblank@pipe-a-ts-continuation-suspend:
- shard-kbl: [PASS][31] -> [DMESG-WARN][32] ([i915#180]) +1 similar issue
[31]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8509/shard-kbl1/igt@[email protected]
[32]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4597/shard-kbl7/igt@[email protected]

#### Possible fixes ####

* igt@i915_pm_dc@dc5-psr:
- shard-iclb: [FAIL][33] ([i915#1899]) -> [PASS][34]
[33]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8509/shard-iclb6/igt@[email protected]
[34]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4597/shard-iclb6/igt@[email protected]

* igt@kms_cursor_crc@pipe-a-cursor-128x128-random:
- shard-apl: [FAIL][35] ([i915#54] / [i915#95]) -> [PASS][36]
[35]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8509/shard-apl8/igt@[email protected]
[36]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4597/shard-apl8/igt@[email protected]
- shard-glk: [FAIL][37] ([i915#54]) -> [PASS][38]
[37]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8509/shard-glk4/igt@[email protected]
[38]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4597/shard-glk2/igt@[email protected]

* igt@kms_cursor_crc@pipe-a-cursor-64x21-onscreen:
- shard-kbl: [FAIL][39] ([i915#54] / [i915#93] / [i915#95]) -> [PASS][40] +5 similar issues
[39]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8509/shard-kbl1/igt@[email protected]
[40]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4597/shard-kbl1/igt@[email protected]

* igt@kms_draw_crc@draw-method-xrgb8888-render-untiled:
- shard-kbl: [FAIL][41] ([i915#177] / [i915#52] / [i915#54] / [i915#93] / [i915#95]) -> [PASS][42]
[41]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8509/shard-kbl6/igt@[email protected]
[42]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4597/shard-kbl1/igt@[email protected]
- shard-apl: [FAIL][43] ([i915#52] / [i915#54] / [i915#95]) -> [PASS][44]
[43]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8509/shard-apl7/igt@[email protected]
[44]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4597/shard-apl8/igt@[email protected]

* {igt@kms_flip@flip-vs-suspend@a-dp1}:
- shard-apl: [DMESG-WARN][45] ([i915#180]) -> [PASS][46] +2 similar issues
[45]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8509/shard-apl6/igt@kms_flip@[email protected]
[46]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4597/shard-apl7/igt@kms_flip@[email protected]
- shard-kbl: [DMESG-WARN][47] ([i915#180]) -> [PASS][48] +5 similar issues
[47]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8509/shard-kbl7/igt@kms_flip@[email protected]
[48]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4597/shard-kbl6/igt@kms_flip@[email protected]

* igt@kms_hdr@bpc-switch-suspend:
- shard-kbl: [INCOMPLETE][49] ([i915#155]) -> [PASS][50]
[49]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8509/shard-kbl1/igt@[email protected]
[50]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4597/shard-kbl7/igt@[email protected]

* igt@kms_plane_cursor@pipe-a-overlay-size-64:
- shard-apl: [FAIL][51] ([i915#1559] / [i915#95]) -> [PASS][52]
[51]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8509/shard-apl8/igt@[email protected]
[52]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4597/shard-apl6/igt@[email protected]
- shard-kbl: [FAIL][53] ([i915#1559] / [i915#93] / [i915#95]) -> [PASS][54]
[53]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8509/shard-kbl1/igt@[email protected]
[54]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4597/shard-kbl6/igt@[email protected]

* igt@kms_psr@psr2_dpms:
- shard-iclb: [SKIP][55] ([fdo#109441]) -> [PASS][56] +1 similar issue
[55]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8509/shard-iclb1/igt@kms_psr@psr2_dpms.html
[56]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4597/shard-iclb2/igt@kms_psr@psr2_dpms.html

#### Warnings ####

* igt@i915_pm_dc@dc3co-vpb-simulation:
- shard-iclb: [SKIP][57] ([i915#588]) -> [SKIP][58] ([i915#658])
[57]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8509/shard-iclb2/igt@[email protected]
[58]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4597/shard-iclb8/igt@[email protected]

* igt@i915_pm_dc@dc6-dpms:
- shard-kbl: [FAIL][59] ([i915#454] / [i915#93] / [i915#95]) -> [FAIL][60] ([i915#454])
[59]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8509/shard-kbl7/igt@[email protected]
[60]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4597/shard-kbl6/igt@[email protected]

* igt@kms_content_protection@atomic:
- shard-apl: [TIMEOUT][61] ([i915#1319]) -> [FAIL][62] ([fdo#110321] / [fdo#110336])
[61]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8509/shard-apl3/igt@[email protected]
[62]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4597/shard-apl6/igt@[email protected]

* igt@kms_content_protection@atomic-dpms:
- shard-apl: [FAIL][63] ([fdo#110321] / [fdo#110336]) -> [FAIL][64] ([fdo#110321] / [fdo#110336] / [i915#95])
[63]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8509/shard-apl1/igt@[email protected]
[64]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4597/shard-apl1/igt@[email protected]

* igt@kms_content_protection@lic:
- shard-kbl: [TIMEOUT][65] ([i915#1319]) -> [FAIL][66] ([fdo#110321] / [i915#93] / [i915#95])
[65]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8509/shard-kbl3/igt@[email protected]
[66]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4597/shard-kbl2/igt@[email protected]

* igt@kms_content_protection@srm:
- shard-apl: [FAIL][67] ([fdo#110321]) -> [TIMEOUT][68] ([i915#1319])
[67]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8509/shard-apl4/igt@[email protected]
[68]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4597/shard-apl3/igt@[email protected]

* igt@kms_plane_alpha_blend@pipe-a-alpha-basic:
- shard-apl: [FAIL][69] ([fdo#108145] / [i915#265] / [i915#95]) -> [FAIL][70] ([fdo#108145] / [i915#265])
[69]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8509/shard-apl8/igt@[email protected]
[70]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4597/shard-apl1/igt@[email protected]

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

Participating hosts (11 -> 8)
------------------------------

Missing (3): pig-skl-6260u pig-glk-j5005 pig-icl-1065g7

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

* CI: CI-20190529 -> None
* IGT: IGT_5662 -> IGTPW_4597
* Piglit: piglit_4509 -> None

== Logs ==