Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5dd0775e authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'asoc-hdmi-codec-pdata' of... 

Merge tag 'asoc-hdmi-codec-pdata' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound

 into drm-next

ASoC: Add private data for HDMI CODEC callbacks

Allow the HDMI CODECs to get private data passed in in callbacks.

[airlied:
Add STI/mediatek patches from Arnd for drivers merged later in drm tree.]

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>

* tag 'asoc-hdmi-codec-pdata' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound:
  ASoC: hdmi-codec: callback function will be called with private data
parents dac2c48c efc9194b

drivers/gpu/drm/mediatek/mtk_hdmi.c

+5 −5
Original line number Diff line number Diff line
@@ -1535,7 +1535,7 @@ static int mtk_hdmi_dt_parse_pdata(struct mtk_hdmi *hdmi, 
 * HDMI audio codec callbacks

 */



static int mtk_hdmi_audio_hw_params(struct device *dev,

static int mtk_hdmi_audio_hw_params(struct device *dev, void *data,

				    struct hdmi_codec_daifmt *daifmt,

				    struct hdmi_codec_params *params)

{
@@ -1604,7 +1604,7 @@ static int mtk_hdmi_audio_hw_params(struct device *dev, 
	return 0;

}



static int mtk_hdmi_audio_startup(struct device *dev)

static int mtk_hdmi_audio_startup(struct device *dev, void *data)

{

	struct mtk_hdmi *hdmi = dev_get_drvdata(dev);
@@ -1615,7 +1615,7 @@ static int mtk_hdmi_audio_startup(struct device *dev) 
	return 0;

}



static void mtk_hdmi_audio_shutdown(struct device *dev)

static void mtk_hdmi_audio_shutdown(struct device *dev, void *data)

{

	struct mtk_hdmi *hdmi = dev_get_drvdata(dev);
@@ -1624,7 +1624,7 @@ static void mtk_hdmi_audio_shutdown(struct device *dev) 
	mtk_hdmi_audio_disable(hdmi);

}



int mtk_hdmi_audio_digital_mute(struct device *dev, bool enable)

int mtk_hdmi_audio_digital_mute(struct device *dev, void *data, bool enable)

{

	struct mtk_hdmi *hdmi = dev_get_drvdata(dev);
@@ -1638,7 +1638,7 @@ int mtk_hdmi_audio_digital_mute(struct device *dev, bool enable) 
	return 0;

}



static int mtk_hdmi_audio_get_eld(struct device *dev, uint8_t *buf, size_t len)

static int mtk_hdmi_audio_get_eld(struct device *dev, void *data, uint8_t *buf, size_t len)

{

	struct mtk_hdmi *hdmi = dev_get_drvdata(dev);

drivers/gpu/drm/sti/sti_hdmi.c

+4 −3
Original line number Diff line number Diff line
@@ -1169,7 +1169,7 @@ static int hdmi_audio_configure(struct sti_hdmi *hdmi, 
	return hdmi_audio_infoframe_config(hdmi);

}



static void hdmi_audio_shutdown(struct device *dev)

static void hdmi_audio_shutdown(struct device *dev, void *data)

{

	struct sti_hdmi *hdmi = dev_get_drvdata(dev);

	int audio_cfg;
@@ -1186,6 +1186,7 @@ static void hdmi_audio_shutdown(struct device *dev) 
}



static int hdmi_audio_hw_params(struct device *dev,

				void *data,

				struct hdmi_codec_daifmt *daifmt,

				struct hdmi_codec_params *params)

{
@@ -1221,7 +1222,7 @@ static int hdmi_audio_hw_params(struct device *dev, 
	return 0;

}



static int hdmi_audio_digital_mute(struct device *dev, bool enable)

static int hdmi_audio_digital_mute(struct device *dev, void *data, bool enable)

{

	struct sti_hdmi *hdmi = dev_get_drvdata(dev);
@@ -1235,7 +1236,7 @@ static int hdmi_audio_digital_mute(struct device *dev, bool enable) 
	return 0;

}



static int hdmi_audio_get_eld(struct device *dev, uint8_t *buf, size_t len)

static int hdmi_audio_get_eld(struct device *dev, void *data, uint8_t *buf, size_t len)

{

	struct sti_hdmi *hdmi = dev_get_drvdata(dev);

	struct drm_connector *connector = hdmi->drm_connector;

include/sound/hdmi-codec.h

+8 −5
Original line number Diff line number Diff line
@@ -53,18 +53,19 @@ struct hdmi_codec_params { 
	int channels;

};



struct hdmi_codec_pdata;

struct hdmi_codec_ops {

	/*

	 * Called when ASoC starts an audio stream setup.

	 * Optional

	 */

	int (*audio_startup)(struct device *dev);

	int (*audio_startup)(struct device *dev, void *data);



	/*

	 * Configures HDMI-encoder for audio stream.

	 * Mandatory

	 */

	int (*hw_params)(struct device *dev,

	int (*hw_params)(struct device *dev, void *data,

			 struct hdmi_codec_daifmt *fmt,

			 struct hdmi_codec_params *hparms);
@@ -72,19 +73,20 @@ struct hdmi_codec_ops { 
	 * Shuts down the audio stream.

	 * Mandatory

	 */

	void (*audio_shutdown)(struct device *dev);

	void (*audio_shutdown)(struct device *dev, void *data);



	/*

	 * Mute/unmute HDMI audio stream.

	 * Optional

	 */

	int (*digital_mute)(struct device *dev, bool enable);

	int (*digital_mute)(struct device *dev, void *data, bool enable);



	/*

	 * Provides EDID-Like-Data from connected HDMI device.

	 * Optional

	 */

	int (*get_eld)(struct device *dev, uint8_t *buf, size_t len);

	int (*get_eld)(struct device *dev, void *data,

		       uint8_t *buf, size_t len);

};



/* HDMI codec initalization data */
@@ -93,6 +95,7 @@ struct hdmi_codec_pdata { 
	uint i2s:1;

	uint spdif:1;

	int max_i2s_channels;

	void *data;

};



#define HDMI_CODEC_DRV_NAME "hdmi-audio-codec"

sound/soc/codecs/hdmi-codec.c

+8 −7
Original line number Diff line number Diff line
@@ -112,7 +112,7 @@ static int hdmi_codec_startup(struct snd_pcm_substream *substream, 
		return ret;



	if (hcp->hcd.ops->audio_startup) {

		ret = hcp->hcd.ops->audio_startup(dai->dev->parent);

		ret = hcp->hcd.ops->audio_startup(dai->dev->parent, hcp->hcd.data);

		if (ret) {

			mutex_lock(&hcp->current_stream_lock);

			hcp->current_stream = NULL;
@@ -122,8 +122,8 @@ static int hdmi_codec_startup(struct snd_pcm_substream *substream, 
	}



	if (hcp->hcd.ops->get_eld) {

		ret = hcp->hcd.ops->get_eld(dai->dev->parent, hcp->eld,

					    sizeof(hcp->eld));

		ret = hcp->hcd.ops->get_eld(dai->dev->parent, hcp->hcd.data,

					    hcp->eld, sizeof(hcp->eld));



		if (!ret) {

			ret = snd_pcm_hw_constraint_eld(substream->runtime,
@@ -144,7 +144,7 @@ static void hdmi_codec_shutdown(struct snd_pcm_substream *substream, 


	WARN_ON(hcp->current_stream != substream);



	hcp->hcd.ops->audio_shutdown(dai->dev->parent);

	hcp->hcd.ops->audio_shutdown(dai->dev->parent, hcp->hcd.data);



	mutex_lock(&hcp->current_stream_lock);

	hcp->current_stream = NULL;
@@ -195,8 +195,8 @@ static int hdmi_codec_hw_params(struct snd_pcm_substream *substream, 
	hp.sample_rate = params_rate(params);

	hp.channels = params_channels(params);



	return hcp->hcd.ops->hw_params(dai->dev->parent, &hcp->daifmt[dai->id],

				       &hp);

	return hcp->hcd.ops->hw_params(dai->dev->parent, hcp->hcd.data,

				       &hcp->daifmt[dai->id], &hp);

}



static int hdmi_codec_set_fmt(struct snd_soc_dai *dai,
@@ -280,7 +280,8 @@ static int hdmi_codec_digital_mute(struct snd_soc_dai *dai, int mute) 
	dev_dbg(dai->dev, "%s()\n", __func__);



	if (hcp->hcd.ops->digital_mute)

		return hcp->hcd.ops->digital_mute(dai->dev->parent, mute);

		return hcp->hcd.ops->digital_mute(dai->dev->parent,

						  hcp->hcd.data, mute);



	return 0;

}