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

ALSA: hda: Allow SST driver on SKL and KBL platforms with DMIC

Browse Source 
Update intel-dspcfg with FLAG_SST_ONLY_IF_DMIC option and use it for
Skylake and Kabylake platforms when DMIC is present.

Signed-off-by: Cezary Rojewski <cezary.rojewski@intel.com>
Acked-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Link: https://lore.kernel.org/r/20200506203951.6369-1-cezary.rojewski@intel.com
Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Cezary Rojewski 2020-05-06 22:39:51 +02:00 committed by Takashi Iwai
parent 28a04aa3ba
commit df1fceacb2
1 changed files with 20 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
sound/hda/intel-dsp-config.c
View File

@ -19,6 +19,7 @@ MODULE_PARM_DESC(dsp_driver, "Force the DSP driver for Intel DSP (0=auto, 1=lega
#define FLAG_SST BIT(0) #define FLAG_SST BIT(0)
#define FLAG_SOF BIT(1) #define FLAG_SOF BIT(1)
#define FLAG_SST_ONLY_IF_DMIC BIT(15)
#define FLAG_SOF_ONLY_IF_DMIC BIT(16) #define FLAG_SOF_ONLY_IF_DMIC BIT(16)
#define FLAG_SOF_ONLY_IF_SOUNDWIRE BIT(17) #define FLAG_SOF_ONLY_IF_SOUNDWIRE BIT(17)
@ -107,6 +108,10 @@ static const struct config_entry config_table[] = {
{} {}
} }
}, },
{
.flags = FLAG_SST | FLAG_SST_ONLY_IF_DMIC,
.device = 0x9d70,
},
#endif #endif
/* Kabylake-LP */ /* Kabylake-LP */
#if IS_ENABLED(CONFIG_SND_SOC_INTEL_KBL) #if IS_ENABLED(CONFIG_SND_SOC_INTEL_KBL)
@ -123,6 +128,10 @@ static const struct config_entry config_table[] = {
{} {}
} }
}, },
{
.flags = FLAG_SST | FLAG_SST_ONLY_IF_DMIC,
.device = 0x9d71,
},
#endif #endif
/* /*
@ -410,8 +419,17 @@ int snd_intel_dsp_driver_probe(struct pci_dev *pci)
return SND_INTEL_DSP_DRIVER_SOF; return SND_INTEL_DSP_DRIVER_SOF;
} }
if (cfg->flags & FLAG_SST)
return SND_INTEL_DSP_DRIVER_SST; if (cfg->flags & FLAG_SST) {
if (cfg->flags & FLAG_SST_ONLY_IF_DMIC) {
if (snd_intel_dsp_check_dmic(pci)) {
dev_info(&pci->dev, "Digital mics found on Skylake+ platform, using SST driver\n");
return SND_INTEL_DSP_DRIVER_SST;
}
} else {
return SND_INTEL_DSP_DRIVER_SST;
}
}
return SND_INTEL_DSP_DRIVER_LEGACY; return SND_INTEL_DSP_DRIVER_LEGACY;
} }