Home Home > GIT Browse > SLE15
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2019-05-19 09:48:33 +0200
committerTakashi Iwai <tiwai@suse.de>2019-05-19 09:48:42 +0200
commit6e9161a792e65d672bbc7882f837f94ced5775fb (patch)
treead2864d817ca88fde28dd538a508ae02810a4206
parent4af2dd36b23b7469f4d96addffa7a4808f3749dc (diff)
ALSA: hda/realtek - Avoid superfluous COEF EAPD setups
(bsc#1051510).
-rw-r--r--patches.drivers/ALSA-hda-realtek-Avoid-superfluous-COEF-EAPD-setups.patch143
-rw-r--r--series.conf1
2 files changed, 144 insertions, 0 deletions
diff --git a/patches.drivers/ALSA-hda-realtek-Avoid-superfluous-COEF-EAPD-setups.patch b/patches.drivers/ALSA-hda-realtek-Avoid-superfluous-COEF-EAPD-setups.patch
new file mode 100644
index 0000000000..5644dd7536
--- /dev/null
+++ b/patches.drivers/ALSA-hda-realtek-Avoid-superfluous-COEF-EAPD-setups.patch
@@ -0,0 +1,143 @@
+From c9af753f26bdf80291eb2c2279b9de1989fbc591 Mon Sep 17 00:00:00 2001
+From: Takashi Iwai <tiwai@suse.de>
+Date: Fri, 10 May 2019 11:01:43 +0200
+Subject: [PATCH] ALSA: hda/realtek - Avoid superfluous COEF EAPD setups
+Git-commit: c9af753f26bdf80291eb2c2279b9de1989fbc591
+Patch-mainline: v5.2-rc1
+References: bsc#1051510
+
+Realtek codec driver applied the COEF setups to change the EAPD
+control to the default mode (i.e. control by EPAD verbs) at the init
+callback. It works, but this is too excessive at the same time, since
+it's called at each runtime PM resume. That is, the initialization
+should be done only once after the probe. One may think that moving
+this to the probe should be OK, but no -- there is a catch; when a
+system resumes from S4 (hibernation), we need to re-initialize this
+again manually, because it's out of regcache restoration.
+
+This patch addresses the issue by introducing alc_pre_init() function
+that performs such a task. This is called from each codec probe
+function, and it's called from the resume callback conditionally only
+from S4 resume.
+
+Reported-and-tested-by: Kailang Yang <kailang@realtek.com>
+Signed-off-by: Takashi Iwai <tiwai@suse.de>
+
+---
+ sound/pci/hda/patch_realtek.c | 31 ++++++++++++++++++++++++++++++-
+ 1 file changed, 30 insertions(+), 1 deletion(-)
+
+--- a/sound/pci/hda/patch_realtek.c
++++ b/sound/pci/hda/patch_realtek.c
+@@ -509,7 +509,6 @@ static void alc_eapd_shutup(struct hda_c
+ /* generic EAPD initialization */
+ static void alc_auto_init_amp(struct hda_codec *codec, int type)
+ {
+- alc_fill_eapd_coef(codec);
+ alc_auto_setup_eapd(codec, true);
+ alc_write_gpio(codec);
+ switch (type) {
+@@ -837,10 +836,22 @@ static int alc_build_controls(struct hda
+ * Common callbacks
+ */
+
++static void alc_pre_init(struct hda_codec *codec)
++{
++ alc_fill_eapd_coef(codec);
++}
++
++#define is_s4_resume(codec) \
++ ((codec)->core.dev.power.power_state.event == PM_EVENT_RESTORE)
++
+ static int alc_init(struct hda_codec *codec)
+ {
+ struct alc_spec *spec = codec->spec;
+
++ /* hibernation resume needs the full chip initialization */
++ if (is_s4_resume(codec))
++ alc_pre_init(codec);
++
+ if (spec->init_hook)
+ spec->init_hook(codec);
+
+@@ -1556,6 +1567,8 @@ static int patch_alc880(struct hda_codec
+
+ codec->patch_ops.unsol_event = alc880_unsol_event;
+
++ alc_pre_init(codec);
++
+ snd_hda_pick_fixup(codec, alc880_fixup_models, alc880_fixup_tbl,
+ alc880_fixups);
+ snd_hda_apply_fixup(codec, HDA_FIXUP_ACT_PRE_PROBE);
+@@ -1804,6 +1817,8 @@ static int patch_alc260(struct hda_codec
+
+ spec->shutup = alc_eapd_shutup;
+
++ alc_pre_init(codec);
++
+ snd_hda_pick_fixup(codec, alc260_fixup_models, alc260_fixup_tbl,
+ alc260_fixups);
+ snd_hda_apply_fixup(codec, HDA_FIXUP_ACT_PRE_PROBE);
+@@ -2512,6 +2527,8 @@ static int patch_alc882(struct hda_codec
+ break;
+ }
+
++ alc_pre_init(codec);
++
+ snd_hda_pick_fixup(codec, alc882_fixup_models, alc882_fixup_tbl,
+ alc882_fixups);
+ snd_hda_apply_fixup(codec, HDA_FIXUP_ACT_PRE_PROBE);
+@@ -2675,6 +2692,8 @@ static int patch_alc262(struct hda_codec
+ #endif
+ alc_fix_pll_init(codec, 0x20, 0x0a, 10);
+
++ alc_pre_init(codec);
++
+ snd_hda_pick_fixup(codec, alc262_fixup_models, alc262_fixup_tbl,
+ alc262_fixups);
+ snd_hda_apply_fixup(codec, HDA_FIXUP_ACT_PRE_PROBE);
+@@ -2816,6 +2835,8 @@ static int patch_alc268(struct hda_codec
+
+ spec->shutup = alc_eapd_shutup;
+
++ alc_pre_init(codec);
++
+ snd_hda_pick_fixup(codec, alc268_fixup_models, alc268_fixup_tbl, alc268_fixups);
+ snd_hda_apply_fixup(codec, HDA_FIXUP_ACT_PRE_PROBE);
+
+@@ -7518,6 +7539,8 @@ static int patch_alc269(struct hda_codec
+ spec->shutup = alc_default_shutup;
+ spec->init_hook = alc_default_init;
+
++ alc_pre_init(codec);
++
+ snd_hda_pick_fixup(codec, alc269_fixup_models,
+ alc269_fixup_tbl, alc269_fixups);
+ snd_hda_pick_pin_fixup(codec, alc269_pin_fixup_tbl, alc269_fixups);
+@@ -7782,6 +7805,8 @@ static int patch_alc861(struct hda_codec
+ spec->power_hook = alc_power_eapd;
+ #endif
+
++ alc_pre_init(codec);
++
+ snd_hda_pick_fixup(codec, NULL, alc861_fixup_tbl, alc861_fixups);
+ snd_hda_apply_fixup(codec, HDA_FIXUP_ACT_PRE_PROBE);
+
+@@ -7871,6 +7896,8 @@ static int patch_alc861vd(struct hda_cod
+
+ spec->shutup = alc_eapd_shutup;
+
++ alc_pre_init(codec);
++
+ snd_hda_pick_fixup(codec, NULL, alc861vd_fixup_tbl, alc861vd_fixups);
+ snd_hda_apply_fixup(codec, HDA_FIXUP_ACT_PRE_PROBE);
+
+@@ -8592,6 +8619,8 @@ static int patch_alc662(struct hda_codec
+ break;
+ }
+
++ alc_pre_init(codec);
++
+ snd_hda_pick_fixup(codec, alc662_fixup_models,
+ alc662_fixup_tbl, alc662_fixups);
+ snd_hda_pick_pin_fixup(codec, alc662_pin_fixup_tbl, alc662_fixups);
diff --git a/series.conf b/series.conf
index ddf56c32c2..11d43e0221 100644
--- a/series.conf
+++ b/series.conf
@@ -22046,6 +22046,7 @@
patches.drivers/media-omap_vout-potential-buffer-overflow-in-vidioc_.patch
patches.drivers/media-davinci-vpbe-array-underflow-in-vpbe_enum_outp.patch
patches.drivers/ALSA-hda-realtek-Fixup-headphone-noise-via-runtime-s.patch
+ patches.drivers/ALSA-hda-realtek-Avoid-superfluous-COEF-EAPD-setups.patch
# dhowells/linux-fs keys-uefi
patches.suse/0001-KEYS-Allow-unrestricted-boot-time-addition-of-keys-t.patch