From 517cb0ca94bee891f56befbe0c81e84e5c7eb616 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Wed, 17 Jan 2024 13:03:14 +0100 Subject: [PATCH] drop some 5.10 and 5.15 asoc patches that didn't need to be there --- ...nditionally-register-dais-for-hdmi-a.patch | 92 ------------------- ...da_dsp_generic-drop-hdmi-routes-when.patch | 44 --------- queue-5.10/series | 2 - ...nditionally-register-dais-for-hdmi-a.patch | 92 ------------------- ...da_dsp_generic-drop-hdmi-routes-when.patch | 44 --------- queue-5.15/series | 2 - 6 files changed, 276 deletions(-) delete mode 100644 queue-5.10/asoc-hdac_hda-conditionally-register-dais-for-hdmi-a.patch delete mode 100644 queue-5.10/asoc-intel-skl_hda_dsp_generic-drop-hdmi-routes-when.patch delete mode 100644 queue-5.15/asoc-hdac_hda-conditionally-register-dais-for-hdmi-a.patch delete mode 100644 queue-5.15/asoc-intel-skl_hda_dsp_generic-drop-hdmi-routes-when.patch diff --git a/queue-5.10/asoc-hdac_hda-conditionally-register-dais-for-hdmi-a.patch b/queue-5.10/asoc-hdac_hda-conditionally-register-dais-for-hdmi-a.patch deleted file mode 100644 index 556c01a55d3..00000000000 --- a/queue-5.10/asoc-hdac_hda-conditionally-register-dais-for-hdmi-a.patch +++ /dev/null @@ -1,92 +0,0 @@ -From 3c2be8ef979ccdd0c5a3742bbcd3842bde01b40d Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Tue, 28 Nov 2023 14:39:14 +0200 -Subject: ASoC: hdac_hda: Conditionally register dais for HDMI and Analog - -From: Peter Ujfalusi - -[ Upstream commit a0575b4add21a243cc3257e75ad913cd5377d5f2 ] - -The current driver is registering the same dais for each hdev found in the -system which results duplicated widgets to be registered and the kernel -log contains similar prints: -snd_hda_codec_realtek ehdaudio0D0: ASoC: sink widget AIF1TX overwritten -snd_hda_codec_realtek ehdaudio0D0: ASoC: source widget AIF1RX overwritten -skl_hda_dsp_generic skl_hda_dsp_generic: ASoC: sink widget hifi3 overwritten -skl_hda_dsp_generic skl_hda_dsp_generic: ASoC: sink widget hifi2 overwritten -skl_hda_dsp_generic skl_hda_dsp_generic: ASoC: sink widget hifi1 overwritten -skl_hda_dsp_generic skl_hda_dsp_generic: ASoC: source widget Codec Output Pin1 overwritten -skl_hda_dsp_generic skl_hda_dsp_generic: ASoC: sink widget Codec Input Pin1 overwritten -skl_hda_dsp_generic skl_hda_dsp_generic: ASoC: sink widget Analog Codec Playback overwritten -skl_hda_dsp_generic skl_hda_dsp_generic: ASoC: sink widget Digital Codec Playback overwritten -skl_hda_dsp_generic skl_hda_dsp_generic: ASoC: sink widget Alt Analog Codec Playback overwritten -skl_hda_dsp_generic skl_hda_dsp_generic: ASoC: source widget Analog Codec Capture overwritten -skl_hda_dsp_generic skl_hda_dsp_generic: ASoC: source widget Digital Codec Capture overwritten -skl_hda_dsp_generic skl_hda_dsp_generic: ASoC: source widget Alt Analog Codec Capture overwritten - -To avoid such issue, split the dai array into HDMI and non HDMI array and -register them conditionally: -for HDMI hdev only register the dais needed for HDMI -for non HDMI hdev do not register the HDMI dais. - -Depends-on: 3d1dc8b1030d ("ASoC: Intel: skl_hda_dsp_generic: Drop HDMI routes when HDMI is not available") -Link: https://github.com/thesofproject/linux/issues/4509 -Signed-off-by: Peter Ujfalusi -Reviewed-by: Kai Vehmanen -Link: https://lore.kernel.org/r/20231128123914.3986-1-peter.ujfalusi@linux.intel.com -Signed-off-by: Mark Brown -Signed-off-by: Sasha Levin ---- - sound/soc/codecs/hdac_hda.c | 22 +++++++++++++++++++--- - 1 file changed, 19 insertions(+), 3 deletions(-) - -diff --git a/sound/soc/codecs/hdac_hda.c b/sound/soc/codecs/hdac_hda.c -index de5955db0a5f..d2e3697b76e7 100644 ---- a/sound/soc/codecs/hdac_hda.c -+++ b/sound/soc/codecs/hdac_hda.c -@@ -124,6 +124,9 @@ static struct snd_soc_dai_driver hdac_hda_dais[] = { - .sig_bits = 24, - }, - }, -+}; -+ -+static struct snd_soc_dai_driver hdac_hda_hdmi_dais[] = { - { - .id = HDAC_HDMI_0_DAI_ID, - .name = "intel-hdmi-hifi1", -@@ -575,6 +578,13 @@ static const struct snd_soc_component_driver hdac_hda_codec = { - .num_dapm_routes = ARRAY_SIZE(hdac_hda_dapm_routes), - }; - -+static const struct snd_soc_component_driver hdac_hda_hdmi_codec = { -+ .probe = hdac_hda_codec_probe, -+ .remove = hdac_hda_codec_remove, -+ .idle_bias_on = false, -+ .endianness = 1, -+}; -+ - static int hdac_hda_dev_probe(struct hdac_device *hdev) - { - struct hdac_ext_link *hlink; -@@ -594,9 +604,15 @@ static int hdac_hda_dev_probe(struct hdac_device *hdev) - return -ENOMEM; - - /* ASoC specific initialization */ -- ret = devm_snd_soc_register_component(&hdev->dev, -- &hdac_hda_codec, hdac_hda_dais, -- ARRAY_SIZE(hdac_hda_dais)); -+ if (hda_pvt->need_display_power) -+ ret = devm_snd_soc_register_component(&hdev->dev, -+ &hdac_hda_hdmi_codec, hdac_hda_hdmi_dais, -+ ARRAY_SIZE(hdac_hda_hdmi_dais)); -+ else -+ ret = devm_snd_soc_register_component(&hdev->dev, -+ &hdac_hda_codec, hdac_hda_dais, -+ ARRAY_SIZE(hdac_hda_dais)); -+ - if (ret < 0) { - dev_err(&hdev->dev, "failed to register HDA codec %d\n", ret); - return ret; --- -2.43.0 - diff --git a/queue-5.10/asoc-intel-skl_hda_dsp_generic-drop-hdmi-routes-when.patch b/queue-5.10/asoc-intel-skl_hda_dsp_generic-drop-hdmi-routes-when.patch deleted file mode 100644 index ba6705409f3..00000000000 --- a/queue-5.10/asoc-intel-skl_hda_dsp_generic-drop-hdmi-routes-when.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 339baaf38ee13baead36d1858ce7b6df08c11b86 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Fri, 24 Nov 2023 14:40:15 +0200 -Subject: ASoC: Intel: skl_hda_dsp_generic: Drop HDMI routes when HDMI is not - available - -From: Peter Ujfalusi - -[ Upstream commit 3d1dc8b1030df8ca0fdfd4905c88ee10db943bf8 ] - -When the HDMI is not present due to disabled display support -we will use dummy codec and the HDMI routes will refer to non existent -DAPM widgets. - -Trim the route list from the HDMI routes to be able to probe the card even -if the HDMI dais are not registered. - -Signed-off-by: Peter Ujfalusi -Reviewed-by: Bard Liao -Reviewed-by: Kai Vehmanen -Reviewed-by: Pierre-Louis Bossart -Link: https://lore.kernel.org/r/20231124124015.15878-1-peter.ujfalusi@linux.intel.com -Signed-off-by: Mark Brown -Signed-off-by: Sasha Levin ---- - sound/soc/intel/boards/skl_hda_dsp_generic.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/sound/soc/intel/boards/skl_hda_dsp_generic.c b/sound/soc/intel/boards/skl_hda_dsp_generic.c -index bc50eda297ab..9d0f08db709a 100644 ---- a/sound/soc/intel/boards/skl_hda_dsp_generic.c -+++ b/sound/soc/intel/boards/skl_hda_dsp_generic.c -@@ -157,6 +157,8 @@ static int skl_hda_fill_card_info(struct snd_soc_acpi_mach_params *mach_params) - card->dapm_widgets = skl_hda_widgets; - card->num_dapm_widgets = ARRAY_SIZE(skl_hda_widgets); - if (!ctx->idisp_codec) { -+ card->dapm_routes = &skl_hda_map[IDISP_ROUTE_COUNT]; -+ num_route -= IDISP_ROUTE_COUNT; - for (i = 0; i < IDISP_DAI_COUNT; i++) { - skl_hda_be_dai_links[i].codecs = dummy_codec; - skl_hda_be_dai_links[i].num_codecs = --- -2.43.0 - diff --git a/queue-5.10/series b/queue-5.10/series index 9123193eb9f..327cb8d51b0 100644 --- a/queue-5.10/series +++ b/queue-5.10/series @@ -12,9 +12,7 @@ asoc-intel-skylake-mem-leak-in-skl-register-function.patch asoc-cs43130-fix-the-position-of-const-qualifier.patch asoc-cs43130-fix-incorrect-frame-delay-configuration.patch asoc-rt5650-add-mutex-to-avoid-the-jack-detection-fa.patch -asoc-intel-skl_hda_dsp_generic-drop-hdmi-routes-when.patch nouveau-tu102-flush-all-pdbs-on-vmm-flush.patch -asoc-hdac_hda-conditionally-register-dais-for-hdmi-a.patch net-tg3-fix-race-condition-in-tg3_reset_task.patch asoc-da7219-support-low-dc-impedance-headset.patch nvme-introduce-helper-function-to-get-ctrl-state.patch diff --git a/queue-5.15/asoc-hdac_hda-conditionally-register-dais-for-hdmi-a.patch b/queue-5.15/asoc-hdac_hda-conditionally-register-dais-for-hdmi-a.patch deleted file mode 100644 index ee52ede6621..00000000000 --- a/queue-5.15/asoc-hdac_hda-conditionally-register-dais-for-hdmi-a.patch +++ /dev/null @@ -1,92 +0,0 @@ -From 2ac210044406e6dd04a21ee627c5404b4d540286 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Tue, 28 Nov 2023 14:39:14 +0200 -Subject: ASoC: hdac_hda: Conditionally register dais for HDMI and Analog - -From: Peter Ujfalusi - -[ Upstream commit a0575b4add21a243cc3257e75ad913cd5377d5f2 ] - -The current driver is registering the same dais for each hdev found in the -system which results duplicated widgets to be registered and the kernel -log contains similar prints: -snd_hda_codec_realtek ehdaudio0D0: ASoC: sink widget AIF1TX overwritten -snd_hda_codec_realtek ehdaudio0D0: ASoC: source widget AIF1RX overwritten -skl_hda_dsp_generic skl_hda_dsp_generic: ASoC: sink widget hifi3 overwritten -skl_hda_dsp_generic skl_hda_dsp_generic: ASoC: sink widget hifi2 overwritten -skl_hda_dsp_generic skl_hda_dsp_generic: ASoC: sink widget hifi1 overwritten -skl_hda_dsp_generic skl_hda_dsp_generic: ASoC: source widget Codec Output Pin1 overwritten -skl_hda_dsp_generic skl_hda_dsp_generic: ASoC: sink widget Codec Input Pin1 overwritten -skl_hda_dsp_generic skl_hda_dsp_generic: ASoC: sink widget Analog Codec Playback overwritten -skl_hda_dsp_generic skl_hda_dsp_generic: ASoC: sink widget Digital Codec Playback overwritten -skl_hda_dsp_generic skl_hda_dsp_generic: ASoC: sink widget Alt Analog Codec Playback overwritten -skl_hda_dsp_generic skl_hda_dsp_generic: ASoC: source widget Analog Codec Capture overwritten -skl_hda_dsp_generic skl_hda_dsp_generic: ASoC: source widget Digital Codec Capture overwritten -skl_hda_dsp_generic skl_hda_dsp_generic: ASoC: source widget Alt Analog Codec Capture overwritten - -To avoid such issue, split the dai array into HDMI and non HDMI array and -register them conditionally: -for HDMI hdev only register the dais needed for HDMI -for non HDMI hdev do not register the HDMI dais. - -Depends-on: 3d1dc8b1030d ("ASoC: Intel: skl_hda_dsp_generic: Drop HDMI routes when HDMI is not available") -Link: https://github.com/thesofproject/linux/issues/4509 -Signed-off-by: Peter Ujfalusi -Reviewed-by: Kai Vehmanen -Link: https://lore.kernel.org/r/20231128123914.3986-1-peter.ujfalusi@linux.intel.com -Signed-off-by: Mark Brown -Signed-off-by: Sasha Levin ---- - sound/soc/codecs/hdac_hda.c | 22 +++++++++++++++++++--- - 1 file changed, 19 insertions(+), 3 deletions(-) - -diff --git a/sound/soc/codecs/hdac_hda.c b/sound/soc/codecs/hdac_hda.c -index de5955db0a5f..d2e3697b76e7 100644 ---- a/sound/soc/codecs/hdac_hda.c -+++ b/sound/soc/codecs/hdac_hda.c -@@ -124,6 +124,9 @@ static struct snd_soc_dai_driver hdac_hda_dais[] = { - .sig_bits = 24, - }, - }, -+}; -+ -+static struct snd_soc_dai_driver hdac_hda_hdmi_dais[] = { - { - .id = HDAC_HDMI_0_DAI_ID, - .name = "intel-hdmi-hifi1", -@@ -575,6 +578,13 @@ static const struct snd_soc_component_driver hdac_hda_codec = { - .num_dapm_routes = ARRAY_SIZE(hdac_hda_dapm_routes), - }; - -+static const struct snd_soc_component_driver hdac_hda_hdmi_codec = { -+ .probe = hdac_hda_codec_probe, -+ .remove = hdac_hda_codec_remove, -+ .idle_bias_on = false, -+ .endianness = 1, -+}; -+ - static int hdac_hda_dev_probe(struct hdac_device *hdev) - { - struct hdac_ext_link *hlink; -@@ -594,9 +604,15 @@ static int hdac_hda_dev_probe(struct hdac_device *hdev) - return -ENOMEM; - - /* ASoC specific initialization */ -- ret = devm_snd_soc_register_component(&hdev->dev, -- &hdac_hda_codec, hdac_hda_dais, -- ARRAY_SIZE(hdac_hda_dais)); -+ if (hda_pvt->need_display_power) -+ ret = devm_snd_soc_register_component(&hdev->dev, -+ &hdac_hda_hdmi_codec, hdac_hda_hdmi_dais, -+ ARRAY_SIZE(hdac_hda_hdmi_dais)); -+ else -+ ret = devm_snd_soc_register_component(&hdev->dev, -+ &hdac_hda_codec, hdac_hda_dais, -+ ARRAY_SIZE(hdac_hda_dais)); -+ - if (ret < 0) { - dev_err(&hdev->dev, "failed to register HDA codec %d\n", ret); - return ret; --- -2.43.0 - diff --git a/queue-5.15/asoc-intel-skl_hda_dsp_generic-drop-hdmi-routes-when.patch b/queue-5.15/asoc-intel-skl_hda_dsp_generic-drop-hdmi-routes-when.patch deleted file mode 100644 index 09a2d43e5b4..00000000000 --- a/queue-5.15/asoc-intel-skl_hda_dsp_generic-drop-hdmi-routes-when.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 4ae9818c6f425be644d47d5bb7c3c39e8cf558dc Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Fri, 24 Nov 2023 14:40:15 +0200 -Subject: ASoC: Intel: skl_hda_dsp_generic: Drop HDMI routes when HDMI is not - available - -From: Peter Ujfalusi - -[ Upstream commit 3d1dc8b1030df8ca0fdfd4905c88ee10db943bf8 ] - -When the HDMI is not present due to disabled display support -we will use dummy codec and the HDMI routes will refer to non existent -DAPM widgets. - -Trim the route list from the HDMI routes to be able to probe the card even -if the HDMI dais are not registered. - -Signed-off-by: Peter Ujfalusi -Reviewed-by: Bard Liao -Reviewed-by: Kai Vehmanen -Reviewed-by: Pierre-Louis Bossart -Link: https://lore.kernel.org/r/20231124124015.15878-1-peter.ujfalusi@linux.intel.com -Signed-off-by: Mark Brown -Signed-off-by: Sasha Levin ---- - sound/soc/intel/boards/skl_hda_dsp_generic.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/sound/soc/intel/boards/skl_hda_dsp_generic.c b/sound/soc/intel/boards/skl_hda_dsp_generic.c -index f4b4eeca3e03..0cbacebe0613 100644 ---- a/sound/soc/intel/boards/skl_hda_dsp_generic.c -+++ b/sound/soc/intel/boards/skl_hda_dsp_generic.c -@@ -157,6 +157,8 @@ static int skl_hda_fill_card_info(struct snd_soc_acpi_mach_params *mach_params) - card->dapm_widgets = skl_hda_widgets; - card->num_dapm_widgets = ARRAY_SIZE(skl_hda_widgets); - if (!ctx->idisp_codec) { -+ card->dapm_routes = &skl_hda_map[IDISP_ROUTE_COUNT]; -+ num_route -= IDISP_ROUTE_COUNT; - for (i = 0; i < IDISP_DAI_COUNT; i++) { - skl_hda_be_dai_links[i].codecs = dummy_codec; - skl_hda_be_dai_links[i].num_codecs = --- -2.43.0 - diff --git a/queue-5.15/series b/queue-5.15/series index 76b80ebd615..054c9d3a44b 100644 --- a/queue-5.15/series +++ b/queue-5.15/series @@ -13,9 +13,7 @@ asoc-intel-skylake-mem-leak-in-skl-register-function.patch asoc-cs43130-fix-the-position-of-const-qualifier.patch asoc-cs43130-fix-incorrect-frame-delay-configuration.patch asoc-rt5650-add-mutex-to-avoid-the-jack-detection-fa.patch -asoc-intel-skl_hda_dsp_generic-drop-hdmi-routes-when.patch nouveau-tu102-flush-all-pdbs-on-vmm-flush.patch -asoc-hdac_hda-conditionally-register-dais-for-hdmi-a.patch net-tg3-fix-race-condition-in-tg3_reset_task.patch asoc-da7219-support-low-dc-impedance-headset.patch asoc-ops-add-correct-range-check-for-limiting-volume.patch -- 2.47.3