[igt-dev] [PATCH v2] tests/i915/i915_pm_rpm: skip i2c subtest on VGA subconnector

[igt-dev] [PATCH v2] tests/i915/i915_pm_rpm: skip i2c subtest on VGA subconnector

[Oleg Vasilev]

The subtest compares EDID obtained through I2C with the one thorugh DRM
interface. Getting EDID through I2C on VGA is not reliable, and the test
should be skipped. However, on some machines VGA connector is
implemented as DP branch device. More background in an fdo bug [1].

The patch enables skips of the test based on a subconnector property,
introduced in the kernel series [2].

V2: free drm property (Simon)

[1]: https://bugs.freedesktop.org/show_bug.cgi?id=104097
[2]: https://patchwork.freedesktop.org/series/65800/

Reviewed-by: Simon Ser <simon.ser@intel.com>
Signed-off-by: Oleg Vasilev <oleg.vasilev@intel.com>
CC: Arkadiusz Hiler <arkadiusz.hiler@intel.com>
---
 tests/i915/i915_pm_rpm.c | 40 ++++++++++++++++++++++++++++++++++++++--
 1 file changed, 38 insertions(+), 2 deletions(-)

diff --git a/tests/i915/i915_pm_rpm.c b/tests/i915/i915_pm_rpm.c
index 2168ff72..40a8df14 100644
--- a/tests/i915/i915_pm_rpm.c
+++ b/tests/i915/i915_pm_rpm.c
@@ -389,6 +389,43 @@ static drmModePropertyBlobPtr get_connector_edid(drmModeConnectorPtr connector,
 	return blob;
 }
 
