A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-08 12:58:12 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge "ASoC : add support of HDMI controller for rb3gen2 platform"

Browse source
This commit is contained in:
qctecmdr 2023-11-03 04:49:03 -07:00 • committed by Gerrit - the friendly Code Review server
commit f15dbf3313
2 changed files with 17 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

27
asoc/codecs/msm_hdmi_codec_rx.c
View file

@ -32,6 +32,7 @@
enum {
DP_CONTROLLER0 = 0,
HDMI_CONTROLLER,
DP_CONTROLLER_MAX,
};
@ -96,7 +97,7 @@ static int msm_ext_disp_edid_ctl_info(struct snd_kcontrol *kcontrol,
codec_data->ctl[dai_id], codec_data->stream[dai_id]);
mutex_lock(&codec_data->dp_ops_lock);
if (dai_id == HDMI_MS_DAI)
if (dai_id == HDMI_DAI)
type = EXT_DISPLAY_TYPE_HDMI;
else
type = EXT_DISPLAY_TYPE_DP;
@ -148,7 +149,7 @@ static int msm_ext_disp_edid_get(struct snd_kcontrol *kcontrol,
codec_data->ctl[dai_id], codec_data->stream[dai_id]);
mutex_lock(&codec_data->dp_ops_lock);
if (dai_id == HDMI_MS_DAI)
if (dai_id == HDMI_DAI)
type = EXT_DISPLAY_TYPE_HDMI;
else
type = EXT_DISPLAY_TYPE_DP;
@ -214,7 +215,7 @@ static int msm_ext_disp_audio_type_get(struct snd_kcontrol *kcontrol,
codec_data->ctl[dai_id], codec_data->stream[dai_id]);
mutex_lock(&codec_data->dp_ops_lock);
if (dai_id == HDMI_MS_DAI)
if (dai_id == HDMI_DAI)
type = EXT_DISPLAY_TYPE_HDMI;
else
type = EXT_DISPLAY_TYPE_DP;
@ -306,7 +307,7 @@ static int msm_ext_disp_audio_ack_set(struct snd_kcontrol *kcontrol,
codec_data->ctl[dai_id], codec_data->stream[dai_id]);
mutex_lock(&codec_data->dp_ops_lock);
if (dai_id == HDMI_MS_DAI)
if (dai_id == HDMI_DAI)
type = EXT_DISPLAY_TYPE_HDMI;
else
type = EXT_DISPLAY_TYPE_DP;
@ -366,7 +367,7 @@ static int msm_ext_disp_audio_device_get(struct snd_kcontrol *kcontrol,
int dai_id = ((struct soc_multi_mixer_control *)
kcontrol->private_value)->shift;
if (dai_id < 0 || dai_id > DP_DAI2) {
if (dai_id < 0 || dai_id > DP_DAI_MAX) {
dev_err(component->dev,
"%s: invalid dai id: %d\n", __func__, dai_id);
rc = -EINVAL;
@ -398,7 +399,7 @@ static int msm_ext_disp_audio_device_set(struct snd_kcontrol *kcontrol,
int dai_id = ((struct soc_multi_mixer_control *)
kcontrol->private_value)->shift;
if (dai_id < 0 || dai_id > DP_DAI2) {
if (dai_id < 0 || dai_id > DP_DAI_MAX) {
dev_err(component->dev,
"%s: invalid dai id: %d\n", __func__, dai_id);
rc = -EINVAL;
@ -498,8 +499,8 @@ static const struct snd_kcontrol_new msm_ext_disp_codec_rx_controls[] = {
SND_SOC_NOPM, DP_DAI2, DP_STREAM_MAX - 1, 0, 2,
msm_ext_disp_audio_device_get,
msm_ext_disp_audio_device_set),
SOC_SINGLE_MULTI_EXT("External HDMI Device",
SND_SOC_NOPM, HDMI_MS_DAI, DP_STREAM_MAX - 1, 0, 2,
SOC_SINGLE_MULTI_EXT("External HDMI Audio Device",
SND_SOC_NOPM, HDMI_DAI, DP_STREAM_MAX - 1, 0, 2,
msm_ext_disp_audio_device_get,
msm_ext_disp_audio_device_set),
@ -526,7 +527,7 @@ static int msm_ext_disp_audio_codec_rx_dai_startup(
codec_data->ctl[dai->id], codec_data->stream[dai->id]);
mutex_lock(&codec_data->dp_ops_lock);
if (dai->id == HDMI_MS_DAI)
if (dai->id == HDMI_DAI)
type = EXT_DISPLAY_TYPE_HDMI;
else
type = EXT_DISPLAY_TYPE_DP;
@ -587,7 +588,7 @@ static int msm_ext_disp_audio_codec_rx_dai_hw_params(
codec_data->ctl[dai->id], codec_data->stream[dai->id]);
mutex_lock(&codec_data->dp_ops_lock);
if (dai->id == HDMI_MS_DAI)
if (dai->id == HDMI_DAI)
type = EXT_DISPLAY_TYPE_HDMI;
else
type = EXT_DISPLAY_TYPE_DP;
@ -661,6 +662,10 @@ static int msm_ext_disp_audio_codec_rx_dai_hw_params(
audio_setup_params.down_mix = down_mix;
mutex_lock(&codec_data->dp_ops_lock);
if (dai->id == HDMI_DAI)
type = EXT_DISPLAY_TYPE_HDMI;
else
type = EXT_DISPLAY_TYPE_DP;
SWITCH_DP_CODEC(codec_info, codec_data, dai->id, type);
rc = msm_ext_disp_select_audio_codec(codec_data->ext_disp_core_pdev,
&codec_info);
@ -701,7 +706,7 @@ static void msm_ext_disp_audio_codec_rx_dai_shutdown(
codec_data->ctl[dai->id], codec_data->stream[dai->id]);
mutex_lock(&codec_data->dp_ops_lock);
if (dai->id == HDMI_MS_DAI)
if (dai->id == HDMI_DAI)
type = EXT_DISPLAY_TYPE_HDMI;
else
type = EXT_DISPLAY_TYPE_DP;

1
asoc/msm-dai-q6-hdmi-v2.c
View file

@ -22,6 +22,7 @@
enum {
DP_CONTROLLER0 = 0,
DP_CONTROLLER1,
HDMI_CONTROLLER,
DP_CONTROLLER_MAX,
};