Patchwork [Maverick] (pre-stable) ALSA: HDA: Enable internal speaker on Dell M101z

login
register
mail settings
Submitter David Henningsson
Date Sept. 16, 2010, 8 a.m.
Message ID <4C91CEA1.3050705@canonical.com>
Download mbox | patch
Permalink /patch/64947/
State Accepted
Delegated to: Leann Ogasawara
Headers show

Comments

David Henningsson - Sept. 16, 2010, 8 a.m.
BugLink: http://launchpad.net/bugs/640254

In some cases a magic processing coefficient is needed to enable
the internal speaker on Dell M101z. According to Realtek, this
processing coefficient is only present on ALC269vb.

Btw, this time I have checked - it applies cleanly to the 
ubuntu-maverick git tree. :-)

Signed-off-by: David Henningsson <david.henningsson@canonical.com>
Leann Ogasawara - Sept. 16, 2010, 5:28 p.m.
On Thu, 2010-09-16 at 10:00 +0200, David Henningsson wrote:
> BugLink: http://launchpad.net/bugs/640254
> 
> In some cases a magic processing coefficient is needed to enable
> the internal speaker on Dell M101z. According to Realtek, this
> processing coefficient is only present on ALC269vb.
> 
> Btw, this time I have checked - it applies cleanly to the 
> ubuntu-maverick git tree. :-)
> 
> Signed-off-by: David Henningsson <david.henningsson@canonical.com>

Looks good to me.  Also looks to be in Takashi's tree and Cc'd to
stable:

http://git.kernel.org/?p=linux/kernel/git/tiwai/sound-2.6.git;a=commit;h=145a902bfeb1f89a41165bd2d1e633ce070bcb73

As we're now currently in Kernel Freeze for Maverick we now have to
abide by the Kernel SRU policy [1].  Care to add the SRU Justification
to the bug?  We also need 2 additional Ack's before applying.  Here's
mine.

Acked-by: Leann Ogasawara <leann.ogasawara@canonical.com>

This might have the possibility of making it for Maverick's final
release should the kernel require uploading for a release critical bug
fix.  Otherwise, it'll have to wait for one of the first post-release
SRU's.

Thanks,
Leann

[1] https://wiki.ubuntu.com/KernelTeam/KernelUpdates
David Henningsson - Sept. 17, 2010, 9:38 a.m.
On 2010-09-16 19:28, Leann Ogasawara wrote:
> On Thu, 2010-09-16 at 10:00 +0200, David Henningsson wrote:
>> BugLink: http://launchpad.net/bugs/640254
>>
>> In some cases a magic processing coefficient is needed to enable
>> the internal speaker on Dell M101z. According to Realtek, this
>> processing coefficient is only present on ALC269vb.
>>
>> Btw, this time I have checked - it applies cleanly to the
>> ubuntu-maverick git tree. :-)
>>
>> Signed-off-by: David Henningsson<david.henningsson@canonical.com>
>
> Looks good to me.  Also looks to be in Takashi's tree and Cc'd to
> stable:
>
> http://git.kernel.org/?p=linux/kernel/git/tiwai/sound-2.6.git;a=commit;h=145a902bfeb1f89a41165bd2d1e633ce070bcb73
>
> As we're now currently in Kernel Freeze for Maverick we now have to
> abide by the Kernel SRU policy [1].

