rpms/kernel/F-10 linux-2.6-alsa-hda-remove-broken-headphone-control-for-dell-laptops.patch, NONE, 1.1 linux-2.6-alsa-hda-revert-remove-unneeded-hp-nid-references.patch, NONE, 1.1 linux-2.6-alsa-hda-stac-dell-m6-eapd.patch, NONE, 1.1 kernel.spec, 1.1201, 1.1202

Mon Dec 22 20:11:28 UTC 2008

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22463

Modified Files:
	kernel.spec 
Added Files:
	linux-2.6-alsa-hda-remove-broken-headphone-control-for-dell-laptops.patch 
	linux-2.6-alsa-hda-revert-remove-unneeded-hp-nid-references.patch 
	linux-2.6-alsa-hda-stac-dell-m6-eapd.patch 
Log Message:
Hopefully fix broken headphone output on some Dell notebooks.

linux-2.6-alsa-hda-remove-broken-headphone-control-for-dell-laptops.patch:

--- NEW FILE linux-2.6-alsa-hda-remove-broken-headphone-control-for-dell-laptops.patch ---
From: Takashi Iwai <tiwai at suse.de>
Date: Fri, 19 Dec 2008 13:02:32 +0000 (+0100)
Subject: ALSA: hda - Remove non-working headphone control for Dell laptops
X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=8f55c1e51fbb03998708bdd97d5b6665ab92462d

ALSA: hda - Remove non-working headphone control for Dell laptops

The previous commit re-enabled hp_nid setup for IDT92HD73*, but
it's unneeded indeed for Dell laptops that have multiple headphones.
Setting the extra hp_nid results in a non-working "Headpohne" mixer
control.  Thus hp_nid should be 0 for these dell models.

Also, the automatic addition of hp_nid should check whether it's
a dual-HP model or not.  For dual-HPs, the pins are already checked
by the early workaround.

Signed-off-by: Takashi Iwai <tiwai at suse.de>
---

