[igt-dev] [PATCH i-g-t v6 5/9] core_hotunplug: fix audio unbind logic
Mauro Carvalho Chehab
mauro.chehab at linux.intel.com
Tue May 17 15:40:40 UTC 2022
From: Mauro Carvalho Chehab <mchehab at kernel.org>
The current audio unbind logic is wrong: it expects the audio
driver to depend on i915 only on Haswell, Broadwell and DG1.
That doesn't match the Kernel driver, where snd-hda-audio binds
on i915 also on Skylake, Braswell and whenever it needs to use
pm runtime from the DRM driver.
Now that lib/igt-kmod has gained improved support for audio
unbind, update core_hotunplug to benefit from the newer logic.
Reviewed-by: Andi Shyti <andi.shyti at linux.intel.com>
Reviewed-by Jonathan Cavitt <jonathan.cavitt at intel.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab at kernel.org>
---
tests/core_hotunplug.c | 53 ++++++++++++++++++------------------------
1 file changed, 22 insertions(+), 31 deletions(-)
diff --git a/tests/core_hotunplug.c b/tests/core_hotunplug.c
index 18e37ec8feba..456ad6b4ce40 100644
--- a/tests/core_hotunplug.c
+++ b/tests/core_hotunplug.c
@@ -54,7 +54,7 @@ struct hotunplug {
const char *failure;
bool need_healthcheck;
bool has_intel_perf;
- bool snd_unload;
+ char *snd_driver;
};
/* Helpers */
@@ -140,27 +140,22 @@ static void prepare(struct hotunplug *priv)
static void driver_unbind(struct hotunplug *priv, const char *prefix,
int timeout)
{
- /**
- * FIXME: Unbinding the i915 driver on affected platforms with
- * audio results in a kernel WARN on "i915 raw-wakerefs=1
- * wakelocks=1 on cleanup". The below CI friendly user level
- * workaround to unload and de-couple audio from IGT testing,
- * prevents the warning from appearing. Drop this hack as soon
- * as this is fixed in the kernel. unbind/re-bind validation
- * on audio side is not robust and we could have potential
- * failures blocking display CI, currently this seems to the
- * safest and easiest way out.
+ /*
+ * FIXME: on some devices, the audio driver (snd_hda_intel)
+ * binds into the i915 driver. On such hardware, kernel warnings
+ * and errors may happen if i915 is unbind/removed before removing
+ * first the audio driver.
+ * So, add a logic that unloads the audio driver before trying to
+ * unbind i915 driver, reloading it when binding again.
*/
- if (priv->snd_unload) {
- if (igt_audio_driver_unload(NULL)) {
- priv->snd_unload = false;
- igt_warn("Could not unload audio driver\n");
- igt_kmod_list_loaded();
- igt_lsof("/dev/snd");
- igt_skip("Audio is in use, skipping\n");
- } else {
- igt_info("Preventively unloaded audio driver\n");
- }
+ if (igt_audio_driver_unload(&priv->snd_driver)) {
+ if (priv->snd_driver)
+ igt_warn("Could not unload audio driver %s\n", priv->snd_driver);
+ igt_kmod_list_loaded();
+ igt_lsof("/dev/snd");
+ igt_skip("Audio is in use, skipping\n");
+ } else if (priv->snd_driver) {
+ igt_info("Unloaded audio driver %s\n", priv->snd_driver);
}
local_debug("%sunbinding the driver from the device\n", prefix);
@@ -192,8 +187,11 @@ static void driver_bind(struct hotunplug *priv, int timeout)
F_OK, 0),
"Rebound device not present (%s)!\n", priv->dev_bus_addr);
- if (priv->snd_unload)
- igt_kmod_load("snd_hda_intel", NULL);
+ if (priv->snd_driver) {
+ igt_info("Realoading %s\n", priv->snd_driver);
+ igt_kmod_load(priv->snd_driver, NULL);
+ priv->snd_driver = NULL;
+ }
}
/* Remove (virtually unplug) the device from its bus */
@@ -606,7 +604,7 @@ igt_main
.failure = NULL,
.need_healthcheck = true,
.has_intel_perf = false,
- .snd_unload = false,
+ .snd_driver = NULL,
};
igt_fixture {
@@ -616,13 +614,6 @@ igt_main
igt_skip_on_f(fd_drm < 0, "No known DRM device found\n");
if (is_i915_device(fd_drm)) {
- /*
- * Audio driver does not support hot unplug via DRM
- * audio component framework, so driver must be unloaded
- * explicitly for i915 unbind tests.
- */
- priv.snd_unload = true;
-
gem_quiescent_gpu(fd_drm);
igt_require_gem(fd_drm);
--
2.36.1
More information about the igt-dev
mailing list