Oh, just when you thought you had learned the rules, the rules change...:-(
In addition, I thought I would get away as long as it was Thursday 
anywhere in the world. Looks like I was wrong.

> Care to add the SRU Justification
> to the bug?

I'm unsure whether it can be SRU justified. "Simple, obvious and short 
fixes or hardware enablement patches as long as the next release has not 
reached beta status." It is a simple hardware enablement patch, but what 
does "the next release" refer to here, Maverick or Natty?

> We also need 2 additional Ack's before applying.  Here's
> mine.
>
> Acked-by: Leann Ogasawara<leann.ogasawara@canonical.com>
>
> This might have the possibility of making it for Maverick's final
> release should the kernel require uploading for a release critical bug
> fix.  Otherwise, it'll have to wait for one of the first post-release
> SRU's.

Anyway, as it has been applied upstream and cc:ed to stable, perhaps we 
should just let it wait for either the first SRU, or the upstream 
stable, whatever happens first.
Leann Ogasawara - Sept. 17, 2010, 2:50 p.m.
On Fri, 2010-09-17 at 11:38 +0200, David Henningsson wrote:
> On 2010-09-16 19:28, Leann Ogasawara wrote:
> > On Thu, 2010-09-16 at 10:00 +0200, David Henningsson wrote:
> >> BugLink: http://launchpad.net/bugs/640254
> >>
> >> In some cases a magic processing coefficient is needed to enable
> >> the internal speaker on Dell M101z. According to Realtek, this
> >> processing coefficient is only present on ALC269vb.
> >>
> >> Btw, this time I have checked - it applies cleanly to the
> >> ubuntu-maverick git tree. :-)
> >>
> >> Signed-off-by: David Henningsson<david.henningsson@canonical.com>
> >
> > Looks good to me.  Also looks to be in Takashi's tree and Cc'd to
> > stable:
> >
> > http://git.kernel.org/?p=linux/kernel/git/tiwai/sound-2.6.git;a=commit;h=145a902bfeb1f89a41165bd2d1e633ce070bcb73
> >
> > As we're now currently in Kernel Freeze for Maverick we now have to
> > abide by the Kernel SRU policy [1].
> 
> Oh, just when you thought you had learned the rules, the rules change...:-(

This is usually the last step in terms of process for a development
cycle, so now you'll be well prepared for Natty :)

> In addition, I thought I would get away as long as it was Thursday 
> anywhere in the world. Looks like I was wrong.

The release team has the final call and we were originally informed the
archive would freeze at 00:00 UTC Thursday.  It actually ended up being
17:00 UTC on Thursday.

> > Care to add the SRU Justification
> > to the bug?
> 
> I'm unsure whether it can be SRU justified. "Simple, obvious and short 
> fixes or hardware enablement patches as long as the next release has not 
> reached beta status." It is a simple hardware enablement patch, but what 
> does "the next release" refer to here, Maverick or Natty?

In this case it would refer to Natty.  But honestly, there are always
exceptions and if there's proper justification for the patch to be
applied to multiple previous releases, that can be considered on a case
by case basis.

> > We also need 2 additional Ack's before applying.  Here's
> > mine.
> >
> > Acked-by: Leann Ogasawara<leann.ogasawara@canonical.com>
> >
> > This might have the possibility of making it for Maverick's final
> > release should the kernel require uploading for a release critical bug
> > fix.  Otherwise, it'll have to wait for one of the first post-release
> > SRU's.
> 
> Anyway, as it has been applied upstream and cc:ed to stable, perhaps we 
> should just let it wait for either the first SRU, or the upstream 
> stable, whatever happens first.

The easiest approach for us would be to wait for this to come in through
upstream stable.  If there is some urgency for this fix to be applied
sooner, then we can apply it as "pre-stable".  Just let us know.

Thanks,
Leann
Leann Ogasawara - Sept. 17, 2010, 9:32 p.m.
We're needing to do a last minute Maverick kernel upload to resolve some
release critical bugs.  I've gotten approval to also include this fix.
Applied to Maverick linux master.

Thanks,
Leann

On Thu, 2010-09-16 at 10:00 +0200, David Henningsson wrote:
> BugLink: http://launchpad.net/bugs/640254
> 
> In some cases a magic processing coefficient is needed to enable
> the internal speaker on Dell M101z. According to Realtek, this
> processing coefficient is only present on ALC269vb.
> 
> Btw, this time I have checked - it applies cleanly to the 
> ubuntu-maverick git tree. :-)
> 
> Signed-off-by: David Henningsson <david.henningsson@canonical.com>
>

Patch

From 84f60416d189f1f2634bd4171318fe1809e193c3 Mon Sep 17 00:00:00 2001
From: David Henningsson <david.henningsson@canonical.com>
Date: Thu, 16 Sep 2010 09:27:09 +0200
Subject: [PATCH] ALSA: HDA: Enable internal speaker on Dell M101z

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

In some cases a magic processing coefficient is needed to enable
the internal speaker on Dell M101z. According to Realtek, this
processing coefficient is only present on ALC269vb.

Signed-off-by: David Henningsson <david.henningsson@canonical.com>
---
 sound/pci/hda/patch_realtek.c |   11 +++++++++++
 1 files changed, 11 insertions(+), 0 deletions(-)

diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c
index 2b9c889..eddd80d 100644
--- a/sound/pci/hda/patch_realtek.c
+++ b/sound/pci/hda/patch_realtek.c
@@ -14230,6 +14230,7 @@  static void alc269_auto_init(struct hda_codec *codec)
 
 enum {
 	ALC269_FIXUP_SONY_VAIO,
+	ALC269_FIXUP_DELL_M101Z,
 };
 
 static const struct hda_verb alc269_sony_vaio_fixup_verbs[] = {
@@ -14237,15 +14238,25 @@  static const struct hda_verb alc269_sony_vaio_fixup_verbs[] = {
 	{}
 };
 
+static const struct hda_verb alc269_dell_m101z_fixup_verbs[] = {
+	{0x20, AC_VERB_SET_COEF_INDEX, 13},
+	{0x20, AC_VERB_SET_PROC_COEF, 0x4040}, /* Enables internal speaker */
+	{}
+};
+
 static const struct alc_fixup alc269_fixups[] = {
 	[ALC269_FIXUP_SONY_VAIO] = {
 		.verbs = alc269_sony_vaio_fixup_verbs
 	},
+	[ALC269_FIXUP_DELL_M101Z] = {
+		.verbs = alc269_dell_m101z_fixup_verbs
+	},
 };
 
 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(0x1028, 0x0470, "Dell M101z", ALC269_FIXUP_DELL_M101Z),
 	{}
 };
 
-- 
1.7.1