Skip to content

Commit f6887a7

Browse files
jmontleonbroonie
authored andcommitted
ASoC: hdac_hdmi: use set_stream() instead of set_tdm_slots()
hdac_hdmi was not updated to use set_stream() instead of set_tdm_slots() in the original commit so HDMI no longer produces audio. Cc: [email protected] Link: https://lore.kernel.org/regressions/CAJD_bPKQdtaExvVEKxhQ47G-ZXDA=k+gzhMJRHLBe=mysPnuKA@mail.gmail.com/ Fixes: 6361104 ("ASoC: Intel/SOF: use set_stream() instead of set_tdm_slots() for HDAudio") Signed-off-by: Jason Montleon <[email protected]> Reviewed-by: Pierre-Louis Bossart <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Mark Brown <[email protected]>
1 parent a4a3203 commit f6887a7

File tree

1 file changed

+11
-6
lines changed

1 file changed

+11
-6
lines changed

sound/soc/codecs/hdac_hdmi.c

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -436,23 +436,28 @@ static int hdac_hdmi_setup_audio_infoframe(struct hdac_device *hdev,
436436
return 0;
437437
}
438438

439-
static int hdac_hdmi_set_tdm_slot(struct snd_soc_dai *dai,
440-
unsigned int tx_mask, unsigned int rx_mask,
441-
int slots, int slot_width)
439+
static int hdac_hdmi_set_stream(struct snd_soc_dai *dai,
440+
void *stream, int direction)
442441
{
443442
struct hdac_hdmi_priv *hdmi = snd_soc_dai_get_drvdata(dai);
444443
struct hdac_device *hdev = hdmi->hdev;
445444
struct hdac_hdmi_dai_port_map *dai_map;
446445
struct hdac_hdmi_pcm *pcm;
446+
struct hdac_stream *hstream;
447447

448-
dev_dbg(&hdev->dev, "%s: strm_tag: %d\n", __func__, tx_mask);
448+
if (!stream)
449+
return -EINVAL;
450+
451+
hstream = (struct hdac_stream *)stream;
452+
453+
dev_dbg(&hdev->dev, "%s: strm_tag: %d\n", __func__, hstream->stream_tag);
449454

450455
dai_map = &hdmi->dai_map[dai->id];
451456

452457
pcm = hdac_hdmi_get_pcm_from_cvt(hdmi, dai_map->cvt);
453458

454459
if (pcm)
455-
pcm->stream_tag = (tx_mask << 4);
460+
pcm->stream_tag = (hstream->stream_tag << 4);
456461

457462
return 0;
458463
}
@@ -1544,7 +1549,7 @@ static const struct snd_soc_dai_ops hdmi_dai_ops = {
15441549
.startup = hdac_hdmi_pcm_open,
15451550
.shutdown = hdac_hdmi_pcm_close,
15461551
.hw_params = hdac_hdmi_set_hw_params,
1547-
.set_tdm_slot = hdac_hdmi_set_tdm_slot,
1552+
.set_stream = hdac_hdmi_set_stream,
15481553
};
15491554

15501555
/*

0 commit comments

Comments
 (0)