From: Libin Yang <libin.yang@xxxxxxxxx>
In resume from S3, HDAC HDMI codec driver dapm event callback may be
operated before HDMI codec driver turns on the display audio power
domain because of the contest between display driver and hdmi codec driver.
This patch adds the device_link between skl_nau88l25_max98357a machine
device(consumer) and hdmi codec device (supplier) to make sure the sequence
is always correct.
Signed-off-by: Libin Yang <libin.yang@xxxxxxxxx>
---
sound/soc/intel/boards/skl_nau88l25_max98357a.c | 20 +++++++++++++++++---
1 file changed, 17 insertions(+), 3 deletions(-)
diff --git a/sound/soc/intel/boards/skl_nau88l25_max98357a.c b/sound/soc/intel/boards/skl_nau88l25_max98357a.c
index 0922106..38d599b 100644
--- a/sound/soc/intel/boards/skl_nau88l25_max98357a.c
+++ b/sound/soc/intel/boards/skl_nau88l25_max98357a.c
@@ -24,6 +24,7 @@
#include <sound/soc-acpi.h>
#include "../../codecs/nau8825.h"
#include "../../codecs/hdac_hdmi.h"
+#include "hdac_hdmi_common.h"
#define SKL_NUVOTON_CODEC_DAI "nau8825-hifi"
#define SKL_MAXIM_CODEC_DAI "HiFi"
@@ -42,6 +43,7 @@ struct skl_hdmi_pcm {
struct skl_nau8825_private {
struct list_head hdmi_pcm_list;
+ struct device_link *link;
};
enum {
@@ -202,7 +204,8 @@ static int skylake_hdmi1_init(struct snd_soc_pcm_runtime *rtd)
list_add_tail(&pcm->head, &ctx->hdmi_pcm_list);
- return 0;
+ /* Setup a device_link between machine device and HDMI codec device. */
+ return hdac_hdmi_add_device_link(rtd->card->dev, dai->dev, &ctx->link);
}
static int skylake_hdmi2_init(struct snd_soc_pcm_runtime *rtd)
@@ -220,7 +223,8 @@ static int skylake_hdmi2_init(struct snd_soc_pcm_runtime *rtd)
list_add_tail(&pcm->head, &ctx->hdmi_pcm_list);
- return 0;
+ /* Setup a device_link between machine device and HDMI codec device. */
+ return hdac_hdmi_add_device_link(rtd->card->dev, dai->dev, &ctx->link);
}
static int skylake_hdmi3_init(struct snd_soc_pcm_runtime *rtd)
@@ -238,7 +242,8 @@ static int skylake_hdmi3_init(struct snd_soc_pcm_runtime *rtd)
list_add_tail(&pcm->head, &ctx->hdmi_pcm_list);
- return 0;
+ /* Setup a device_link between machine device and HDMI codec device. */
+ return hdac_hdmi_add_device_link(rtd->card->dev, dai->dev, &ctx->link);
}
static int skylake_nau8825_fe_init(struct snd_soc_pcm_runtime *rtd)
@@ -666,8 +671,17 @@ static const struct platform_device_id skl_board_ids[] = {
{ }
};
+static int skylake_audio_remove(struct platform_device *pdev)
+{
+ struct snd_soc_card *card = platform_get_drvdata(pdev);
+ struct skl_nau8825_private *ctx = snd_soc_card_get_drvdata(card);
+
+ return hdac_hdmi_del_device_link(&ctx->link);
+}
+
static struct platform_driver skylake_audio = {
.probe = skylake_audio_probe,
+ .remove = skylake_audio_remove,
.driver = {
.name = "skl_n88l25_m98357a",
.pm = &snd_soc_pm_ops,
--
2.7.4
_______________________________________________
Alsa-devel mailing list
Alsa-devel@xxxxxxxxxxxxxxxx
https://mailman.alsa-project.org/mailman/listinfo/alsa-devel