+static bool is_vga(drmModeConnectorPtr connector)
+{
+	bool found;
+	uint64_t prop_value;
+	drmModePropertyPtr prop;
+	char *enum_name = NULL;
+	bool is_subconnector_vga = false;
+
+	if (connector->connector_type == DRM_MODE_CONNECTOR_VGA)
+		return true;
+
+	if (connector->connector_type != DRM_MODE_CONNECTOR_DisplayPort)
+		return false;
+
+	found = kmstest_get_property(drm_fd, connector->connector_id,
+				     DRM_MODE_OBJECT_CONNECTOR, "subconnector",
+				     NULL, &prop_value, &prop);
+
+	igt_assert(found);
+	igt_assert(prop->flags & DRM_MODE_PROP_ENUM);
+
+	for (int i = 0; i < prop->count_enums; i++) {
+		if (prop->enums[i].value == prop_value) {
+			enum_name = prop->enums[i].name;
+			break;
+		}
+	}
+	igt_assert(enum_name);
+
+	is_subconnector_vga = (strcmp(enum_name, "VGA") == 0);
+	if (is_subconnector_vga)
+		igt_debug("This DP is in fact VGA, skipping\n");
+
+	drmModeFreeProperty(prop);
+	return is_subconnector_vga;
+}
+
 static void init_mode_set_data(struct mode_set_data *data)
 {
 	data->res = drmModeGetResources(drm_fd);
@@ -679,7 +716,6 @@ static void test_i2c(struct mode_set_data *data)
 
 		bool got_i2c_edid = i2c_read_edid(connector_name, i2c_edid);
 		bool got_drm_edid = drm_edid != NULL;
-		bool is_vga = data->connectors[i]->connector_type == DRM_MODE_CONNECTOR_VGA;
 
 		bool edids_equal;
 
@@ -688,7 +724,7 @@ static void test_i2c(struct mode_set_data *data)
 		 * the EDID reading mostly FFs and then disabling bit-banging. Since we
 		 * don't want to reimplement everything the Kernel does, let's just
 		 * accept the fact that some VGA outputs won't be properly detected. */
-		if (is_vga)
+		if (is_vga(data->connectors[i]))
 			continue;
 
 		if (!got_i2c_edid && !got_drm_edid)
-- 
2.23.0

_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev

[igt-dev] ✓ Fi.CI.BAT: success for tests/i915/i915_pm_rpm: skip i2c subtest on VGA subconnector (rev2)

[Patchwork]

== Series Details ==

Series: tests/i915/i915_pm_rpm: skip i2c subtest on VGA subconnector (rev2)
URL   : https://patchwork.freedesktop.org/series/65804/
State : success

== Summary ==

CI Bug Log - changes from IGT_5160 -> IGTPW_3403
====================================================

Summary
-------

  **SUCCESS**

  No regressions found.

  External URL: https://patchwork.freedesktop.org/api/1.0/series/65804/revisions/2/mbox/

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

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

### IGT changes ###

#### Issues hit ####

  * igt@i915_selftest@live_execlists:
    - fi-skl-gvtdvm:      [PASS][1] -> [DMESG-FAIL][2] ([fdo#111108])
   [1]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5160/fi-skl-gvtdvm/igt@i915_selftest@live_execlists.html
   [2]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3403/fi-skl-gvtdvm/igt@i915_selftest@live_execlists.html

  
#### Possible fixes ####

  * igt@gem_ctx_switch@legacy-render:
    - fi-icl-u2:          [INCOMPLETE][3] ([fdo#107713] / [fdo#111381]) -> [PASS][4]
   [3]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5160/fi-icl-u2/igt@gem_ctx_switch@legacy-render.html
   [4]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3403/fi-icl-u2/igt@gem_ctx_switch@legacy-render.html

  * igt@gem_exec_suspend@basic-s3:
    - fi-blb-e6850:       [INCOMPLETE][5] ([fdo#107718]) -> [PASS][6]
   [5]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5160/fi-blb-e6850/igt@gem_exec_suspend@basic-s3.html
   [6]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3403/fi-blb-e6850/igt@gem_exec_suspend@basic-s3.html

  * igt@kms_chamelium@dp-crc-fast:
    - fi-cml-u2:          [FAIL][7] ([fdo#110627]) -> [PASS][8]
   [7]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5160/fi-cml-u2/igt@kms_chamelium@dp-crc-fast.html
   [8]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3403/fi-cml-u2/igt@kms_chamelium@dp-crc-fast.html

  * igt@kms_flip@basic-flip-vs-wf_vblank:
    - {fi-icl-dsi}:       [DMESG-WARN][9] ([fdo#106107]) -> [PASS][10]
   [9]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5160/fi-icl-dsi/igt@kms_flip@basic-flip-vs-wf_vblank.html
   [10]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3403/fi-icl-dsi/igt@kms_flip@basic-flip-vs-wf_vblank.html

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

  [fdo#106107]: https://bugs.freedesktop.org/show_bug.cgi?id=106107
  [fdo#107713]: https://bugs.freedesktop.org/show_bug.cgi?id=107713
  [fdo#107718]: https://bugs.freedesktop.org/show_bug.cgi?id=107718
  [fdo#110627]: https://bugs.freedesktop.org/show_bug.cgi?id=110627
  [fdo#111108]: https://bugs.freedesktop.org/show_bug.cgi?id=111108
  [fdo#111381]: https://bugs.freedesktop.org/show_bug.cgi?id=111381


Participating hosts (50 -> 44)
------------------------------

  Additional (2): fi-bxt-dsi fi-skl-6260u 
  Missing    (8): fi-ilk-m540 fi-hsw-4200u fi-bsw-n3050 fi-byt-squawks fi-bsw-cyan fi-icl-y fi-byt-clapper fi-bdw-samus 


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

  * CI: CI-20190529 -> None
  * IGT: IGT_5160 -> IGTPW_3403

  CI-20190529: 20190529
  CI_DRM_6807: 7dfe53944a301f8b7946e69edb570661798dd0b9 @ git://anongit.freedesktop.org/gfx-ci/linux
  IGTPW_3403: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3403/
  IGT_5160: 522bab4503db480dddd1985c9976bc0a6e6da986 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools

== Logs ==

For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3403/
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev

[igt-dev] ✗ Fi.CI.IGT: failure for tests/i915/i915_pm_rpm: skip i2c subtest on VGA subconnector (rev2)

[Patchwork]

== Series Details ==

Series: tests/i915/i915_pm_rpm: skip i2c subtest on VGA subconnector (rev2)
URL   : https://patchwork.freedesktop.org/series/65804/
State : failure

== Summary ==

CI Bug Log - changes from IGT_5160_full -> IGTPW_3403_full
====================================================

Summary
-------

  **FAILURE**

  Serious unknown changes coming with IGTPW_3403_full absolutely need to be
  verified manually.
  
  If you think the reported changes have nothing to do with the changes
  introduced in IGTPW_3403_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/65804/revisions/2/mbox/

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

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

### IGT changes ###

#### Possible regressions ####

  * igt@i915_pm_rpm@i2c:
    - shard-iclb:         [PASS][1] -> [FAIL][2]
   [1]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5160/shard-iclb2/igt@i915_pm_rpm@i2c.html
   [2]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3403/shard-iclb8/igt@i915_pm_rpm@i2c.html
    - shard-kbl:          [PASS][3] -> [FAIL][4]
   [3]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5160/shard-kbl7/igt@i915_pm_rpm@i2c.html
   [4]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3403/shard-kbl2/igt@i915_pm_rpm@i2c.html
    - shard-apl:          [PASS][5] -> [FAIL][6]
   [5]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5160/shard-apl5/igt@i915_pm_rpm@i2c.html
   [6]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3403/shard-apl7/igt@i915_pm_rpm@i2c.html

  
#### Warnings ####

  * igt@i915_pm_rpm@i2c:
    - shard-hsw:          [FAIL][7] ([fdo#104097]) -> [FAIL][8]
   [7]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5160/shard-hsw1/igt@i915_pm_rpm@i2c.html
   [8]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3403/shard-hsw1/igt@i915_pm_rpm@i2c.html

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

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

### IGT changes ###

#### Issues hit ####

  * igt@gem_exec_schedule@preempt-other-bsd1:
    - shard-iclb:         [PASS][9] -> [SKIP][10] ([fdo#109276]) +15 similar issues
   [9]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5160/shard-iclb4/igt@gem_exec_schedule@preempt-other-bsd1.html
   [10]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3403/shard-iclb5/igt@gem_exec_schedule@preempt-other-bsd1.html

  * igt@gem_exec_schedule@preemptive-hang-bsd:
    - shard-iclb:         [PASS][11] -> [SKIP][12] ([fdo#111325]) +5 similar issues
   [11]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5160/shard-iclb6/igt@gem_exec_schedule@preemptive-hang-bsd.html
   [12]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3403/shard-iclb1/igt@gem_exec_schedule@preemptive-hang-bsd.html

  * igt@gem_linear_blits@normal:
    - shard-apl:          [PASS][13] -> [INCOMPLETE][14] ([fdo#103927])
   [13]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5160/shard-apl3/igt@gem_linear_blits@normal.html
   [14]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3403/shard-apl7/igt@gem_linear_blits@normal.html

  * igt@gem_workarounds@suspend-resume:
    - shard-apl:          [PASS][15] -> [DMESG-WARN][16] ([fdo#108566]) +6 similar issues
   [15]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5160/shard-apl3/igt@gem_workarounds@suspend-resume.html
   [16]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3403/shard-apl6/igt@gem_workarounds@suspend-resume.html

  * igt@kms_cursor_legacy@2x-long-cursor-vs-flip-legacy:
    - shard-hsw:          [PASS][17] -> [FAIL][18] ([fdo#105767])
   [17]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5160/shard-hsw5/igt@kms_cursor_legacy@2x-long-cursor-vs-flip-legacy.html
   [18]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3403/shard-hsw6/igt@kms_cursor_legacy@2x-long-cursor-vs-flip-legacy.html

  * igt@kms_frontbuffer_tracking@fbc-1p-primscrn-cur-indfb-draw-blt:
    - shard-iclb:         [PASS][19] -> [FAIL][20] ([fdo#103167]) +4 similar issues
   [19]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5160/shard-iclb4/igt@kms_frontbuffer_tracking@fbc-1p-primscrn-cur-indfb-draw-blt.html
   [20]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3403/shard-iclb8/igt@kms_frontbuffer_tracking@fbc-1p-primscrn-cur-indfb-draw-blt.html

  * igt@kms_psr@psr2_cursor_plane_onoff:
    - shard-iclb:         [PASS][21] -> [SKIP][22] ([fdo#109441]) +2 similar issues
   [21]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5160/shard-iclb2/igt@kms_psr@psr2_cursor_plane_onoff.html
   [22]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3403/shard-iclb3/igt@kms_psr@psr2_cursor_plane_onoff.html

  
#### Possible fixes ####

  * igt@gem_exec_schedule@independent-bsd:
    - shard-iclb:         [SKIP][23] ([fdo#111325]) -> [PASS][24] +5 similar issues
   [23]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5160/shard-iclb2/igt@gem_exec_schedule@independent-bsd.html
   [24]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3403/shard-iclb3/igt@gem_exec_schedule@independent-bsd.html

  * igt@i915_suspend@debugfs-reader:
    - shard-apl:          [DMESG-WARN][25] ([fdo#108566]) -> [PASS][26] +7 similar issues
   [25]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5160/shard-apl8/igt@i915_suspend@debugfs-reader.html
   [26]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3403/shard-apl2/igt@i915_suspend@debugfs-reader.html

  * igt@kms_frontbuffer_tracking@fbc-1p-primscrn-pri-shrfb-draw-render:
    - shard-iclb:         [FAIL][27] ([fdo#103167]) -> [PASS][28] +1 similar issue
   [27]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5160/shard-iclb3/igt@kms_frontbuffer_tracking@fbc-1p-primscrn-pri-shrfb-draw-render.html
   [28]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3403/shard-iclb6/igt@kms_frontbuffer_tracking@fbc-1p-primscrn-pri-shrfb-draw-render.html

  * igt@kms_psr@psr2_cursor_render:
    - shard-iclb:         [SKIP][29] ([fdo#109441]) -> [PASS][30] +2 similar issues
   [29]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5160/shard-iclb4/igt@kms_psr@psr2_cursor_render.html
   [30]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3403/shard-iclb2/igt@kms_psr@psr2_cursor_render.html

  * igt@kms_setmode@basic:
    - shard-hsw:          [FAIL][31] ([fdo#99912]) -> [PASS][32]
   [31]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5160/shard-hsw8/igt@kms_setmode@basic.html
   [32]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3403/shard-hsw1/igt@kms_setmode@basic.html

  * igt@prime_vgem@fence-wait-bsd2:
    - shard-iclb:         [SKIP][33] ([fdo#109276]) -> [PASS][34] +20 similar issues
   [33]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5160/shard-iclb5/igt@prime_vgem@fence-wait-bsd2.html
   [34]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3403/shard-iclb4/igt@prime_vgem@fence-wait-bsd2.html

  
#### Warnings ####

  * igt@gem_ctx_isolation@vcs1-nonpriv:
    - shard-iclb:         [FAIL][35] ([fdo#111329]) -> [SKIP][36] ([fdo#109276])
   [35]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5160/shard-iclb2/igt@gem_ctx_isolation@vcs1-nonpriv.html
   [36]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3403/shard-iclb5/igt@gem_ctx_isolation@vcs1-nonpriv.html

  * igt@gem_mocs_settings@mocs-settings-bsd2:
    - shard-iclb:         [FAIL][37] ([fdo#111330]) -> [SKIP][38] ([fdo#109276]) +1 similar issue
   [37]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5160/shard-iclb4/igt@gem_mocs_settings@mocs-settings-bsd2.html
   [38]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3403/shard-iclb8/igt@gem_mocs_settings@mocs-settings-bsd2.html

  
  [fdo#103167]: https://bugs.freedesktop.org/show_bug.cgi?id=103167
  [fdo#103927]: https://bugs.freedesktop.org/show_bug.cgi?id=103927
  [fdo#104097]: https://bugs.freedesktop.org/show_bug.cgi?id=104097
  [fdo#105767]: https://bugs.freedesktop.org/show_bug.cgi?id=105767
  [fdo#108566]: https://bugs.freedesktop.org/show_bug.cgi?id=108566
  [fdo#109276]: https://bugs.freedesktop.org/show_bug.cgi?id=109276
  [fdo#109441]: https://bugs.freedesktop.org/show_bug.cgi?id=109441
  [fdo#111325]: https://bugs.freedesktop.org/show_bug.cgi?id=111325
  [fdo#111329]: https://bugs.freedesktop.org/show_bug.cgi?id=111329
  [fdo#111330]: https://bugs.freedesktop.org/show_bug.cgi?id=111330
  [fdo#99912]: https://bugs.freedesktop.org/show_bug.cgi?id=99912


Participating hosts (7 -> 6)
------------------------------

  Missing    (1): shard-skl 


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

  * CI: CI-20190529 -> None
  * IGT: IGT_5160 -> IGTPW_3403

  CI-20190529: 20190529
  CI_DRM_6807: 7dfe53944a301f8b7946e69edb570661798dd0b9 @ git://anongit.freedesktop.org/gfx-ci/linux
  IGTPW_3403: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3403/
  IGT_5160: 522bab4503db480dddd1985c9976bc0a6e6da986 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools

== Logs ==

For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3403/
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev