Last active
March 14, 2023 02:37
-
-
Save jmontleon/4780154c309f956d97ca9a304a00da3f to your computer and use it in GitHub Desktop.
hdac_hdmi fix
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/sound/soc/codecs/hdac_hdmi.c b/sound/soc/codecs/hdac_hdmi.c | |
index ed4f7cdda04f..29d7352bc1e8 100644 | |
--- a/sound/soc/codecs/hdac_hdmi.c | |
+++ b/sound/soc/codecs/hdac_hdmi.c | |
@@ -436,23 +436,28 @@ static int hdac_hdmi_setup_audio_infoframe(struct hdac_device *hdev, | |
return 0; | |
} | |
-static int hdac_hdmi_set_tdm_slot(struct snd_soc_dai *dai, | |
- unsigned int tx_mask, unsigned int rx_mask, | |
- int slots, int slot_width) | |
+static int hdac_hdmi_set_stream(struct snd_soc_dai *dai, | |
+ void *stream, int direction) | |
{ | |
struct hdac_hdmi_priv *hdmi = snd_soc_dai_get_drvdata(dai); | |
struct hdac_device *hdev = hdmi->hdev; | |
struct hdac_hdmi_dai_port_map *dai_map; | |
struct hdac_hdmi_pcm *pcm; | |
+ struct hdac_stream *hstream; | |
- dev_dbg(&hdev->dev, "%s: strm_tag: %d\n", __func__, tx_mask); | |
+ if (!stream) | |
+ return -EINVAL; | |
+ | |
+ hstream = (struct hdac_stream *)stream; | |
+ | |
+ dev_dbg(&hdev->dev, "%s: strm_tag: %d\n", __func__, hstream->stream_tag); | |
dai_map = &hdmi->dai_map[dai->id]; | |
pcm = hdac_hdmi_get_pcm_from_cvt(hdmi, dai_map->cvt); | |
if (pcm) | |
- pcm->stream_tag = (tx_mask << 4); | |
+ pcm->stream_tag = (hstream->stream_tag << 4); | |
return 0; | |
} | |
@@ -1544,7 +1549,7 @@ static const struct snd_soc_dai_ops hdmi_dai_ops = { | |
.startup = hdac_hdmi_pcm_open, | |
.shutdown = hdac_hdmi_pcm_close, | |
.hw_params = hdac_hdmi_set_hw_params, | |
- .set_tdm_slot = hdac_hdmi_set_tdm_slot, | |
+ .set_stream = hdac_hdmi_set_stream, | |
}; | |
/* |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment