From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-kernel-owner@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1756910Ab0JVODt (ORCPT <rfc822;w@1wt.eu>);
	Fri, 22 Oct 2010 10:03:49 -0400
Received: from cantor2.suse.de ([195.135.220.15]:57655 "EHLO mx2.suse.de"
	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
	id S1754117Ab0JVODs (ORCPT <rfc822;linux-kernel@vger.kernel.org>);
	Fri, 22 Oct 2010 10:03:48 -0400
Date: Fri, 22 Oct 2010 16:03:46 +0200
Message-ID: <s5h39ryxr25.wl%tiwai@suse.de>
From: Takashi Iwai <tiwai@suse.de>
To: Clemens Ladisch <clemens@ladisch.de>
Cc: Jiri Slaby <jirislaby@gmail.com>, alsa-devel@alsa-project.org,
        mm-commits@vger.kernel.org, linux-kernel@vger.kernel.org,
        Valdis.Kletnieks@vt.edu, Colin Guthrie <gmane@colin.guthr.ie>,
        akpm@linux-foundation.org
Subject: Re: [alsa-devel] HDA: no sound [was: mmotm 2010-10-20-15-01	uploaded]
In-Reply-To: <4CC17629.6050703@ladisch.de>
References: <201010202233.o9KMXNoL008303@imap1.linux-foundation.org>
	<4CBFEE94.7020103@gmail.com>
	<s5hlj5sc7do.wl%tiwai@suse.de>
	<4CBFF25C.2080908@gmail.com>
	<s5hfww0c6oj.wl%tiwai@suse.de>
	<4CC085F5.9070905@gmail.com>
	<4CC17629.6050703@ladisch.de>
User-Agent: Wanderlust/2.15.6 (Almost Unreal) SEMI/1.14.6 (Maruoka)
 FLIM/1.14.9 (=?UTF-8?B?R29qxY0=?=) APEL/10.7 Emacs/23.1
 (x86_64-suse-linux-gnu) MULE/6.0 (HANACHIRUSATO)
MIME-Version: 1.0 (generated by SEMI 1.14.6 - "Maruoka")
Content-Type: text/plain; charset=US-ASCII
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

At Fri, 22 Oct 2010 13:31:53 +0200,
Clemens Ladisch wrote:
> 
> Jiri Slaby wrote:
> > On 10/21/2010 10:05 AM, Takashi Iwai wrote:
> > >   commit de8c85f7840e5e29629de95f5af24297fb325e0b
> > >     ALSA: HDA: Sigmatel: work around incorrect master muting
> > 
> > Reverting this one helps.
> 
> This one introduced even more wrong volume information on some codecs.
> Pleasy try this patch on top:

Argh!  There is always a reason why we should define a constant.
I applied the fix now.

This explains why the old patch worked on Colin's machine.
His codec chip is different (STAC9200?), and it doesn't go in this
code path but has a static Master volume creation.


thanks,

Takashi

> 
> --- a/sound/pci/hda/patch_sigmatel.c
> +++ b/sound/pci/hda/patch_sigmatel.c
> @@ -32,6 +32,7 @@
>  #include <sound/core.h>
>  #include <sound/asoundef.h>
>  #include <sound/jack.h>
> +#include <sound/tlv.h>
>  #include "hda_codec.h"
>  #include "hda_local.h"
>  #include "hda_beep.h"
> @@ -1145,7 +1146,7 @@ static int stac92xx_build_controls(struct hda_codec *codec)
>  		/* correct volume offset */
>  		vmaster_tlv[2] += vmaster_tlv[3] * spec->volume_offset;
>  		/* minimum value is actually mute */
> -		vmaster_tlv[3] |= 0x1000;
> +		vmaster_tlv[3] |= TLV_DB_SCALE_MUTE;
>  		err = snd_hda_add_vmaster(codec, "Master Playback Volume",
>  					  vmaster_tlv, slave_vols);
>  		if (err < 0)
>