| Message ID | 4CAD8048.2050606@canonical.com |
|---|---|
| State | Accepted |
| Delegated to: | Leann Ogasawara |
| Headers | show |
On Thu, 2010-10-07 at 10:09 +0200, David Henningsson wrote: > BugLink: https://launchpad.net/bugs/655386 > BugLink: https://launchpad.net/bugs/546769 > BugLink: https://launchpad.net/bugs/648871 > BugLink: https://launchpad.net/bugs/642892 > BugLink: https://launchpad.net/bugs/637291 > BugLink: https://launchpad.net/bugs/637291 > BugLink: https://launchpad.net/bugs/598938 > > ...they are very likely to be helped by the following commit, can we > cherry-pick it? It should apply cleanly to Maverick. A Lucid version > will follow shortly. > > commit abdd8f510686da0a58e475bc0143d1069e5f53da > Author: Takashi Iwai <tiwai@suse.de> > Date: Tue Sep 21 17:38:14 2010 +0200 > > ALSA: hda - Apply ALC269 VAIO fix-up to all Sony laptops with ALC269 > > We've applied a fix-up for ALC269 VAIO only for two models. But all > Sony VAIO models with ALC269 codec seem to require the similar fix. > Let's apply it with vendor-id mask. > > Signed-off-by: Takashi Iwai <tiwai@suse.de> > > diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c > index f2a3044..eea88b7 100644 > --- a/sound/pci/hda/patch_realtek.c > +++ b/sound/pci/hda/patch_realtek.c > @@ -14731,8 +14731,7 @@ static const struct alc_fixup alc269_fixups[] = { > }; > > static struct snd_pci_quirk alc269_fixup_tbl[] = { > - SND_PCI_QUIRK(0x104d, 0x9071, "Sony VAIO", ALC269_FIXUP_SONY_VAIO), > - SND_PCI_QUIRK(0x104d, 0x9077, "Sony VAIO", ALC269_FIXUP_SONY_VAIO), > + SND_PCI_QUIRK_VENDOR(0x104d, "Sony VAIO", ALC269_FIXUP_SONY_VAIO), > SND_PCI_QUIRK(0x1028, 0x0470, "Dell M101z", > ALC269_FIXUP_DELL_M101Z), > {} > }; > This doesn't appear to be officially upstream in Linus' tree but does appear to be in Takashi's sound-2.6 tree. The patch itself is small, self-contained, and poses a very low risk of regression. Please do fwd this onto upstream stable once it lands in Linus' tree. Acked-by: Leann Ogasawara <leann.ogasawara@canonical.com> Per the SRU policy, I just need one more Ack for the Maverick version of this patch before I'll apply it. Thanks, Leann
On 10/07/2010 09:09 AM, David Henningsson wrote: > BugLink: https://launchpad.net/bugs/655386 > BugLink: https://launchpad.net/bugs/546769 > BugLink: https://launchpad.net/bugs/648871 > BugLink: https://launchpad.net/bugs/642892 > BugLink: https://launchpad.net/bugs/637291 > BugLink: https://launchpad.net/bugs/637291 > BugLink: https://launchpad.net/bugs/598938 > > ...they are very likely to be helped by the following commit, can we > cherry-pick it? It should apply cleanly to Maverick. A Lucid version > will follow shortly. > > commit abdd8f510686da0a58e475bc0143d1069e5f53da > Author: Takashi Iwai<tiwai@suse.de> > Date: Tue Sep 21 17:38:14 2010 +0200 > > ALSA: hda - Apply ALC269 VAIO fix-up to all Sony laptops with ALC269 > > We've applied a fix-up for ALC269 VAIO only for two models. But all > Sony VAIO models with ALC269 codec seem to require the similar fix. > Let's apply it with vendor-id mask. > > Signed-off-by: Takashi Iwai<tiwai@suse.de> > > diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c > index f2a3044..eea88b7 100644 > --- a/sound/pci/hda/patch_realtek.c > +++ b/sound/pci/hda/patch_realtek.c > @@ -14731,8 +14731,7 @@ static const struct alc_fixup alc269_fixups[] = { > }; > > static struct snd_pci_quirk alc269_fixup_tbl[] = { > - SND_PCI_QUIRK(0x104d, 0x9071, "Sony VAIO", ALC269_FIXUP_SONY_VAIO), > - SND_PCI_QUIRK(0x104d, 0x9077, "Sony VAIO", ALC269_FIXUP_SONY_VAIO), > + SND_PCI_QUIRK_VENDOR(0x104d, "Sony VAIO", ALC269_FIXUP_SONY_VAIO), > SND_PCI_QUIRK(0x1028, 0x0470, "Dell M101z", > ALC269_FIXUP_DELL_M101Z), > {} > }; > > Acked-by: Tim Gardner <tim.gardner@canonical.com>
Applied to Maverick linux master. Thanks, Leann On Thu, 2010-10-07 at 10:09 +0200, David Henningsson wrote: > BugLink: https://launchpad.net/bugs/655386 > BugLink: https://launchpad.net/bugs/546769 > BugLink: https://launchpad.net/bugs/648871 > BugLink: https://launchpad.net/bugs/642892 > BugLink: https://launchpad.net/bugs/637291 > BugLink: https://launchpad.net/bugs/637291 > BugLink: https://launchpad.net/bugs/598938 > > ...they are very likely to be helped by the following commit, can we > cherry-pick it? It should apply cleanly to Maverick. A Lucid version > will follow shortly. > > commit abdd8f510686da0a58e475bc0143d1069e5f53da > Author: Takashi Iwai <tiwai@suse.de> > Date: Tue Sep 21 17:38:14 2010 +0200 > > ALSA: hda - Apply ALC269 VAIO fix-up to all Sony laptops with ALC269 > > We've applied a fix-up for ALC269 VAIO only for two models. But all > Sony VAIO models with ALC269 codec seem to require the similar fix. > Let's apply it with vendor-id mask. > > Signed-off-by: Takashi Iwai <tiwai@suse.de> > > diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c > index f2a3044..eea88b7 100644 > --- a/sound/pci/hda/patch_realtek.c > +++ b/sound/pci/hda/patch_realtek.c > @@ -14731,8 +14731,7 @@ static const struct alc_fixup alc269_fixups[] = { > }; > > static struct snd_pci_quirk alc269_fixup_tbl[] = { > - SND_PCI_QUIRK(0x104d, 0x9071, "Sony VAIO", ALC269_FIXUP_SONY_VAIO), > - SND_PCI_QUIRK(0x104d, 0x9077, "Sony VAIO", ALC269_FIXUP_SONY_VAIO), > + SND_PCI_QUIRK_VENDOR(0x104d, "Sony VAIO", ALC269_FIXUP_SONY_VAIO), > SND_PCI_QUIRK(0x1028, 0x0470, "Dell M101z", > ALC269_FIXUP_DELL_M101Z), > {} > }; > > > -- > David Henningsson, Canonical Ltd. > http://launchpad.net/~diwic >
diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c index f2a3044..eea88b7 100644 --- a/sound/pci/hda/patch_realtek.c +++ b/sound/pci/hda/patch_realtek.c @@ -14731,8 +14731,7 @@ static const struct alc_fixup alc269_fixups[] = { }; static struct snd_pci_quirk alc269_fixup_tbl[] = { - SND_PCI_QUIRK(0x104d, 0x9071, "Sony VAIO", ALC269_FIXUP_SONY_VAIO), - SND_PCI_QUIRK(0x104d, 0x9077, "Sony VAIO", ALC269_FIXUP_SONY_VAIO), + SND_PCI_QUIRK_VENDOR(0x104d, "Sony VAIO", ALC269_FIXUP_SONY_VAIO), SND_PCI_QUIRK(0x1028, 0x0470, "Dell M101z", ALC269_FIXUP_DELL_M101Z), {}
BugLink: https://launchpad.net/bugs/655386 BugLink: https://launchpad.net/bugs/546769 BugLink: https://launchpad.net/bugs/648871 BugLink: https://launchpad.net/bugs/642892 BugLink: https://launchpad.net/bugs/637291 BugLink: https://launchpad.net/bugs/637291 BugLink: https://launchpad.net/bugs/598938 ...they are very likely to be helped by the following commit, can we cherry-pick it? It should apply cleanly to Maverick. A Lucid version will follow shortly. commit abdd8f510686da0a58e475bc0143d1069e5f53da Author: Takashi Iwai <tiwai@suse.de> Date: Tue Sep 21 17:38:14 2010 +0200 ALSA: hda - Apply ALC269 VAIO fix-up to all Sony laptops with ALC269 We've applied a fix-up for ALC269 VAIO only for two models. But all Sony VAIO models with ALC269 codec seem to require the similar fix. Let's apply it with vendor-id mask. Signed-off-by: Takashi Iwai <tiwai@suse.de> };