shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-06 02:50:49 +09:00
Code Issues Packages Projects Releases Wiki Activity

Revert "ASoC: hdac_hdmi: use set_stream() instead of set_tdm_slots()"

Browse Source 
This reverts commit acbbfdba9c.

The function this uses has been reverted from Android kernels, so revert
this to fix the build problems in 5.10.178

Fixes: 791a854ae5 ("Linux 5.10.178")
Change-Id: Id2c260f023e9e26ab2333a13ecf890f321f28af0
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
This commit is contained in:
Greg Kroah-Hartman
2023-05-01 23:26:19 +00:00
parent a406acdee0
commit 49df5be923
1 changed files with 6 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
sound/soc/codecs/hdac_hdmi.c
View File

@@ -436,28 +436,23 @@ static int hdac_hdmi_setup_audio_infoframe(struct hdac_device *hdev,
return 0; return 0;
} }
static int hdac_hdmi_set_stream(struct snd_soc_dai *dai, static int hdac_hdmi_set_tdm_slot(struct snd_soc_dai *dai,
void *stream, int direction) unsigned int tx_mask, unsigned int rx_mask,
int slots, int slot_width)
{ {
struct hdac_hdmi_priv *hdmi = snd_soc_dai_get_drvdata(dai); struct hdac_hdmi_priv *hdmi = snd_soc_dai_get_drvdata(dai);
struct hdac_device *hdev = hdmi->hdev; struct hdac_device *hdev = hdmi->hdev;
struct hdac_hdmi_dai_port_map *dai_map; struct hdac_hdmi_dai_port_map *dai_map;
struct hdac_hdmi_pcm *pcm; struct hdac_hdmi_pcm *pcm;
struct hdac_stream *hstream;
if (!stream) dev_dbg(&hdev->dev, "%s: strm_tag: %d\n", __func__, tx_mask);
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]; dai_map = &hdmi->dai_map[dai->id];
pcm = hdac_hdmi_get_pcm_from_cvt(hdmi, dai_map->cvt); pcm = hdac_hdmi_get_pcm_from_cvt(hdmi, dai_map->cvt);
if (pcm) if (pcm)
pcm->stream_tag = (hstream->stream_tag << 4); pcm->stream_tag = (tx_mask << 4);
return 0; return 0;
} }
@@ -1549,7 +1544,7 @@ static const struct snd_soc_dai_ops hdmi_dai_ops = {
.startup = hdac_hdmi_pcm_open, .startup = hdac_hdmi_pcm_open,
.shutdown = hdac_hdmi_pcm_close, .shutdown = hdac_hdmi_pcm_close,
.hw_params = hdac_hdmi_set_hw_params, .hw_params = hdac_hdmi_set_hw_params,
.set_stream = hdac_hdmi_set_stream, .set_tdm_slot = hdac_hdmi_set_tdm_slot,
}; };
/* /*