diff --git a/sound/pci/hda/patch_sigmatel.c b/sound/pci/hda/patch_sigmatel.c
index d7c622f..596ceab 100644
--- a/sound/pci/hda/patch_sigmatel.c
+++ b/sound/pci/hda/patch_sigmatel.c
@@ -2903,7 +2903,7 @@ static int stac92xx_auto_create_multi_out_ctls(struct hda_codec *codec,
 	}
 
 	if ((spec->multiout.num_dacs - cfg->line_outs) > 0 &&
-			cfg->hp_outs && !spec->multiout.hp_nid)
+	    cfg->hp_outs == 1 && !spec->multiout.hp_nid)
 		spec->multiout.hp_nid = nid;
 
 	if (cfg->hp_outs > 1 && cfg->line_out_type == AUTO_PIN_LINE_OUT) {
@@ -4307,6 +4307,7 @@ again:
 		spec->amp_nids = &stac92hd73xx_amp_nids[DELL_M6_AMP];
 		spec->eapd_switch = 0;
 		spec->num_amps = 1;
+		spec->multiout.hp_nid = 0; /* dual HPs */
 
 		if (!spec->init)
 			spec->init = dell_m6_core_init;

linux-2.6-alsa-hda-revert-remove-unneeded-hp-nid-references.patch:

--- NEW FILE linux-2.6-alsa-hda-revert-remove-unneeded-hp-nid-references.patch ---
From: Takashi Iwai <tiwai at suse.de>
Date: Fri, 19 Dec 2008 07:20:38 +0000 (+0100)
Subject: ALSA: Revert "ALSA: hda: removed unneeded hp_nid references"
X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=85f13b673f6a59d29529b2a60b88306c68e7b56c

ALSA: Revert "ALSA: hda: removed unneeded hp_nid references"

This reverts commit 07f455f779acfb3eba4921fd1399761559b10fa9.
    ALSA: hda: removed unneeded hp_nid references

    Removed unneeded hp_nid references for 92hd73xx codec family.

This caused the silent output on some Intel desktops due to missing
routing of widget 0x0a and 0x0d.

Signed-off-by: Takashi Iwai <tiwai at suse.de>
---

diff --git a/sound/pci/hda/patch_sigmatel.c b/sound/pci/hda/patch_sigmatel.c
index 0bb3cae..5fcaae6 100644
--- a/sound/pci/hda/patch_sigmatel.c
+++ b/sound/pci/hda/patch_sigmatel.c
@@ -4259,14 +4259,17 @@ again:
 
 	switch (spec->multiout.num_dacs) {
 	case 0x3: /* 6 Channel */
+		spec->multiout.hp_nid = 0x17;
 		spec->mixer = stac92hd73xx_6ch_mixer;
 		spec->init = stac92hd73xx_6ch_core_init;
 		break;
 	case 0x4: /* 8 Channel */
+		spec->multiout.hp_nid = 0x18;
 		spec->mixer = stac92hd73xx_8ch_mixer;
 		spec->init = stac92hd73xx_8ch_core_init;
 		break;
 	case 0x5: /* 10 Channel */
+		spec->multiout.hp_nid = 0x19;
 		spec->mixer = stac92hd73xx_10ch_mixer;
 		spec->init = stac92hd73xx_10ch_core_init;
 	};

linux-2.6-alsa-hda-stac-dell-m6-eapd.patch:

--- NEW FILE linux-2.6-alsa-hda-stac-dell-m6-eapd.patch ---
From: Matthew Ranostay <mranostay at embeddedalley.com>
Date: Sun, 16 Nov 2008 16:42:34 +0000 (-0500)
Subject: ALSA: hda: STAC_DELL_M6 EAPD
X-Git-Tag: v2.6.28-rc7~50^2~1^2~2
X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=0253fdcd8aec2f954c2950a7454c0a2f3207e9a1

ALSA: hda: STAC_DELL_M6 EAPD

Add support for EAPD on system suspend and disabling EAPD on headphone jack
detection for STAC_DELL_M6 laptops.

This patch fixes the regressions, the silent output on HP of some Dell
laptops (see Novell bnc#446025):
	https://bugzilla.novell.com/show_bug.cgi?id=446025

Signed-off-by: Matthew Ranostay <mranostay at embeddedalley.com>
Signed-off-by: Takashi Iwai <tiwai at suse.de>
---

diff --git a/sound/pci/hda/patch_sigmatel.c b/sound/pci/hda/patch_sigmatel.c
index 9563b5b..31a234a 100644
--- a/sound/pci/hda/patch_sigmatel.c
+++ b/sound/pci/hda/patch_sigmatel.c
@@ -137,6 +137,7 @@ struct sigmatel_spec {
 	unsigned int num_mixers;
 
 	int board_config;
+	unsigned int eapd_switch: 1;
 	unsigned int surr_switch: 1;
 	unsigned int line_switch: 1;
 	unsigned int mic_switch: 1;
@@ -3901,7 +3902,7 @@ static void stac92xx_hp_detect(struct hda_codec *codec, unsigned int res)
 		for (i = 0; i < cfg->speaker_outs; i++)
 			stac92xx_reset_pinctl(codec, cfg->speaker_pins[i],
 						AC_PINCTL_OUT_EN);
-		if (spec->eapd_mask)
+		if (spec->eapd_mask && spec->eapd_switch)
 			stac_gpio_set(codec, spec->gpio_mask,
 				spec->gpio_dir, spec->gpio_data &
 				~spec->eapd_mask);
@@ -3916,7 +3917,7 @@ static void stac92xx_hp_detect(struct hda_codec *codec, unsigned int res)
 		for (i = 0; i < cfg->speaker_outs; i++)
 			stac92xx_set_pinctl(codec, cfg->speaker_pins[i],
 						AC_PINCTL_OUT_EN);
-		if (spec->eapd_mask)
+		if (spec->eapd_mask && spec->eapd_switch)
 			stac_gpio_set(codec, spec->gpio_mask,
 				spec->gpio_dir, spec->gpio_data |
 				spec->eapd_mask);
@@ -4243,6 +4244,7 @@ again:
 		spec->num_smuxes = 0;
 		spec->mixer = &stac92hd73xx_6ch_mixer[DELL_M6_MIXER];
 		spec->amp_nids = &stac92hd73xx_amp_nids[DELL_M6_AMP];
+		spec->eapd_switch = 0;
 		spec->num_amps = 1;
 
 		if (!spec->init)
@@ -4274,6 +4276,7 @@ again:
 	default:
 		spec->num_dmics = STAC92HD73XX_NUM_DMICS;
 		spec->num_smuxes = ARRAY_SIZE(stac92hd73xx_smux_nids);
+		spec->eapd_switch = 1;
 	}
 	if (spec->board_config > STAC_92HD73XX_REF) {
 		/* GPIO0 High = Enable EAPD */
@@ -4419,7 +4422,13 @@ static int stac92hd71xx_resume(struct hda_codec *codec)
 
 static int stac92hd71xx_suspend(struct hda_codec *codec, pm_message_t state)
 {
+	struct sigmatel_spec *spec = codec->spec;
+
 	stac92hd71xx_set_power_state(codec, AC_PWRST_D3);
+	if (spec->eapd_mask)
+		stac_gpio_set(codec, spec->gpio_mask,
+				spec->gpio_dir, spec->gpio_data &
+				~spec->eapd_mask);
 	return 0;
 };
 
@@ -4806,6 +4815,7 @@ static int patch_stac927x(struct hda_codec *codec)
 	spec->num_pwrs = 0;
 	spec->aloopback_mask = 0x40;
 	spec->aloopback_shift = 0;
+	spec->eapd_switch = 1;
 
 	err = stac92xx_parse_auto_config(codec, 0x1e, 0x20);
 	if (!err) {
@@ -4886,6 +4896,7 @@ static int patch_stac9205(struct hda_codec *codec)
 
 	spec->aloopback_mask = 0x40;
 	spec->aloopback_shift = 0;
+	spec->eapd_switch = 1;
 	spec->multiout.dac_nids = spec->dac_nids;
 	
 	switch (spec->board_config){


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/kernel.spec,v
retrieving revision 1.1201
retrieving revision 1.1202
diff -u -r1.1201 -r1.1202
--- kernel.spec	18 Dec 2008 22:13:53 -0000	1.1201
+++ kernel.spec	22 Dec 2008 20:10:57 -0000	1.1202
@@ -633,8 +633,11 @@
 Patch414: linux-2.6.27.9-alsa-hda-mark-dell-studio-1535-quirk.patch
 Patch415: linux-2.6-alsa-backport-beep-switch.patch
 Patch416: linux-2.6-defaults-alsa-hda-beep-off.patch
+Patch417: linux-2.6-alsa-hda-stac-dell-m6-eapd.patch
+Patch418: linux-2.6-alsa-hda-revert-remove-unneeded-hp-nid-references.patch
+Patch419: linux-2.6-alsa-hda-remove-broken-headphone-control-for-dell-laptops.patch
 
-Patch420: linux-2.6-squashfs.patch
+Patch429: linux-2.6-squashfs.patch
 Patch430: linux-2.6-net-silence-noisy-printks.patch
 Patch450: linux-2.6-input-kill-stupid-messages.patch
 Patch452: linux-2.6.27-hwmon-applesmc-2.6.28.patch
@@ -1221,6 +1224,9 @@
 ApplyPatch linux-2.6.27.9-alsa-hda-mark-dell-studio-1535-quirk.patch
 ApplyPatch linux-2.6-alsa-backport-beep-switch.patch
 ApplyPatch linux-2.6-defaults-alsa-hda-beep-off.patch
+ApplyPatch linux-2.6-alsa-hda-stac-dell-m6-eapd.patch
+ApplyPatch linux-2.6-alsa-hda-revert-remove-unneeded-hp-nid-references.patch
+ApplyPatch linux-2.6-alsa-hda-remove-broken-headphone-control-for-dell-laptops.patch
 
 # Filesystem patches.
 # Squashfs
@@ -1926,6 +1932,9 @@
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
+* Mon Dec 22 2008 Chuck Ebbert <cebbert at redhat.com> 2.6.27.10-166
+- Hopefully fix broken headphone output on some Dell notebooks.
+
 * Fri Dec 19 2008 Chuck Ebbert <cebbert at redhat.com> 2.6.27.10-165
 - Linux 2.6.27.10
   Dropped patches:


