From: Greg Kroah-Hartman Date: Sun, 11 Aug 2024 10:14:20 +0000 (+0200) Subject: fix up alsa patch issue X-Git-Tag: v6.1.104~1 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=17ce965c347edfb25f9c5fe11d6c263478a8075d;p=thirdparty%2Fkernel%2Fstable-queue.git fix up alsa patch issue --- diff --git a/queue-5.15/alsa-hda-conexant-fix-headset-auto-detect-fail-in-th.patch b/queue-5.15/alsa-hda-conexant-fix-headset-auto-detect-fail-in-th.patch index 7ac8d499f4d..7c571e18ddf 100644 --- a/queue-5.15/alsa-hda-conexant-fix-headset-auto-detect-fail-in-th.patch +++ b/queue-5.15/alsa-hda-conexant-fix-headset-auto-detect-fail-in-th.patch @@ -1,4 +1,4 @@ -From 27923e84894bd6e88790b0d8e8f5936ef8d8f8b3 Mon Sep 17 00:00:00 2001 +From 0d0bb50d7dadeb3ea01a3dc9d340d887cc283958 Mon Sep 17 00:00:00 2001 From: Sasha Levin Date: Fri, 26 Jul 2024 18:07:26 +0800 Subject: ALSA: hda: conexant: Fix headset auto detect fail in the polling mode @@ -20,11 +20,9 @@ Link: https://patch.msgid.link/20240726100726.50824-1-soxiebing@163.com Signed-off-by: Takashi Iwai Signed-off-by: Sasha Levin --- - sound/pci/hda/patch_conexant.c | 54 ++++++---------------------------- + sound/pci/hda/patch_conexant.c | 54 ++++++----------------------------------- 1 file changed, 9 insertions(+), 45 deletions(-) -diff --git a/sound/pci/hda/patch_conexant.c b/sound/pci/hda/patch_conexant.c -index 76ea4fb391fed..338f9d7462cd9 100644 --- a/sound/pci/hda/patch_conexant.c +++ b/sound/pci/hda/patch_conexant.c @@ -21,12 +21,6 @@ @@ -48,7 +46,7 @@ index 76ea4fb391fed..338f9d7462cd9 100644 bool is_cx8070_sn6140; }; -@@ -250,48 +243,19 @@ static void cx_process_headset_plugin(struct hda_codec *codec) +@@ -250,48 +243,19 @@ static void cx_process_headset_plugin(st } } @@ -103,17 +101,17 @@ index 76ea4fb391fed..338f9d7462cd9 100644 + cx_process_headset_plugin(codec); } - static int cx_auto_suspend(struct hda_codec *codec) -@@ -305,7 +269,7 @@ static const struct hda_codec_ops cx_auto_patch_ops = { + #ifdef CONFIG_PM +@@ -307,7 +271,7 @@ static const struct hda_codec_ops cx_aut .build_pcms = snd_hda_gen_build_pcms, .init = cx_auto_init, .free = cx_auto_free, - .unsol_event = cx_jack_unsol_event, + .unsol_event = snd_hda_jack_unsol_event, + #ifdef CONFIG_PM .suspend = cx_auto_suspend, .check_power_status = snd_hda_gen_check_power_status, - }; -@@ -1163,7 +1127,7 @@ static int patch_conexant_auto(struct hda_codec *codec) +@@ -1167,7 +1131,7 @@ static int patch_conexant_auto(struct hd case 0x14f11f86: case 0x14f11f87: spec->is_cx8070_sn6140 = true; @@ -122,6 +120,3 @@ index 76ea4fb391fed..338f9d7462cd9 100644 break; } --- -2.43.0 - diff --git a/queue-5.15/alsa-hda-conexant-reduce-config_pm-dependencies.patch b/queue-5.15/alsa-hda-conexant-reduce-config_pm-dependencies.patch deleted file mode 100644 index dda9eea1f0d..00000000000 --- a/queue-5.15/alsa-hda-conexant-reduce-config_pm-dependencies.patch +++ /dev/null @@ -1,54 +0,0 @@ -From c5809eddd3d1d543051688b3e0d5fe1140d96853 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Mon, 6 May 2024 18:13:50 +0200 -Subject: ALSA: hda: conexant: Reduce CONFIG_PM dependencies - -From: Takashi Iwai - -[ Upstream commit 29d57f6dc62485ee0752767debdfa2783d162beb ] - -CONFIG_PM dependencies got reduced in HD-audio codec core driver, and -now it's time to reduce in HD-audio conexant codec driver, too. - -Simply drop CONFIG_PM ifdefs. - -Signed-off-by: Takashi Iwai -Link: https://lore.kernel.org/r/20240506161359.6960-8-tiwai@suse.de -Stable-dep-of: e60dc9812211 ("ALSA: hda: conexant: Fix headset auto detect fail in the polling mode") -Signed-off-by: Sasha Levin ---- - sound/pci/hda/patch_conexant.c | 4 ---- - 1 file changed, 4 deletions(-) - -diff --git a/sound/pci/hda/patch_conexant.c b/sound/pci/hda/patch_conexant.c -index 876380ad2ed13..76ea4fb391fed 100644 ---- a/sound/pci/hda/patch_conexant.c -+++ b/sound/pci/hda/patch_conexant.c -@@ -294,13 +294,11 @@ static void cx_jack_unsol_event(struct hda_codec *codec, unsigned int res) - snd_hda_jack_unsol_event(codec, res); - } - --#ifdef CONFIG_PM - static int cx_auto_suspend(struct hda_codec *codec) - { - cx_auto_shutdown(codec); - return 0; - } --#endif - - static const struct hda_codec_ops cx_auto_patch_ops = { - .build_controls = snd_hda_gen_build_controls, -@@ -308,10 +306,8 @@ static const struct hda_codec_ops cx_auto_patch_ops = { - .init = cx_auto_init, - .free = cx_auto_free, - .unsol_event = cx_jack_unsol_event, --#ifdef CONFIG_PM - .suspend = cx_auto_suspend, - .check_power_status = snd_hda_gen_check_power_status, --#endif - }; - - /* --- -2.43.0 - diff --git a/queue-5.15/series b/queue-5.15/series index 74aeafff373..364e99ba832 100644 --- a/queue-5.15/series +++ b/queue-5.15/series @@ -348,7 +348,6 @@ mips-dts-loongson-fix-ls2k1000-rtc-interrupt.patch drm-nouveau-prime-fix-refcount-underflow.patch drm-vmwgfx-fix-overlay-when-using-screen-targets.patch sched-act_ct-take-care-of-padding-in-struct-zones_ht.patch -alsa-hda-conexant-reduce-config_pm-dependencies.patch alsa-hda-conexant-fix-headset-auto-detect-fail-in-th.patch rtnetlink-enable-alt_ifname-for-setlink-newlink.patch rtnetlink-don-t-ignore-ifla_target_netnsid-when-ifna.patch diff --git a/queue-6.1/alsa-hda-conexant-fix-headset-auto-detect-fail-in-th.patch b/queue-6.1/alsa-hda-conexant-fix-headset-auto-detect-fail-in-th.patch index 616b53379d6..7c571e18ddf 100644 --- a/queue-6.1/alsa-hda-conexant-fix-headset-auto-detect-fail-in-th.patch +++ b/queue-6.1/alsa-hda-conexant-fix-headset-auto-detect-fail-in-th.patch @@ -1,4 +1,4 @@ -From 5e8a86ba045c4307d6bd04252e67e63eb9b2154a Mon Sep 17 00:00:00 2001 +From 0d0bb50d7dadeb3ea01a3dc9d340d887cc283958 Mon Sep 17 00:00:00 2001 From: Sasha Levin Date: Fri, 26 Jul 2024 18:07:26 +0800 Subject: ALSA: hda: conexant: Fix headset auto detect fail in the polling mode @@ -20,11 +20,9 @@ Link: https://patch.msgid.link/20240726100726.50824-1-soxiebing@163.com Signed-off-by: Takashi Iwai Signed-off-by: Sasha Levin --- - sound/pci/hda/patch_conexant.c | 54 ++++++---------------------------- + sound/pci/hda/patch_conexant.c | 54 ++++++----------------------------------- 1 file changed, 9 insertions(+), 45 deletions(-) -diff --git a/sound/pci/hda/patch_conexant.c b/sound/pci/hda/patch_conexant.c -index 17389a3801bd1..4472923ba694b 100644 --- a/sound/pci/hda/patch_conexant.c +++ b/sound/pci/hda/patch_conexant.c @@ -21,12 +21,6 @@ @@ -48,7 +46,7 @@ index 17389a3801bd1..4472923ba694b 100644 bool is_cx8070_sn6140; }; -@@ -250,48 +243,19 @@ static void cx_process_headset_plugin(struct hda_codec *codec) +@@ -250,48 +243,19 @@ static void cx_process_headset_plugin(st } } @@ -103,17 +101,17 @@ index 17389a3801bd1..4472923ba694b 100644 + cx_process_headset_plugin(codec); } - static int cx_auto_suspend(struct hda_codec *codec) -@@ -305,7 +269,7 @@ static const struct hda_codec_ops cx_auto_patch_ops = { + #ifdef CONFIG_PM +@@ -307,7 +271,7 @@ static const struct hda_codec_ops cx_aut .build_pcms = snd_hda_gen_build_pcms, .init = cx_auto_init, .free = cx_auto_free, - .unsol_event = cx_jack_unsol_event, + .unsol_event = snd_hda_jack_unsol_event, + #ifdef CONFIG_PM .suspend = cx_auto_suspend, .check_power_status = snd_hda_gen_check_power_status, - }; -@@ -1163,7 +1127,7 @@ static int patch_conexant_auto(struct hda_codec *codec) +@@ -1167,7 +1131,7 @@ static int patch_conexant_auto(struct hd case 0x14f11f86: case 0x14f11f87: spec->is_cx8070_sn6140 = true; @@ -122,6 +120,3 @@ index 17389a3801bd1..4472923ba694b 100644 break; } --- -2.43.0 - diff --git a/queue-6.1/alsa-hda-conexant-reduce-config_pm-dependencies.patch b/queue-6.1/alsa-hda-conexant-reduce-config_pm-dependencies.patch deleted file mode 100644 index 670f558957b..00000000000 --- a/queue-6.1/alsa-hda-conexant-reduce-config_pm-dependencies.patch +++ /dev/null @@ -1,54 +0,0 @@ -From b3ad12d5742bba25b7d3c883ce724278d0ce2f04 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Mon, 6 May 2024 18:13:50 +0200 -Subject: ALSA: hda: conexant: Reduce CONFIG_PM dependencies - -From: Takashi Iwai - -[ Upstream commit 29d57f6dc62485ee0752767debdfa2783d162beb ] - -CONFIG_PM dependencies got reduced in HD-audio codec core driver, and -now it's time to reduce in HD-audio conexant codec driver, too. - -Simply drop CONFIG_PM ifdefs. - -Signed-off-by: Takashi Iwai -Link: https://lore.kernel.org/r/20240506161359.6960-8-tiwai@suse.de -Stable-dep-of: e60dc9812211 ("ALSA: hda: conexant: Fix headset auto detect fail in the polling mode") -Signed-off-by: Sasha Levin ---- - sound/pci/hda/patch_conexant.c | 4 ---- - 1 file changed, 4 deletions(-) - -diff --git a/sound/pci/hda/patch_conexant.c b/sound/pci/hda/patch_conexant.c -index e8209178d87bb..17389a3801bd1 100644 ---- a/sound/pci/hda/patch_conexant.c -+++ b/sound/pci/hda/patch_conexant.c -@@ -294,13 +294,11 @@ static void cx_jack_unsol_event(struct hda_codec *codec, unsigned int res) - snd_hda_jack_unsol_event(codec, res); - } - --#ifdef CONFIG_PM - static int cx_auto_suspend(struct hda_codec *codec) - { - cx_auto_shutdown(codec); - return 0; - } --#endif - - static const struct hda_codec_ops cx_auto_patch_ops = { - .build_controls = snd_hda_gen_build_controls, -@@ -308,10 +306,8 @@ static const struct hda_codec_ops cx_auto_patch_ops = { - .init = cx_auto_init, - .free = cx_auto_free, - .unsol_event = cx_jack_unsol_event, --#ifdef CONFIG_PM - .suspend = cx_auto_suspend, - .check_power_status = snd_hda_gen_check_power_status, --#endif - }; - - /* --- -2.43.0 - diff --git a/queue-6.1/series b/queue-6.1/series index 8daacfe4b92..356e2e72c6d 100644 --- a/queue-6.1/series +++ b/queue-6.1/series @@ -41,7 +41,6 @@ drm-nouveau-prime-fix-refcount-underflow.patch drm-vmwgfx-fix-overlay-when-using-screen-targets.patch drm-vmwgfx-trigger-a-modeset-when-the-screen-moves.patch sched-act_ct-take-care-of-padding-in-struct-zones_ht.patch -alsa-hda-conexant-reduce-config_pm-dependencies.patch alsa-hda-conexant-fix-headset-auto-detect-fail-in-th.patch bluetooth-hci_sync-fix-suspending-with-wrong-filter-.patch net-axienet-start-napi-before-enabling-rx-tx.patch diff --git a/queue-6.6/alsa-hda-conexant-fix-headset-auto-detect-fail-in-th.patch b/queue-6.6/alsa-hda-conexant-fix-headset-auto-detect-fail-in-th.patch index ce163f6c60e..7c571e18ddf 100644 --- a/queue-6.6/alsa-hda-conexant-fix-headset-auto-detect-fail-in-th.patch +++ b/queue-6.6/alsa-hda-conexant-fix-headset-auto-detect-fail-in-th.patch @@ -20,11 +20,9 @@ Link: https://patch.msgid.link/20240726100726.50824-1-soxiebing@163.com Signed-off-by: Takashi Iwai Signed-off-by: Sasha Levin --- - sound/pci/hda/patch_conexant.c | 54 ++++++---------------------------- + sound/pci/hda/patch_conexant.c | 54 ++++++----------------------------------- 1 file changed, 9 insertions(+), 45 deletions(-) -diff --git a/sound/pci/hda/patch_conexant.c b/sound/pci/hda/patch_conexant.c -index 17389a3801bd1..4472923ba694b 100644 --- a/sound/pci/hda/patch_conexant.c +++ b/sound/pci/hda/patch_conexant.c @@ -21,12 +21,6 @@ @@ -48,7 +46,7 @@ index 17389a3801bd1..4472923ba694b 100644 bool is_cx8070_sn6140; }; -@@ -250,48 +243,19 @@ static void cx_process_headset_plugin(struct hda_codec *codec) +@@ -250,48 +243,19 @@ static void cx_process_headset_plugin(st } } @@ -103,17 +101,17 @@ index 17389a3801bd1..4472923ba694b 100644 + cx_process_headset_plugin(codec); } - static int cx_auto_suspend(struct hda_codec *codec) -@@ -305,7 +269,7 @@ static const struct hda_codec_ops cx_auto_patch_ops = { + #ifdef CONFIG_PM +@@ -307,7 +271,7 @@ static const struct hda_codec_ops cx_aut .build_pcms = snd_hda_gen_build_pcms, .init = cx_auto_init, .free = cx_auto_free, - .unsol_event = cx_jack_unsol_event, + .unsol_event = snd_hda_jack_unsol_event, + #ifdef CONFIG_PM .suspend = cx_auto_suspend, .check_power_status = snd_hda_gen_check_power_status, - }; -@@ -1163,7 +1127,7 @@ static int patch_conexant_auto(struct hda_codec *codec) +@@ -1167,7 +1131,7 @@ static int patch_conexant_auto(struct hd case 0x14f11f86: case 0x14f11f87: spec->is_cx8070_sn6140 = true; @@ -122,6 +120,3 @@ index 17389a3801bd1..4472923ba694b 100644 break; } --- -2.43.0 - diff --git a/queue-6.6/alsa-hda-conexant-reduce-config_pm-dependencies.patch b/queue-6.6/alsa-hda-conexant-reduce-config_pm-dependencies.patch deleted file mode 100644 index 3c0d350b342..00000000000 --- a/queue-6.6/alsa-hda-conexant-reduce-config_pm-dependencies.patch +++ /dev/null @@ -1,54 +0,0 @@ -From 80d488ef40f082120bd9cad8aa151bf07e10d863 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Mon, 6 May 2024 18:13:50 +0200 -Subject: ALSA: hda: conexant: Reduce CONFIG_PM dependencies - -From: Takashi Iwai - -[ Upstream commit 29d57f6dc62485ee0752767debdfa2783d162beb ] - -CONFIG_PM dependencies got reduced in HD-audio codec core driver, and -now it's time to reduce in HD-audio conexant codec driver, too. - -Simply drop CONFIG_PM ifdefs. - -Signed-off-by: Takashi Iwai -Link: https://lore.kernel.org/r/20240506161359.6960-8-tiwai@suse.de -Stable-dep-of: e60dc9812211 ("ALSA: hda: conexant: Fix headset auto detect fail in the polling mode") -Signed-off-by: Sasha Levin ---- - sound/pci/hda/patch_conexant.c | 4 ---- - 1 file changed, 4 deletions(-) - -diff --git a/sound/pci/hda/patch_conexant.c b/sound/pci/hda/patch_conexant.c -index e8209178d87bb..17389a3801bd1 100644 ---- a/sound/pci/hda/patch_conexant.c -+++ b/sound/pci/hda/patch_conexant.c -@@ -294,13 +294,11 @@ static void cx_jack_unsol_event(struct hda_codec *codec, unsigned int res) - snd_hda_jack_unsol_event(codec, res); - } - --#ifdef CONFIG_PM - static int cx_auto_suspend(struct hda_codec *codec) - { - cx_auto_shutdown(codec); - return 0; - } --#endif - - static const struct hda_codec_ops cx_auto_patch_ops = { - .build_controls = snd_hda_gen_build_controls, -@@ -308,10 +306,8 @@ static const struct hda_codec_ops cx_auto_patch_ops = { - .init = cx_auto_init, - .free = cx_auto_free, - .unsol_event = cx_jack_unsol_event, --#ifdef CONFIG_PM - .suspend = cx_auto_suspend, - .check_power_status = snd_hda_gen_check_power_status, --#endif - }; - - /* --- -2.43.0 - diff --git a/queue-6.6/series b/queue-6.6/series index f1d86c00782..bb64eb52693 100644 --- a/queue-6.6/series +++ b/queue-6.6/series @@ -56,7 +56,6 @@ drm-vmwgfx-trigger-a-modeset-when-the-screen-moves.patch sched-act_ct-take-care-of-padding-in-struct-zones_ht.patch wifi-cfg80211-fix-reporting-failed-mlo-links-status-.patch net-phy-realtek-add-support-for-rtl8366s-gigabit-phy.patch -alsa-hda-conexant-reduce-config_pm-dependencies.patch alsa-hda-conexant-fix-headset-auto-detect-fail-in-th.patch bluetooth-btintel-fail-setup-on-error.patch bluetooth-hci_sync-fix-suspending-with-wrong-filter-.patch