[PATCH i-g-t] tests/kms_hdmi_inject: Retry ELD check to avoid transient audio races

[PATCH i-g-t] tests/kms_hdmi_inject: Retry ELD check to avoid transient audio races

[Jeevan B]

ELD population can lag HDMI audio enable on some platforms.
Retry once to avoid spurious test failures.

Closes: https://gitlab.freedesktop.org/drm/xe/kernel/-/issues/14867
Signed-off-by: Jeevan B <jeevan.b@intel.com>
---
 tests/kms_hdmi_inject.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/tests/kms_hdmi_inject.c b/tests/kms_hdmi_inject.c
index 00eb5e4a4..f388a84c3 100644
--- a/tests/kms_hdmi_inject.c
+++ b/tests/kms_hdmi_inject.c
@@ -200,7 +200,13 @@ hdmi_inject_audio(int drm_fd, drmModeConnector *connector)
 	 * Test if we have /proc/asound/HDMI/eld#0.0 and is its contents are
 	 * valid.
 	 */
-	igt_assert(eld_has_igt());
+	if (!eld_has_igt()) {
+		igt_info("HDMI audio enabled but ELD not visible yet; retrying\n");
+		usleep(200 * 1000);
+
+		igt_assert_f(eld_has_igt(),
+			     "HDMI ELD missing after retry\n");
+	}
 
 	igt_remove_fb(drm_fd, &fb);
 
-- 
2.43.0

[PATCH i-g-t] tests/kms_hdmi_inject: Retry ELD check to avoid transient audio races

[Jeevan B]

ELD population can lag HDMI audio enable on some platforms.
Retry once to avoid spurious test failures.

Closes: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/14867
Signed-off-by: Jeevan B <jeevan.b@intel.com>
---
 tests/kms_hdmi_inject.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/tests/kms_hdmi_inject.c b/tests/kms_hdmi_inject.c
index 00eb5e4a4..f388a84c3 100644
--- a/tests/kms_hdmi_inject.c
+++ b/tests/kms_hdmi_inject.c
@@ -200,7 +200,13 @@ hdmi_inject_audio(int drm_fd, drmModeConnector *connector)
 	 * Test if we have /proc/asound/HDMI/eld#0.0 and is its contents are
 	 * valid.
 	 */
-	igt_assert(eld_has_igt());
+	if (!eld_has_igt()) {
+		igt_info("HDMI audio enabled but ELD not visible yet; retrying\n");
+		usleep(200 * 1000);
+
+		igt_assert_f(eld_has_igt(),
+			     "HDMI ELD missing after retry\n");
+	}
 
 	igt_remove_fb(drm_fd, &fb);
 
-- 
2.43.0

✓ i915.CI.BAT: success for tests/kms_hdmi_inject: Retry ELD check to avoid transient audio races (rev2)

[Patchwork]

[-- Attachment #1: Type: text/plain, Size: 2723 bytes --]

== Series Details ==

Series: tests/kms_hdmi_inject: Retry ELD check to avoid transient audio races (rev2)
URL   : https://patchwork.freedesktop.org/series/165522/
State : success

== Summary ==

CI Bug Log - changes from IGT_8874 -> IGTPW_15059
====================================================

Summary
-------

  **SUCCESS**

  No regressions found.

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

Participating hosts (42 -> 40)
------------------------------

  Missing    (2): bat-dg2-13 fi-snb-2520m 

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

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

### IGT changes ###

#### Issues hit ####

  * igt@core_debugfs@read-all-entries:
    - bat-adlp-6:         [PASS][1] -> [DMESG-WARN][2] ([i915#15673])
   [1]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_8874/bat-adlp-6/igt@core_debugfs@read-all-entries.html
   [2]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_15059/bat-adlp-6/igt@core_debugfs@read-all-entries.html

  * igt@i915_selftest@live:
    - bat-mtlp-8:         [PASS][3] -> [DMESG-FAIL][4] ([i915#12061]) +1 other test dmesg-fail
   [3]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_8874/bat-mtlp-8/igt@i915_selftest@live.html
   [4]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_15059/bat-mtlp-8/igt@i915_selftest@live.html

  * igt@i915_selftest@live@workarounds:
    - bat-dg2-14:         [PASS][5] -> [DMESG-FAIL][6] ([i915#12061]) +1 other test dmesg-fail
   [5]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_8874/bat-dg2-14/igt@i915_selftest@live@workarounds.html
   [6]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_15059/bat-dg2-14/igt@i915_selftest@live@workarounds.html

  
#### Possible fixes ####

  * igt@core_auth@basic-auth:
    - bat-adlp-6:         [DMESG-WARN][7] ([i915#15673]) -> [PASS][8]
   [7]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_8874/bat-adlp-6/igt@core_auth@basic-auth.html
   [8]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_15059/bat-adlp-6/igt@core_auth@basic-auth.html

  
  [i915#12061]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/12061
  [i915#15673]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/15673


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

  * CI: CI-20190529 -> None
  * IGT: IGT_8874 -> IGTPW_15059

  CI-20190529: 20190529
  CI_DRM_18369: b6f6b69b2dffa9ad1c43b2149786b4630d41acbf @ git://anongit.freedesktop.org/gfx-ci/linux
  IGTPW_15059: d224e0a967016b7fbb51aa88d04772e680ce9971 @ https://gitlab.freedesktop.org/drm/igt-gpu-tools.git
  IGT_8874: 4568b2c141ab630c34f8eb2b9afab8cbf8f3ce9e @ https://gitlab.freedesktop.org/drm/igt-gpu-tools.git

== Logs ==

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

[-- Attachment #2: Type: text/html, Size: 3555 bytes --]