ASoC: intel/skl/hda - fix oops on systems without i915 audio codec
Subsystems (3)
Kai Vehmanen
maintainerPATCH 1/1 ASoC: intel/skl/hda - fix oops on systems without i915 audio codec
Recent fix for jack detection caused a regression on systems with HDA audio codec but no HDMI/DP audio via i915 graphics, leading to a kernel oops at device probe. On these systems, HDA bus instance lookup fails, as the first ASoC runtime of the card is connected to a dummy codec (as no HDMI codec is present).
--- sound/soc/intel/boards/skl_hda_dsp_generic.c | 34 +++++++++++--------- 1 file changed, 18 insertions(+), 16 deletions(-)
sound/soc/intel/boards/skl_hda_dsp_generic.c +18 -16
@@ -172,23 +172,25 @@ static int skl_hda_fill_card_info(struct snd_soc_acpi_mach_params *mach_params)static void skl_set_hda_codec_autosuspend_delay (struct snd_soc_card *card) { -struct snd_soc_pcm_runtime *rtd = -list_first_entry (&card->rtd_list, - struct snd_soc_pcm_runtime, list); -struct snd_soc_dai *codec_dai =asoc_rtd_to_codec (rtd,0 ); +struct snd_soc_pcm_runtime *rtd;struct hdac_hda_priv *hda_pvt; - -if (!codec_dai) -return ; - -/* -* all codecs are on the same bus, so it's sufficient -* to lookup the first runtime and its codec, and set -* power save defaults for all codecs on the bus -*/ - hda_pvt =snd_soc_component_get_drvdata (codec_dai->component); -snd_hda_set_power_save (hda_pvt->codec.bus, -HDA_CODEC_AUTOSUSPEND_DELAY_MS ); +struct snd_soc_dai *dai; + +for_each_card_rtds (card, rtd) { +if (!strstr (rtd->dai_link->codecs->name,"ehdaudio" )) +continue ; + dai =asoc_rtd_to_codec (rtd,0 ); + hda_pvt =snd_soc_component_get_drvdata (dai->component); +if (hda_pvt) { +/* +* all codecs are on the same bus, so it's sufficient +* to look up only the first one +*/ +snd_hda_set_power_save (hda_pvt->codec.bus, +HDA_CODEC_AUTOSUSPEND_DELAY_MS ); +break ; + } + } }static int skl_hda_audio_probe (struct platform_device *pdev)
Signature · 1 line
2.26.0
Mark Brown
maintainerQuoted 5 lines · Kai Vehmanen
Recent fix for jack detection caused a regression on systems with HDA audio codec but no HDMI/DP audio via i915 graphics, leading to a kernel oops at device probe. On these systems, HDA bus instance lookup fails, as the first ASoC runtime of the card is connected to a dummy codec (as no HDMI codec is present).
This doesn't apply against current code, please check and resend if required.
Mark Brown
maintainerQuoted 6 lines · Kai Vehmanen
Recent fix for jack detection caused a regression on systems with HDA audio codec but no HDMI/DP audio via i915 graphics, leading to a kernel oops at device probe. On these systems, HDA bus instance lookup fails, as the first ASoC runtime of the card is connected to a dummy codec (as no HDMI codec is present).
Quoted 6 lines
Fixes 3a24f135e6cc ("ASoC: intel/skl/hda - set autosuspend timeout for hda codecs")Signed-off-by Kai Vehmanen <[email protected]>Reviewed-by Pierre-Louis Bossart <[email protected]>Reviewed-by Ranjani Sridharan <[email protected]>[...]
Applied to
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-5.8
Thanks!
[1/1] ASoC: intel/skl/hda - fix oops on systems without i915 audio codec
commit: 5bf73b1b1deca46c7459cb4d732ba8bad6da93c5
All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying to this mail.
Thanks,
Mark