All of lore.kernel.org
 help / color / mirror / Atom feed
From: libin.yang@intel.com
To: alsa-devel@alsa-project.org, tiwai@suse.de, broonie@kernel.org,
	pierre-louis.bossart@linux.intel.com
Cc: libin.yang@intel.com
Subject: [PATCH v2 05/12] ASoC: intel: glk_rt5682_max98357a: add device_link to HDMI audio
Date: Thu, 11 Apr 2019 22:09:46 +0800	[thread overview]
Message-ID: <1554991793-14851-6-git-send-email-libin.yang@intel.com> (raw)
In-Reply-To: <1554991793-14851-1-git-send-email-libin.yang@intel.com>

From: Libin Yang <libin.yang@intel.com>

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 glk_rt5682_max98357a machine device
(consumer) and hdmi codec device (supplier) to make sure the sequence is
always correct.

Signed-off-by: Libin Yang <libin.yang@intel.com>
---
 sound/soc/intel/boards/glk_rt5682_max98357a.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/sound/soc/intel/boards/glk_rt5682_max98357a.c b/sound/soc/intel/boards/glk_rt5682_max98357a.c
index d17126f..2372dd3 100644
--- a/sound/soc/intel/boards/glk_rt5682_max98357a.c
+++ b/sound/soc/intel/boards/glk_rt5682_max98357a.c
@@ -20,6 +20,7 @@
 #include "../skylake/skl.h"
 #include "../../codecs/rt5682.h"
 #include "../../codecs/hdac_hdmi.h"
+#include "hdac_hdmi_common.h"
 
 /* The platform clock outputs 19.2Mhz clock to codec as I2S MCLK */
 #define GLK_PLAT_CLK_FREQ 19200000
@@ -42,6 +43,7 @@ struct glk_hdmi_pcm {
 struct glk_card_private {
 	struct snd_soc_jack geminilake_headset;
 	struct list_head hdmi_pcm_list;
+	struct device_link *link;
 };
 
 enum {
@@ -218,7 +220,8 @@ static int geminilake_hdmi_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 geminilake_rt5682_fe_init(struct snd_soc_pcm_runtime *rtd)
-- 
2.7.4

  parent reply	other threads:[~2019-04-11 14:26 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-04-11 14:09 [PATCH v2 00/12] ASoC: intel: add device_link to HDMI audio libin.yang
2019-04-11 14:09 ` [PATCH v2 01/12] ASoC: intel: boards: define some general functions for hdac_hdmi libin.yang
2019-04-11 14:09 ` [PATCH v2 02/12] ASoC: intel: skl_hda_dsp_generic: add device_link to HDMI audio libin.yang
2019-04-11 14:09 ` [PATCH v2 03/12] ASoC: intel: bxt_da7219_max98357a: " libin.yang
2019-04-11 14:09 ` [PATCH v2 04/12] ASoC: intel: bxt_rt298: " libin.yang
2019-04-11 14:09 ` libin.yang [this message]
2019-04-11 14:09 ` [PATCH v2 06/12] ASoC: intel: kbl_da7219_max98357a: " libin.yang
2019-04-11 14:09 ` [PATCH v2 07/12] ASoC: intel: kbl_da7219_max98927: " libin.yang
2019-04-11 14:09 ` [PATCH v2 08/12] ASoC: intel: kbl_rt5660: " libin.yang
2019-04-11 14:09 ` [PATCH v2 09/12] ASoC: intel: kbl_rt5663_max98927 " libin.yang
2019-04-11 14:09 ` [PATCH v2 10/12] ASoC: intel: kbl_rt5663_rt5514_max98927 " libin.yang
2019-04-11 14:09 ` [PATCH v2 11/12] ASoC: intel: skl_nau88l25_max98357a " libin.yang
2019-04-11 14:09 ` [PATCH v2 12/12] ASoC: intel: skl_nau88l25_ssm4567 " libin.yang

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1554991793-14851-6-git-send-email-libin.yang@intel.com \
    --to=libin.yang@intel.com \
    --cc=alsa-devel@alsa-project.org \
    --cc=broonie@kernel.org \
    --cc=pierre-louis.bossart@linux.intel.com \
    --cc=tiwai@suse.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.