From: Greg Kroah-Hartman Date: Fri, 27 Jan 2012 23:22:55 +0000 (-0800) Subject: 3.0-stable patches X-Git-Tag: v3.0.19~18 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b857a49667b120aaf00fb4fd188d5ecff37a6562;p=thirdparty%2Fkernel%2Fstable-queue.git 3.0-stable patches added patches: alsa-hda-fix-silent-output-on-asus-a6rp.patch alsa-hda-fix-silent-output-on-haier-w18-laptop.patch cap_syslog-don-t-use-warn_once-for-cap_sys_admin.patch drm-i915-sdvo-always-set-positive-sync-polarity.patch --- diff --git a/queue-3.0/alsa-hda-fix-silent-output-on-asus-a6rp.patch b/queue-3.0/alsa-hda-fix-silent-output-on-asus-a6rp.patch new file mode 100644 index 00000000000..012842bea59 --- /dev/null +++ b/queue-3.0/alsa-hda-fix-silent-output-on-asus-a6rp.patch @@ -0,0 +1,53 @@ +From 3b25eb690e8c7424eecffe1458c02b87b32aa001 Mon Sep 17 00:00:00 2001 +From: Takashi Iwai +Date: Wed, 25 Jan 2012 09:55:46 +0100 +Subject: ALSA: hda - Fix silent output on ASUS A6Rp + +From: Takashi Iwai + +commit 3b25eb690e8c7424eecffe1458c02b87b32aa001 upstream. + +The refactoring of Realtek codec driver in 3.2 kernel caused a +regression for ASUS A6Rp laptop; it doesn't give any output. +The reason was that this machine has a secret master mute (or EAPD) +control via NID 0x0f VREF. Setting VREF50 on this node makes the +sound working again. + +Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=42588 + +Signed-off-by: Takashi Iwai +Signed-off-by: Greg Kroah-Hartman + +--- + sound/pci/hda/patch_realtek.c | 10 ++++++++++ + 1 file changed, 10 insertions(+) + +--- a/sound/pci/hda/patch_realtek.c ++++ b/sound/pci/hda/patch_realtek.c +@@ -16419,6 +16419,7 @@ static const struct alc_config_preset al + /* Pin config fixes */ + enum { + PINFIX_FSC_AMILO_PI1505, ++ PINFIX_ASUS_A6RP, + }; + + static const struct alc_fixup alc861_fixups[] = { +@@ -16430,9 +16431,18 @@ static const struct alc_fixup alc861_fix + { } + } + }, ++ [PINFIX_ASUS_A6RP] = { ++ .type = ALC_FIXUP_VERBS, ++ .v.verbs = (const struct hda_verb[]) { ++ /* node 0x0f VREF seems controlling the master output */ ++ { 0x0f, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF50 }, ++ { } ++ }, ++ }, + }; + + static const struct snd_pci_quirk alc861_fixup_tbl[] = { ++ SND_PCI_QUIRK(0x1043, 0x1393, "ASUS A6Rp", PINFIX_ASUS_A6RP), + SND_PCI_QUIRK(0x1734, 0x10c7, "FSC Amilo Pi1505", PINFIX_FSC_AMILO_PI1505), + {} + }; diff --git a/queue-3.0/alsa-hda-fix-silent-output-on-haier-w18-laptop.patch b/queue-3.0/alsa-hda-fix-silent-output-on-haier-w18-laptop.patch new file mode 100644 index 00000000000..c2a47a75685 --- /dev/null +++ b/queue-3.0/alsa-hda-fix-silent-output-on-haier-w18-laptop.patch @@ -0,0 +1,32 @@ +From b3a81520bd37a28f77cb0f7002086fb14061824d Mon Sep 17 00:00:00 2001 +From: Takashi Iwai +Date: Thu, 26 Jan 2012 15:56:16 +0100 +Subject: ALSA: hda - Fix silent output on Haier W18 laptop + +From: Takashi Iwai + +commit b3a81520bd37a28f77cb0f7002086fb14061824d upstream. + +The very same problem is seen on Haier W18 laptop with ALC861 as seen +on ASUS A6Rp, which was fixed by the commit 3b25eb69. +Now we just need to add a new SSID entry pointing to the same fixup. + +Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=42656 + +Signed-off-by: Takashi Iwai +Signed-off-by: Greg Kroah-Hartman + +--- + sound/pci/hda/patch_realtek.c | 1 + + 1 file changed, 1 insertion(+) + +--- a/sound/pci/hda/patch_realtek.c ++++ b/sound/pci/hda/patch_realtek.c +@@ -16443,6 +16443,7 @@ static const struct alc_fixup alc861_fix + + static const struct snd_pci_quirk alc861_fixup_tbl[] = { + SND_PCI_QUIRK(0x1043, 0x1393, "ASUS A6Rp", PINFIX_ASUS_A6RP), ++ SND_PCI_QUIRK(0x1584, 0x2b01, "Haier W18", PINFIX_ASUS_A6RP), + SND_PCI_QUIRK(0x1734, 0x10c7, "FSC Amilo Pi1505", PINFIX_FSC_AMILO_PI1505), + {} + }; diff --git a/queue-3.0/cap_syslog-don-t-use-warn_once-for-cap_sys_admin.patch b/queue-3.0/cap_syslog-don-t-use-warn_once-for-cap_sys_admin.patch new file mode 100644 index 00000000000..35f7aa1d361 --- /dev/null +++ b/queue-3.0/cap_syslog-don-t-use-warn_once-for-cap_sys_admin.patch @@ -0,0 +1,58 @@ +From f2c0d0266cc5eb36a4aa44944b4096ec121490aa Mon Sep 17 00:00:00 2001 +From: Jonathan Nieder +Date: Mon, 8 Aug 2011 06:22:43 +0200 +Subject: cap_syslog: don't use WARN_ONCE for CAP_SYS_ADMIN + deprecation warning +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +From: Jonathan Nieder + +commit f2c0d0266cc5eb36a4aa44944b4096ec121490aa upstream. + +syslog-ng versions before 3.3.0beta1 (2011-05-12) assume that +CAP_SYS_ADMIN is sufficient to access syslog, so ever since CAP_SYSLOG +was introduced (2010-11-25) they have triggered a warning. + +Commit ee24aebffb75 ("cap_syslog: accept CAP_SYS_ADMIN for now") +improved matters a little by making syslog-ng work again, just keeping +the WARN_ONCE(). But still, this is a warning that writes a stack trace +we don't care about to syslog, sets a taint flag, and alarms sysadmins +when nothing worse has happened than use of an old userspace with a +recent kernel. + +Convert the WARN_ONCE to a printk_once to avoid that while continuing to +give userspace developers a hint that this is an unwanted +backward-compatibility feature and won't be around forever. + +Reported-by: Ralf Hildebrandt +Reported-by: Niels +Reported-by: Paweł Sikora +Signed-off-by: Jonathan Nieder +Liked-by: Gergely Nagy +Acked-by: Serge Hallyn +Acked-by: James Morris +Signed-off-by: Linus Torvalds +Cc: Christoph Biedl +Signed-off-by: Greg Kroah-Hartman + +--- + kernel/printk.c | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +--- a/kernel/printk.c ++++ b/kernel/printk.c +@@ -318,8 +318,10 @@ static int check_syslog_permissions(int + return 0; + /* For historical reasons, accept CAP_SYS_ADMIN too, with a warning */ + if (capable(CAP_SYS_ADMIN)) { +- WARN_ONCE(1, "Attempt to access syslog with CAP_SYS_ADMIN " +- "but no CAP_SYSLOG (deprecated).\n"); ++ printk_once(KERN_WARNING "%s (%d): " ++ "Attempt to access syslog with CAP_SYS_ADMIN " ++ "but no CAP_SYSLOG (deprecated).\n", ++ current->comm, task_pid_nr(current)); + return 0; + } + return -EPERM; diff --git a/queue-3.0/drm-i915-sdvo-always-set-positive-sync-polarity.patch b/queue-3.0/drm-i915-sdvo-always-set-positive-sync-polarity.patch new file mode 100644 index 00000000000..ecae9777bf3 --- /dev/null +++ b/queue-3.0/drm-i915-sdvo-always-set-positive-sync-polarity.patch @@ -0,0 +1,50 @@ +From ba68e086223a5f149f37bf8692c8cdbf1b0ba3ef Mon Sep 17 00:00:00 2001 +From: Paulo Zanoni +Date: Fri, 6 Jan 2012 19:45:34 -0200 +Subject: drm/i915/sdvo: always set positive sync polarity + +From: Paulo Zanoni + +commit ba68e086223a5f149f37bf8692c8cdbf1b0ba3ef upstream. + +This is a revert of 81a14b46846fea0741902e8d8dfcc6c6c78154c8. + +We already set the mode polarity using the SDVO commands with struct +intel_sdvo_dtd. We have at least 3 bugs that get fixed with this patch. +The documentation, despite not clear, can also be interpreted in a way +that suggests this patch is needed. + +Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=15766 +Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=42174 +Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=43333 +Reviewed-by: Eric Anholt +Reviewed-by: Jesse Barnes +Signed-off-by: Paulo Zanoni +Signed-off-by: Keith Packard +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/gpu/drm/i915/intel_sdvo.c | 8 +++----- + 1 file changed, 3 insertions(+), 5 deletions(-) + +--- a/drivers/gpu/drm/i915/intel_sdvo.c ++++ b/drivers/gpu/drm/i915/intel_sdvo.c +@@ -1059,15 +1059,13 @@ static void intel_sdvo_mode_set(struct d + + /* Set the SDVO control regs. */ + if (INTEL_INFO(dev)->gen >= 4) { +- sdvox = 0; ++ /* The real mode polarity is set by the SDVO commands, using ++ * struct intel_sdvo_dtd. */ ++ sdvox = SDVO_VSYNC_ACTIVE_HIGH | SDVO_HSYNC_ACTIVE_HIGH; + if (intel_sdvo->is_hdmi) + sdvox |= intel_sdvo->color_range; + if (INTEL_INFO(dev)->gen < 5) + sdvox |= SDVO_BORDER_ENABLE; +- if (adjusted_mode->flags & DRM_MODE_FLAG_PVSYNC) +- sdvox |= SDVO_VSYNC_ACTIVE_HIGH; +- if (adjusted_mode->flags & DRM_MODE_FLAG_PHSYNC) +- sdvox |= SDVO_HSYNC_ACTIVE_HIGH; + } else { + sdvox = I915_READ(intel_sdvo->sdvo_reg); + switch (intel_sdvo->sdvo_reg) { diff --git a/queue-3.0/series b/queue-3.0/series index 65b047e2bc6..43f3ac7cdd9 100644 --- a/queue-3.0/series +++ b/queue-3.0/series @@ -16,3 +16,7 @@ ah-don-t-return-net_xmit_drop-on-input.patch xfs-fix-endian-conversion-issue-in-discard-code.patch x86-uv-fix-uv_gpa_to_soc_phys_ram-shift.patch x86-microcode_amd-add-support-for-cpu-family-specific-container-files.patch +alsa-hda-fix-silent-output-on-asus-a6rp.patch +alsa-hda-fix-silent-output-on-haier-w18-laptop.patch +drm-i915-sdvo-always-set-positive-sync-polarity.patch +cap_syslog-don-t-use-warn_once-for-cap_sys_admin.patch