[PATCH 1/3] ALSA: HDA: Create mixers on ALC887

[PATCH 1/3] ALSA: HDA: Create mixers on ALC887

[David Henningsson]

[-- Attachment #1: Type: text/plain, Size: 381 bytes --]

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

ALC887 does not have any volume control ability on the mixer NIDs,
so put the volume controls on the dac NIDs instead. Without this
patch, ALC887 users cannot use alsamixer at all.

Cc: stable@kernel.org
Signed-off-by: David Henningsson <david.henningsson@canonical.com>

-- 
David Henningsson, Canonical Ltd.
http://launchpad.net/~diwic

[-- Attachment #2: 0001-Create-mixers-on-ALC887.patch --]
[-- Type: text/x-patch, Size: 2186 bytes --]

>From 2418add610811b5763d96f8811ad5d303516bfa3 Mon Sep 17 00:00:00 2001
From: David Henningsson <david.henningsson@canonical.com>
Date: Tue, 9 Nov 2010 14:35:30 +0100
Subject: [PATCH 1/3] ALSA: HDA: Create mixers on ALC887

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

ALC887 does not have any volume control ability on the mixer NIDs, 
so put the volume controls on the dac NIDs instead. Without this 
patch, ALC887 users cannot use alsamixer at all.

Cc: stable@kernel.org
Signed-off-by: David Henningsson <david.henningsson@canonical.com>
---
 sound/pci/hda/patch_realtek.c |   10 ++++++++--
 1 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c
index 788ac4b..ce4017e 100644
--- a/sound/pci/hda/patch_realtek.c
+++ b/sound/pci/hda/patch_realtek.c
@@ -10816,6 +10816,9 @@ static int alc_auto_add_mic_boost(struct hda_codec *codec)
 	return 0;
 }
 
+static int alc861vd_auto_create_multi_out_ctls(struct alc_spec *spec,
+					     const struct auto_pin_cfg *cfg);
+
 /* almost identical with ALC880 parser... */
 static int alc882_parse_auto_config(struct hda_codec *codec)
 {
@@ -10833,7 +10836,10 @@ static int alc882_parse_auto_config(struct hda_codec *codec)
 	err = alc880_auto_fill_dac_nids(spec, &spec->autocfg);
 	if (err < 0)
 		return err;
-	err = alc880_auto_create_multi_out_ctls(spec, &spec->autocfg);
+	if (codec->vendor_id == 0x10ec0887)
+		err = alc861vd_auto_create_multi_out_ctls(spec, &spec->autocfg);
+	else
+		err = alc880_auto_create_multi_out_ctls(spec, &spec->autocfg);
 	if (err < 0)
 		return err;
 	err = alc880_auto_create_extra_out(spec, spec->autocfg.hp_pins[0],
@@ -16955,7 +16961,7 @@ static void alc861vd_auto_init_analog_input(struct hda_codec *codec)
 #define alc861vd_idx_to_mixer_switch(nid)	((nid) + 0x0c)
 
 /* add playback controls from the parsed DAC table */
-/* Based on ALC880 version. But ALC861VD has separate,
+/* Based on ALC880 version. But ALC861VD and ALC887 have separate,
  * different NIDs for mute/unmute switch and volume control */
 static int alc861vd_auto_create_multi_out_ctls(struct alc_spec *spec,
 					     const struct auto_pin_cfg *cfg)
-- 
1.7.1


[-- Attachment #3: Type: text/plain, Size: 160 bytes --]

_______________________________________________
Alsa-devel mailing list
Alsa-devel@alsa-project.org
http://mailman.alsa-project.org/mailman/listinfo/alsa-devel

Re: [PATCH 1/3] ALSA: HDA: Create mixers on ALC887

[Takashi Iwai]

At Fri, 19 Nov 2010 10:28:35 +0100,
David Henningsson wrote:
> 
> [1  <text/plain; ISO-8859-1 (7bit)>]
> BugLink: http://launchpad.net/bugs/669092
> 
> ALC887 does not have any volume control ability on the mixer NIDs,
> so put the volume controls on the dac NIDs instead. Without this
> patch, ALC887 users cannot use alsamixer at all.
> 
> Cc: stable@kernel.org
> Signed-off-by: David Henningsson <david.henningsson@canonical.com>

OK, this one seems necessary independently from other patches,
so I applied this one now for 2.6.37.


thanks,

Takashi

> 
> -- 
> David Henningsson, Canonical Ltd.
> http://launchpad.net/~diwic
> [2 0001-Create-mixers-on-ALC887.patch <text/x-patch (7bit)>]
> >From 2418add610811b5763d96f8811ad5d303516bfa3 Mon Sep 17 00:00:00 2001
> From: David Henningsson <david.henningsson@canonical.com>
> Date: Tue, 9 Nov 2010 14:35:30 +0100
> Subject: [PATCH 1/3] ALSA: HDA: Create mixers on ALC887
> 
> BugLink: http://launchpad.net/bugs/669092
> 
> ALC887 does not have any volume control ability on the mixer NIDs, 
> so put the volume controls on the dac NIDs instead. Without this 
> patch, ALC887 users cannot use alsamixer at all.
> 
> Cc: stable@kernel.org
> Signed-off-by: David Henningsson <david.henningsson@canonical.com>
> ---
>  sound/pci/hda/patch_realtek.c |   10 ++++++++--
>  1 files changed, 8 insertions(+), 2 deletions(-)
> 
> diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c
> index 788ac4b..ce4017e 100644
> --- a/sound/pci/hda/patch_realtek.c
> +++ b/sound/pci/hda/patch_realtek.c
> @@ -10816,6 +10816,9 @@ static int alc_auto_add_mic_boost(struct hda_codec *codec)
>  	return 0;
>  }
>  
> +static int alc861vd_auto_create_multi_out_ctls(struct alc_spec *spec,
> +					     const struct auto_pin_cfg *cfg);
> +
>  /* almost identical with ALC880 parser... */
>  static int alc882_parse_auto_config(struct hda_codec *codec)
>  {
> @@ -10833,7 +10836,10 @@ static int alc882_parse_auto_config(struct hda_codec *codec)
>  	err = alc880_auto_fill_dac_nids(spec, &spec->autocfg);
>  	if (err < 0)
>  		return err;
> -	err = alc880_auto_create_multi_out_ctls(spec, &spec->autocfg);
> +	if (codec->vendor_id == 0x10ec0887)
> +		err = alc861vd_auto_create_multi_out_ctls(spec, &spec->autocfg);
> +	else
> +		err = alc880_auto_create_multi_out_ctls(spec, &spec->autocfg);
>  	if (err < 0)
>  		return err;
>  	err = alc880_auto_create_extra_out(spec, spec->autocfg.hp_pins[0],
> @@ -16955,7 +16961,7 @@ static void alc861vd_auto_init_analog_input(struct hda_codec *codec)
>  #define alc861vd_idx_to_mixer_switch(nid)	((nid) + 0x0c)
>  
>  /* add playback controls from the parsed DAC table */
> -/* Based on ALC880 version. But ALC861VD has separate,
> +/* Based on ALC880 version. But ALC861VD and ALC887 have separate,
>   * different NIDs for mute/unmute switch and volume control */
>  static int alc861vd_auto_create_multi_out_ctls(struct alc_spec *spec,
>  					     const struct auto_pin_cfg *cfg)
> -- 
> 1.7.1
> 

Re: [PATCH 1/3] ALSA: HDA: Create mixers on ALC887

[Takashi Iwai]

At Mon, 22 Nov 2010 07:52:23 +0100,
Takashi Iwai wrote:
> 
> At Fri, 19 Nov 2010 10:28:35 +0100,
> David Henningsson wrote:
> > 
> > BugLink: http://launchpad.net/bugs/669092
> > 
> > ALC887 does not have any volume control ability on the mixer NIDs,
> > so put the volume controls on the dac NIDs instead. Without this
> > patch, ALC887 users cannot use alsamixer at all.
> > 
> > Cc: stable@kernel.org
> > Signed-off-by: David Henningsson <david.henningsson@canonical.com>
> 
> OK, this one seems necessary independently from other patches,
> so I applied this one now for 2.6.37.

Now I got a feedback from Realtek that it's actually a typo, calling
patch_alc882() wrongly for ALC887* variants.

The right fix patch is below.  So I reverted your patch.


thanks,

Takashi

===
>From 01e0f1378c47947b825eac05c98697ab1be1c86f Mon Sep 17 00:00:00 2001
From: Kailang Yang <kailang@realtek.com>
Date: Mon, 22 Nov 2010 10:59:36 +0100
Subject: [PATCH] ALSA: hda - Fixed ALC887-VD initial error

ALC887-VD is like ALC888-VD. It can not be initialized as ALC882.

Signed-off-by: Kailang Yang <kailang@realtek.com>
Cc: <stable@kernel.org>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
---
 sound/pci/hda/patch_realtek.c |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c
index 1a7703a..564e6c1 100644
--- a/sound/pci/hda/patch_realtek.c
+++ b/sound/pci/hda/patch_realtek.c
@@ -19420,7 +19420,10 @@ static int patch_alc888(struct hda_codec *codec)
 {
 	if ((alc_read_coef_idx(codec, 0) & 0x00f0)==0x0030){
 		kfree(codec->chip_name);
-		codec->chip_name = kstrdup("ALC888-VD", GFP_KERNEL);
+		if (codec->vendor_id == 0x10ec0887)
+			codec->chip_name = kstrdup("ALC887-VD", GFP_KERNEL);
+		else
+			codec->chip_name = kstrdup("ALC888-VD", GFP_KERNEL);
 		if (!codec->chip_name) {
 			alc_free(codec);
 			return -ENOMEM;
@@ -19910,7 +19913,7 @@ static struct hda_codec_preset snd_hda_preset_realtek[] = {
 	{ .id = 0x10ec0885, .rev = 0x100103, .name = "ALC889A",
 	  .patch = patch_alc882 },
 	{ .id = 0x10ec0885, .name = "ALC885", .patch = patch_alc882 },
-	{ .id = 0x10ec0887, .name = "ALC887", .patch = patch_alc882 },
+	{ .id = 0x10ec0887, .name = "ALC887", .patch = patch_alc888 },
 	{ .id = 0x10ec0888, .rev = 0x100101, .name = "ALC1200",
 	  .patch = patch_alc882 },
 	{ .id = 0x10ec0888, .name = "ALC888", .patch = patch_alc888 },
-- 
1.7.3.1