AcoSail/kernel_optimize_test
8
0
Fork 0
forked from luck/tmp_suning_uos_patched
Code Pull Requests Activity

ASoC: SOF: Intel: add support for snd-hda-codec-hdmi

Browse Source 
Add support to implement HDMI/DP audio by using the common
snd-hda-codec-hdmi driver.

Change of codec driver affects user-space as the two
drivers expose different mixer controls. A new kernel
module option "use_common_hdmi" is added to user-space
to indicate which interface should be used. The default
driver can be selected via a Kconfig option.

Signed-off-by: Kai Vehmanen <kai.vehmanen@linux.intel.com>
Reviewed-by: Takashi Iwai <tiwai@suse.de>
Reviewed-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Link: https://lore.kernel.org/r/20191029134017.18901-6-kai.vehmanen@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Kai Vehmanen 2019-10-29 15:40:13 +02:00 committed by Mark Brown
parent 0f16311025
commit 139c7febad
No known key found for this signature in database
GPG Key ID: 24D68B725D5487D0
4 changed files with 38 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
sound/soc/sof/intel/Kconfig
View File

@ -299,6 +299,16 @@ config SND_SOC_SOF_HDA_ALWAYS_ENABLE_DMI_L1
Say Y if you want to enable DMI Link L1 Say Y if you want to enable DMI Link L1
If unsure, select "N". If unsure, select "N".
config SND_SOC_SOF_HDA_COMMON_HDMI_CODEC
bool "SOF common HDA HDMI codec driver"
depends on SND_SOC_SOF_HDA_LINK
depends on SND_HDA_CODEC_HDMI
help
This adds support for HDMI audio by using the common HDA
HDMI/DisplayPort codec driver.
Say Y if you want to use the common codec driver with SOF.
If unsure select "Y".
endif ## SND_SOC_SOF_HDA_COMMON endif ## SND_SOC_SOF_HDA_COMMON
config SND_SOC_SOF_HDA_LINK_BASELINE config SND_SOC_SOF_HDA_LINK_BASELINE

22
sound/soc/sof/intel/hda-codec.c
View File

@ -84,6 +84,8 @@ static int hda_codec_probe(struct snd_sof_dev *sdev, int address)
{ {
#if IS_ENABLED(CONFIG_SND_SOC_SOF_HDA_AUDIO_CODEC) #if IS_ENABLED(CONFIG_SND_SOC_SOF_HDA_AUDIO_CODEC)
struct hdac_hda_priv *hda_priv; struct hdac_hda_priv *hda_priv;
struct snd_soc_acpi_mach_params *mach_params = NULL;
struct snd_sof_pdata *pdata = sdev->pdata;
#endif #endif
struct hda_bus *hbus = sof_to_hbus(sdev); struct hda_bus *hbus = sof_to_hbus(sdev);
struct hdac_device *hdev; struct hdac_device *hdev;
@ -113,8 +115,19 @@ static int hda_codec_probe(struct snd_sof_dev *sdev, int address)
if (ret < 0) if (ret < 0)
return ret; return ret;
/* use legacy bus only for HDA codecs, idisp uses ext bus */ if (pdata->machine)
if ((resp & 0xFFFF0000) != IDISP_VID_INTEL) { mach_params = (struct snd_soc_acpi_mach_params *)
&pdata->machine->mach_params;
if ((resp & 0xFFFF0000) == IDISP_VID_INTEL)
hda_priv->need_display_power = true;
/*
* if common HDMI codec driver is not used, codec load
* is skipped here and hdac_hdmi is used instead
*/
if ((mach_params && mach_params->common_hdmi_codec_drv) ||
(resp & 0xFFFF0000) != IDISP_VID_INTEL) {
hdev->type = HDA_DEV_LEGACY; hdev->type = HDA_DEV_LEGACY;
hda_codec_load_module(&hda_priv->codec); hda_codec_load_module(&hda_priv->codec);
} }
@ -155,7 +168,8 @@ int hda_codec_probe_bus(struct snd_sof_dev *sdev)
} }
EXPORT_SYMBOL(hda_codec_probe_bus); EXPORT_SYMBOL(hda_codec_probe_bus);
#if IS_ENABLED(CONFIG_SND_SOC_HDAC_HDMI) #if IS_ENABLED(CONFIG_SND_HDA_CODEC_HDMI) || \
IS_ENABLED(CONFIG_SND_SOC_HDAC_HDMI)
void hda_codec_i915_get(struct snd_sof_dev *sdev) void hda_codec_i915_get(struct snd_sof_dev *sdev)
{ {
@ -204,6 +218,6 @@ int hda_codec_i915_exit(struct snd_sof_dev *sdev)
} }
EXPORT_SYMBOL(hda_codec_i915_exit); EXPORT_SYMBOL(hda_codec_i915_exit);
#endif /* CONFIG_SND_SOC_HDAC_HDMI */ #endif
MODULE_LICENSE("Dual BSD/GPL"); MODULE_LICENSE("Dual BSD/GPL");

