AuxXxilium/linux_dsm_epyc7002
1
0
Fork 0
mirror of https://github.com/AuxXxilium/linux_dsm_epyc7002.git synced 2024-11-24 06:20:53 +07:00
Code Issues Actions Packages Projects Releases Wiki Activity

ASoC: hdmi-codec: merge .digital_mute() into .mute_stream()

Browse Source 
snd_soc_dai_digital_mute() is internally using both
mute_stream() (1) or digital_mute() (2), but the difference between
these 2 are only handling direction.
We can merge digital_mute() into mute_stream

	int snd_soc_dai_digital_mute(xxx, int direction)
	{
		...
		else if (dai->driver->ops->mute_stream)
(1)			return dai->driver->ops->mute_stream(xxx, direction);
		else if (direction == SNDRV_PCM_STREAM_PLAYBACK &&
			 dai->driver->ops->digital_mute)
(2)			return dai->driver->ops->digital_mute(xxx);
		...
	}

For hdmi-codec, we need to update struct hdmi_codec_ops,
and all its users in the same time.

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Reviewed-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
Link: https://lore.kernel.org/r/87d055xxj2.wl-kuninori.morimoto.gx@renesas.com
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Kuninori Morimoto 2020-07-09 10:55:45 +09:00 committed by Mark Brown
parent 350d993510
commit d789710fb2
No known key found for this signature in database
GPG Key ID: 24D68B725D5487D0
9 changed files with 48 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/gpu/drm/bridge/sii902x.c
View File

