samsung-sm8650/android_kernel_samsung_sm8650-modules
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

asoc: codecs: Add multi input support for display audio mixers

Browse Source 
Add multi input support such that display audio
mixer controls can update both control ID and
stream ID to support display audio multi streaming.

Change-Id: Ief8fe852585a31fbe5871ce8ecc1057d6891e2b7
Signed-off-by: Karthikeyan Mani <kmani@codeaurora.org>
Signed-off-by: Vignesh Kulothungan <vigneshk@codeaurora.org>
This commit is contained in:
Karthikeyan Mani
2019-06-06 13:40:55 -07:00
committed by Vignesh Kulothungan
parent fa9e9c3ac9
commit 311bd67be0
2 changed files with 88 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

76
asoc/codecs/msm_hdmi_codec_rx.c
View File

@@ -32,6 +32,11 @@
msm_ext_disp_select_audio_codec(codec_data->ext_disp_core_pdev, \
&codec_info)
enum {
DP_CONTROLLER0 = 0,
DP_CONTROLLER_MAX,
};
enum {
DP_STREAM0 = 0,
DP_STREAM1,
@@ -295,6 +300,38 @@ done:
return rc;
}
static int msm_ext_disp_audio_device_get(struct snd_kcontrol *kcontrol,
struct snd_ctl_elem_value *ucontrol)
{
struct snd_soc_component *component =
snd_soc_kcontrol_component(kcontrol);
struct msm_ext_disp_audio_codec_rx_data *codec_data;
int rc = 0;
int dai_id = ((struct soc_multi_mixer_control *)
kcontrol->private_value)->shift;
if (dai_id < 0 || dai_id > DP_DAI2) {
dev_err(component->dev,
"%s: invalid dai id: %d\n", __func__, dai_id);
rc = -EINVAL;
goto done;
}
codec_data = snd_soc_component_get_drvdata(component);
if (!codec_data) {
dev_err(component->dev,
"%s: codec_data or ops acknowledge() is NULL\n",
__func__);
rc = -EINVAL;
goto done;
}
ucontrol->value.integer.value[0] = codec_data->ctl[dai_id];
ucontrol->value.integer.value[1] = codec_data->stream[dai_id];
done:
return rc;
}
static int msm_ext_disp_audio_device_set(struct snd_kcontrol *kcontrol,
struct snd_ctl_elem_value *ucontrol)
{
@@ -302,7 +339,15 @@ static int msm_ext_disp_audio_device_set(struct snd_kcontrol *kcontrol,
snd_soc_kcontrol_component(kcontrol);
struct msm_ext_disp_audio_codec_rx_data *codec_data;
int rc = 0;
int dai_id = ((struct soc_enum *) kcontrol->private_value)->shift_l;
int dai_id = ((struct soc_multi_mixer_control *)
kcontrol->private_value)->shift;
if (dai_id < 0 || dai_id > DP_DAI2) {
dev_err(component->dev,
"%s: invalid dai id: %d\n", __func__, dai_id);
rc = -EINVAL;
goto done;
}
codec_data = snd_soc_component_get_drvdata(component);
if (!codec_data) {
@@ -313,9 +358,20 @@ static int msm_ext_disp_audio_device_set(struct snd_kcontrol *kcontrol,
goto done;
}
if ((ucontrol->value.integer.value[0] > (DP_CONTROLLER_MAX - 1)) ||
(ucontrol->value.integer.value[1] > (DP_STREAM_MAX - 1)) ||
(ucontrol->value.integer.value[0] < 0) ||
(ucontrol->value.integer.value[1] < 0)) {
dev_err(component->dev,
"%s: DP audio control index invalid\n",
__func__);
rc = -EINVAL;
goto done;
}
mutex_lock(&codec_data->dp_ops_lock);
codec_data->ctl[dai_id] = ucontrol->value.enumerated.item[0];
codec_data->stream[dai_id] = ucontrol->value.enumerated.item[1];
codec_data->ctl[dai_id] = ucontrol->value.integer.value[0];
codec_data->stream[dai_id] = ucontrol->value.integer.value[1];
mutex_unlock(&codec_data->dp_ops_lock);
done:
@@ -363,12 +419,14 @@ static const struct snd_kcontrol_new msm_ext_disp_codec_rx_controls[] = {
ext_disp_audio_ack_state1,
NULL, msm_ext_disp_audio_ack_set),
SOC_SINGLE_EXT("External Display Audio Device",
SND_SOC_NOPM, DP_DAI1, DP_STREAM_MAX, 0,
NULL, msm_ext_disp_audio_device_set),
SOC_SINGLE_EXT("External Display1 Audio Device",
SND_SOC_NOPM, DP_DAI2, DP_STREAM_MAX, 0,
NULL, msm_ext_disp_audio_device_set),
SOC_SINGLE_MULTI_EXT("External Display Audio Device",
SND_SOC_NOPM, DP_DAI1, DP_STREAM_MAX - 1, 0, 2,
msm_ext_disp_audio_device_get,
msm_ext_disp_audio_device_set),
SOC_SINGLE_MULTI_EXT("External Display1 Audio Device",
SND_SOC_NOPM, DP_DAI2, DP_STREAM_MAX - 1, 0, 2,
msm_ext_disp_audio_device_get,
msm_ext_disp_audio_device_set),
};
static int msm_ext_disp_audio_codec_rx_dai_startup(

22
asoc/msm-dai-q6-hdmi-v2.c
View File

@@ -19,6 +19,18 @@
#define HDMI_RX_CA_MAX 0x32
enum {
DP_CONTROLLER0 = 0,
DP_CONTROLLER1,
DP_CONTROLLER_MAX,
};
enum {
DP_STREAM0 = 0,
DP_STREAM1,
DP_STREAM_MAX,
};
enum {
STATUS_PORT_STARTED, /* track if AFE port has started */
STATUS_MAX
@@ -84,6 +96,14 @@ static int msm_dai_q6_ext_disp_device_idx_put(struct snd_kcontrol *kcontrol,
return -EINVAL;
}
if ((ucontrol->value.integer.value[0] > (DP_CONTROLLER_MAX - 1)) ||
(ucontrol->value.integer.value[1] > (DP_STREAM_MAX - 1)) ||
(ucontrol->value.integer.value[0] < 0) ||
(ucontrol->value.integer.value[1] < 0)) {
pr_err("%s: DP control index invalid\n", __func__);
return -EINVAL;
}
dai_data->ctl_idx = ucontrol->value.integer.value[0];
dai_data->stream_idx = ucontrol->value.integer.value[1];
pr_debug("%s: DP ctl id %d stream id %d\n", __func__,
@@ -219,7 +239,7 @@ static const struct snd_kcontrol_new display_port_config_controls[] = {
msm_dai_q6_ext_disp_ca_get,
msm_dai_q6_ext_disp_ca_put),
SOC_SINGLE_MULTI_EXT("Display Port RX DEVICE IDX", SND_SOC_NOPM, 0,
1, 0, 1,
1, 0, 2,
msm_dai_q6_ext_disp_device_idx_get,
msm_dai_q6_ext_disp_device_idx_put),
{