6
sound/soc/sof/intel/hda.c
View File

@ -53,6 +53,11 @@ MODULE_PARM_DESC(use_msi, "SOF HDA use PCI MSI mode");
static int hda_dmic_num = -1; static int hda_dmic_num = -1;
module_param_named(dmic_num, hda_dmic_num, int, 0444); module_param_named(dmic_num, hda_dmic_num, int, 0444);
MODULE_PARM_DESC(dmic_num, "SOF HDA DMIC number"); MODULE_PARM_DESC(dmic_num, "SOF HDA DMIC number");
static bool hda_codec_use_common_hdmi =
IS_ENABLED(CONFIG_SND_SOC_SOF_HDA_COMMON_HDMI_CODEC);
module_param_named(use_common_hdmi, hda_codec_use_common_hdmi, bool, 0444);
MODULE_PARM_DESC(use_common_hdmi, "SOF HDA use common HDMI codec driver");
#endif #endif
static const struct hda_dsp_msg_code hda_dsp_rom_msg[] = { static const struct hda_dsp_msg_code hda_dsp_rom_msg[] = {
@ -459,6 +464,7 @@ static int hda_init_caps(struct snd_sof_dev *sdev)
&pdata->machine->mach_params; &pdata->machine->mach_params;
mach_params->codec_mask = bus->codec_mask; mach_params->codec_mask = bus->codec_mask;
mach_params->platform = dev_name(sdev->dev); mach_params->platform = dev_name(sdev->dev);
mach_params->common_hdmi_codec_drv = hda_codec_use_common_hdmi;
} }
/* create codec instances */ /* create codec instances */

6
sound/soc/sof/intel/hda.h
View File

@ -577,7 +577,9 @@ void hda_codec_jack_check(struct snd_sof_dev *sdev);
#endif /* CONFIG_SND_SOC_SOF_HDA */ #endif /* CONFIG_SND_SOC_SOF_HDA */
#if IS_ENABLED(CONFIG_SND_SOC_SOF_HDA) && IS_ENABLED(CONFIG_SND_SOC_HDAC_HDMI) #if IS_ENABLED(CONFIG_SND_SOC_SOF_HDA) && \
(IS_ENABLED(CONFIG_SND_HDA_CODEC_HDMI) || \
IS_ENABLED(CONFIG_SND_SOC_HDAC_HDMI))
void hda_codec_i915_get(struct snd_sof_dev *sdev); void hda_codec_i915_get(struct snd_sof_dev *sdev);
void hda_codec_i915_put(struct snd_sof_dev *sdev); void hda_codec_i915_put(struct snd_sof_dev *sdev);
@ -591,7 +593,7 @@ static inline void hda_codec_i915_put(struct snd_sof_dev *sdev) { }
static inline int hda_codec_i915_init(struct snd_sof_dev *sdev) { return 0; } static inline int hda_codec_i915_init(struct snd_sof_dev *sdev) { return 0; }
static inline int hda_codec_i915_exit(struct snd_sof_dev *sdev) { return 0; } static inline int hda_codec_i915_exit(struct snd_sof_dev *sdev) { return 0; }
#endif /* CONFIG_SND_SOC_SOF_HDA && CONFIG_SND_SOC_HDAC_HDMI */ #endif
/* /*
* Trace Control. * Trace Control.