Patchwork Please pull from git://kernel.ubuntu.com/dtchen/ubuntu-karmic.git lp449742

login
register
mail settings
Submitter Daniel Chen
Date Oct. 12, 2009, 7:12 p.m.
Message ID <alpine.DEB.2.00.0910121507510.5302@errno>
Download mbox | patch
Permalink /patch/35811/
State Accepted
Headers show

Comments

Daniel Chen - Oct. 12, 2009, 7:12 p.m.
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA512

As the subject requests, I've added two fixes from 2.6.32 to enable 
playback and capture by default for some HP dv models. Please apply.

Thanks,
Dan
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)

iD8DBQFK03+Ge9GwFciKvaMRCsynAJ9SiOeknLgbeBj0eFKQMjsXscDYXwCfZ9sU
orQVvVrrTDhdgGZ+D55ou8A=
=Y1Bu
-----END PGP SIGNATURE-----
Tim Gardner - Oct. 12, 2009, 7:31 p.m.
Daniel T Chen wrote:
> As the subject requests, I've added two fixes from 2.6.32 to enable
> playback and capture by default for some HP dv models. Please apply.
> 
> Thanks,
> Dan

Why not cherry-pick 1972d02504b142a6f1442bd987a8831146031d3d and
6e34c033210bb86b3f5f45fd6497f74150bdf620 ?

rtg
Daniel Chen - Oct. 12, 2009, 7:44 p.m.
On Mon, Oct 12, 2009 at 3:31 PM, Tim Gardner <tim.gardner@canonical.com> wrote:
> Why not cherry-pick 1972d02504b142a6f1442bd987a8831146031d3d and
> 6e34c033210bb86b3f5f45fd6497f74150bdf620 ?

Cherry-picking those two would work, too. Unfortunately more
infrastructure changes are necessary to actually get the jack-sensing
to work (hence the strong consideration for backporting a stable daily
alsa-driver snapshot into l-b-m-2.6.31), as Andrew M's and Jamie S's
bugs can attest.
Tim Gardner - Oct. 12, 2009, 8:13 p.m.
Daniel Chen wrote:
> On Mon, Oct 12, 2009 at 3:31 PM, Tim Gardner <tim.gardner@canonical.com> wrote:
>> Why not cherry-pick 1972d02504b142a6f1442bd987a8831146031d3d and
>> 6e34c033210bb86b3f5f45fd6497f74150bdf620 ?
> 
> Cherry-picking those two would work, too. Unfortunately more
> infrastructure changes are necessary to actually get the jack-sensing
> to work (hence the strong consideration for backporting a stable daily
> alsa-driver snapshot into l-b-m-2.6.31), as Andrew M's and Jamie S's
> bugs can attest.

Funny you should mention that as I was just working on a sound backport,
though I was starting from a repo that Luis Rodriguez mentioned to me:
git://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/compat-sound-2.6.git

Are you referring to
ftp://ftp.alsa-project.org/pub/driver/alsa-driver-1.0.21.tar.bz2 ? Would
I be better off starting from there?

rtg
Daniel Chen - Oct. 12, 2009, 8:29 p.m.
On Mon, Oct 12, 2009 at 4:13 PM, Tim Gardner <tim.gardner@canonical.com> wrote:
> Are you referring to
> ftp://ftp.alsa-project.org/pub/driver/alsa-driver-1.0.21.tar.bz2 ? Would
> I be better off starting from there?

http://kernel.org/pub/linux/kernel/people/tiwai/snapshot/alsa-driver-snapshot.tar.bz2
would be better.
Tim Gardner - Oct. 13, 2009, 1:16 a.m.
Daniel Chen wrote:
> On Mon, Oct 12, 2009 at 3:31 PM, Tim Gardner <tim.gardner@canonical.com> wrote:
>> Why not cherry-pick 1972d02504b142a6f1442bd987a8831146031d3d and
>> 6e34c033210bb86b3f5f45fd6497f74150bdf620 ?
> 
> Cherry-picking those two would work, too. Unfortunately more
> infrastructure changes are necessary to actually get the jack-sensing
> to work (hence the strong consideration for backporting a stable daily
> alsa-driver snapshot into l-b-m-2.6.31), as Andrew M's and Jamie S's
> bugs can attest.

Applied:

http://kernel.ubuntu.com/git?p=ubuntu/ubuntu-karmic.git;a=commit;h=a28ed1474f6c91ebaa219ed8a10fd0d113c53236
http://kernel.ubuntu.com/git?p=ubuntu/ubuntu-karmic.git;a=commit;h=badaa993000e73128eb7657df68a50e955b40211

Also working on LBM alsa-drivers snapshot.

rtg

Patch

From e98cf2265b02a338096bd0a16e555f83fb217d86 Mon Sep 17 00:00:00 2001
From: Daniel T Chen <crimsun@ubuntu.com>
Date: Mon, 12 Oct 2009 14:50:42 -0400
Subject: [PATCH] ALSA: hda - Add quirk masks for HP dv models

BugLink: http://bugs.launchpad.net/bugs/449742

Backport quirk masks for HP dv models from 2.6.32. This allows at least
playback and recording to be usable by default in Karmic.

Signed-off-by: Daniel T Chen <crimsun@ubuntu.com>
---

 sound/pci/hda/patch_sigmatel.c |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/sound/pci/hda/patch_sigmatel.c b/sound/pci/hda/patch_sigmatel.c

index b1b1ebd..2f19ac2 100644

--- a/sound/pci/hda/patch_sigmatel.c

+++ b/sound/pci/hda/patch_sigmatel.c

@@ -1927,6 +1927,10 @@  static struct snd_pci_quirk stac92hd71bxx_cfg_tbl[] = {

 		      "HP mini 1000", STAC_HP_M4),
 	SND_PCI_QUIRK(PCI_VENDOR_ID_HP, 0x361b,
 		      "HP HDX", STAC_HP_HDX),  /* HDX16 */
+	SND_PCI_QUIRK_MASK(PCI_VENDOR_ID_HP, 0xfff0, 0x3620,

+		      "HP dv6", STAC_HP_DV5),

+	SND_PCI_QUIRK_MASK(PCI_VENDOR_ID_HP, 0xfff0, 0x7010,

+		      "HP", STAC_HP_DV5),

 	SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x0233,
 				"unknown Dell", STAC_DELL_M4_1),
 	SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x0234,
-- 

1.6.3.3