@ -672,8 +672,8 @@ static void sii902x_audio_shutdown(struct device *dev, void *data)
clk_disable_unprepare(sii902x->audio.mclk); clk_disable_unprepare(sii902x->audio.mclk);
} }
static int sii902x_audio_digital_mute(struct device *dev, static int sii902x_audio_mute(struct device *dev, void *data,
void *data, bool enable) bool enable, int direction)
{ {
struct sii902x *sii902x = dev_get_drvdata(dev); struct sii902x *sii902x = dev_get_drvdata(dev);
@ -724,9 +724,10 @@ static int sii902x_audio_get_dai_id(struct snd_soc_component *component,
static const struct hdmi_codec_ops sii902x_audio_codec_ops = { static const struct hdmi_codec_ops sii902x_audio_codec_ops = {
.hw_params = sii902x_audio_hw_params, .hw_params = sii902x_audio_hw_params,
.audio_shutdown = sii902x_audio_shutdown, .audio_shutdown = sii902x_audio_shutdown,
.digital_mute = sii902x_audio_digital_mute, .mute_stream = sii902x_audio_mute,
.get_eld = sii902x_audio_get_eld, .get_eld = sii902x_audio_get_eld,
.get_dai_id = sii902x_audio_get_dai_id, .get_dai_id = sii902x_audio_get_dai_id,
.no_capture_mute = 1,
}; };
static int sii902x_audio_codec_init(struct sii902x *sii902x, static int sii902x_audio_codec_init(struct sii902x *sii902x,

6
drivers/gpu/drm/exynos/exynos_hdmi.c
View File

@ -1604,7 +1604,8 @@ static int hdmi_audio_hw_params(struct device *dev, void *data,
return 0; return 0;
} }
static int hdmi_audio_digital_mute(struct device *dev, void *data, bool mute) static int hdmi_audio_mute(struct device *dev, void *data,
bool mute, int direction)
{ {
struct hdmi_context *hdata = dev_get_drvdata(dev); struct hdmi_context *hdata = dev_get_drvdata(dev);
@ -1634,8 +1635,9 @@ static int hdmi_audio_get_eld(struct device *dev, void *data, uint8_t *buf,
static const struct hdmi_codec_ops audio_codec_ops = { static const struct hdmi_codec_ops audio_codec_ops = {
.hw_params = hdmi_audio_hw_params, .hw_params = hdmi_audio_hw_params,
.audio_shutdown = hdmi_audio_shutdown, .audio_shutdown = hdmi_audio_shutdown,
.digital_mute = hdmi_audio_digital_mute, .mute_stream = hdmi_audio_mute,
.get_eld = hdmi_audio_get_eld, .get_eld = hdmi_audio_get_eld,
.no_capture_mute = 1,
}; };
static int hdmi_register_audio_device(struct hdmi_context *hdata) static int hdmi_register_audio_device(struct hdmi_context *hdata)

7
drivers/gpu/drm/i2c/tda998x_drv.c
View File

@ -1133,8 +1133,8 @@ static void tda998x_audio_shutdown(struct device *dev, void *data)
mutex_unlock(&priv->audio_mutex); mutex_unlock(&priv->audio_mutex);
} }
static int tda998x_audio_digital_mute(struct device *dev, void *data, static int tda998x_audio_mute_stream(struct device *dev, void *data,
bool enable) bool enable, int direction)
{ {
struct tda998x_priv *priv = dev_get_drvdata(dev); struct tda998x_priv *priv = dev_get_drvdata(dev);
@ -1162,8 +1162,9 @@ static int tda998x_audio_get_eld(struct device *dev, void *data,
static const struct hdmi_codec_ops audio_codec_ops = { static const struct hdmi_codec_ops audio_codec_ops = {
.hw_params = tda998x_audio_hw_params, .hw_params = tda998x_audio_hw_params,
.audio_shutdown = tda998x_audio_shutdown, .audio_shutdown = tda998x_audio_shutdown,
.digital_mute = tda998x_audio_digital_mute, .mute_stream = tda998x_audio_mute_stream,
.get_eld = tda998x_audio_get_eld, .get_eld = tda998x_audio_get_eld,
.no_capture_mute = 1,
}; };
static int tda998x_audio_codec_init(struct tda998x_priv *priv, static int tda998x_audio_codec_init(struct tda998x_priv *priv,

6
drivers/gpu/drm/mediatek/mtk_hdmi.c
View File

@ -1647,7 +1647,8 @@ static void mtk_hdmi_audio_shutdown(struct device *dev, void *data)
} }
static int static int
mtk_hdmi_audio_digital_mute(struct device *dev, void *data, bool enable) mtk_hdmi_audio_mute(struct device *dev, void *data,
bool enable, int direction)
{ {
struct mtk_hdmi *hdmi = dev_get_drvdata(dev); struct mtk_hdmi *hdmi = dev_get_drvdata(dev);
@ -1692,9 +1693,10 @@ static const struct hdmi_codec_ops mtk_hdmi_audio_codec_ops = {
.hw_params = mtk_hdmi_audio_hw_params, .hw_params = mtk_hdmi_audio_hw_params,
.audio_startup = mtk_hdmi_audio_startup, .audio_startup = mtk_hdmi_audio_startup,
.audio_shutdown = mtk_hdmi_audio_shutdown, .audio_shutdown = mtk_hdmi_audio_shutdown,
.digital_mute = mtk_hdmi_audio_digital_mute, .mute_stream = mtk_hdmi_audio_mute,
.get_eld = mtk_hdmi_audio_get_eld, .get_eld = mtk_hdmi_audio_get_eld,
.hook_plugged_cb = mtk_hdmi_audio_hook_plugged_cb, .hook_plugged_cb = mtk_hdmi_audio_hook_plugged_cb,
.no_capture_mute = 1,
}; };
static int mtk_hdmi_register_audio_driver(struct device *dev) static int mtk_hdmi_register_audio_driver(struct device *dev)

7
drivers/gpu/drm/rockchip/cdn-dp-core.c
View File

@ -817,8 +817,8 @@ static void cdn_dp_audio_shutdown(struct device *dev, void *data)
mutex_unlock(&dp->lock); mutex_unlock(&dp->lock);
} }
static int cdn_dp_audio_digital_mute(struct device *dev, void *data, static int cdn_dp_audio_mute_stream(struct device *dev, void *data,
bool enable) bool enable, int direction)
{ {
struct cdn_dp_device *dp = dev_get_drvdata(dev); struct cdn_dp_device *dp = dev_get_drvdata(dev);
int ret; int ret;
@ -849,8 +849,9 @@ static int cdn_dp_audio_get_eld(struct device *dev, void *data,
static const struct hdmi_codec_ops audio_codec_ops = { static const struct hdmi_codec_ops audio_codec_ops = {
.hw_params = cdn_dp_audio_hw_params, .hw_params = cdn_dp_audio_hw_params,
.audio_shutdown = cdn_dp_audio_shutdown, .audio_shutdown = cdn_dp_audio_shutdown,
.digital_mute = cdn_dp_audio_digital_mute, .mute_stream = cdn_dp_audio_mute_stream,
.get_eld = cdn_dp_audio_get_eld, .get_eld = cdn_dp_audio_get_eld,
.no_capture_mute = 1,
}; };
static int cdn_dp_audio_codec_init(struct cdn_dp_device *dp, static int cdn_dp_audio_codec_init(struct cdn_dp_device *dp,

6
drivers/gpu/drm/sti/sti_hdmi.c
View File

@ -1191,7 +1191,8 @@ static int hdmi_audio_hw_params(struct device *dev,
return 0; return 0;
} }
static int hdmi_audio_digital_mute(struct device *dev, void *data, bool enable) static int hdmi_audio_mute(struct device *dev, void *data,
bool enable, int direction)
{ {
struct sti_hdmi *hdmi = dev_get_drvdata(dev); struct sti_hdmi *hdmi = dev_get_drvdata(dev);
@ -1219,8 +1220,9 @@ static int hdmi_audio_get_eld(struct device *dev, void *data, uint8_t *buf, size
static const struct hdmi_codec_ops audio_codec_ops = { static const struct hdmi_codec_ops audio_codec_ops = {
.hw_params = hdmi_audio_hw_params, .hw_params = hdmi_audio_hw_params,
.audio_shutdown = hdmi_audio_shutdown, .audio_shutdown = hdmi_audio_shutdown,
.digital_mute = hdmi_audio_digital_mute, .mute_stream = hdmi_audio_mute,
.get_eld = hdmi_audio_get_eld, .get_eld = hdmi_audio_get_eld,
.no_capture_mute = 1,
}; };
static int sti_hdmi_register_audio_driver(struct device *dev, static int sti_hdmi_register_audio_driver(struct device *dev,

7
drivers/gpu/drm/zte/zx_hdmi.c
View File

@ -439,8 +439,8 @@ static int zx_hdmi_audio_hw_params(struct device *dev,
return zx_hdmi_infoframe_trans(hdmi, &frame, FSEL_AUDIO); return zx_hdmi_infoframe_trans(hdmi, &frame, FSEL_AUDIO);
} }
static int zx_hdmi_audio_digital_mute(struct device *dev, void *data, static int zx_hdmi_audio_mute(struct device *dev, void *data,
bool enable) bool enable, int direction)
{ {
struct zx_hdmi *hdmi = dev_get_drvdata(dev); struct zx_hdmi *hdmi = dev_get_drvdata(dev);
@ -468,8 +468,9 @@ static const struct hdmi_codec_ops zx_hdmi_codec_ops = {
.audio_startup = zx_hdmi_audio_startup, .audio_startup = zx_hdmi_audio_startup,
.hw_params = zx_hdmi_audio_hw_params, .hw_params = zx_hdmi_audio_hw_params,
.audio_shutdown = zx_hdmi_audio_shutdown, .audio_shutdown = zx_hdmi_audio_shutdown,
.digital_mute = zx_hdmi_audio_digital_mute, .mute_stream = zx_hdmi_audio_mute,
.get_eld = zx_hdmi_audio_get_eld, .get_eld = zx_hdmi_audio_get_eld,
.no_capture_mute = 1,
}; };
static struct hdmi_codec_pdata zx_hdmi_codec_pdata = { static struct hdmi_codec_pdata zx_hdmi_codec_pdata = {

6
include/sound/hdmi-codec.h
View File

@ -76,7 +76,8 @@ struct hdmi_codec_ops {
* Mute/unmute HDMI audio stream. * Mute/unmute HDMI audio stream.
* Optional * Optional
*/ */
int (*digital_mute)(struct device *dev, void *data, bool enable); int (*mute_stream)(struct device *dev, void *data,
bool enable, int direction);
/* /*
* Provides EDID-Like-Data from connected HDMI device. * Provides EDID-Like-Data from connected HDMI device.
@ -99,6 +100,9 @@ struct hdmi_codec_ops {
int (*hook_plugged_cb)(struct device *dev, void *data, int (*hook_plugged_cb)(struct device *dev, void *data,
hdmi_codec_plugged_cb fn, hdmi_codec_plugged_cb fn,
struct device *codec_dev); struct device *codec_dev);
/* bit field */
unsigned int no_capture_mute:1;
}; };
/* HDMI codec initalization data */ /* HDMI codec initalization data */

21
sound/soc/codecs/hdmi-codec.c
View File

@ -558,13 +558,22 @@ static int hdmi_codec_i2s_set_fmt(struct snd_soc_dai *dai,
return 0; return 0;
} }
static int hdmi_codec_digital_mute(struct snd_soc_dai *dai, int mute) static int hdmi_codec_mute(struct snd_soc_dai *dai, int mute, int direction)
{ {
struct hdmi_codec_priv *hcp = snd_soc_dai_get_drvdata(dai); struct hdmi_codec_priv *hcp = snd_soc_dai_get_drvdata(dai);
if (hcp->hcd.ops->digital_mute) /*
return hcp->hcd.ops->digital_mute(dai->dev->parent, * ignore if direction was CAPTURE
hcp->hcd.data, mute); * and it had .no_capture_mute flag
* see
* snd_soc_dai_digital_mute()
*/
if (hcp->hcd.ops->mute_stream &&
(direction == SNDRV_PCM_STREAM_PLAYBACK ||
!hcp->hcd.ops->no_capture_mute))
return hcp->hcd.ops->mute_stream(dai->dev->parent,
hcp->hcd.data,
mute, direction);
return -ENOTSUPP; return -ENOTSUPP;
} }
@ -574,14 +583,14 @@ static const struct snd_soc_dai_ops hdmi_codec_i2s_dai_ops = {
.shutdown = hdmi_codec_shutdown, .shutdown = hdmi_codec_shutdown,
.hw_params = hdmi_codec_hw_params, .hw_params = hdmi_codec_hw_params,
.set_fmt = hdmi_codec_i2s_set_fmt, .set_fmt = hdmi_codec_i2s_set_fmt,
.digital_mute = hdmi_codec_digital_mute, .mute_stream = hdmi_codec_mute,
}; };
static const struct snd_soc_dai_ops hdmi_codec_spdif_dai_ops = { static const struct snd_soc_dai_ops hdmi_codec_spdif_dai_ops = {
.startup = hdmi_codec_startup, .startup = hdmi_codec_startup,
.shutdown = hdmi_codec_shutdown, .shutdown = hdmi_codec_shutdown,
.hw_params = hdmi_codec_hw_params, .hw_params = hdmi_codec_hw_params,
.digital_mute = hdmi_codec_digital_mute, .mute_stream = hdmi_codec_mute,
}; };
#define HDMI_RATES (SNDRV_PCM_RATE_32000 | SNDRV_PCM_RATE_44100 |\ #define HDMI_RATES (SNDRV_PCM_RATE_32000 | SNDRV_PCM_RATE_44100 |\