[PATCH] hda: use amp capabilities from afg if amp override not set

[PATCH] hda: use amp capabilities from afg if amp override not set

[Matt]

Some HDA codec nodes contain an amp, but do not provide local amp
capabilities.  In these cases, AC_WCAP_AMP_OVRD is not set so we
should query the AFG nid in order to get the general amp capabilities.

Index: alsa-kernel/pci/hda/hda_codec.c
===================================================================
RCS file: /cvsroot/alsa/alsa-kernel/pci/hda/hda_codec.c,v
retrieving revision 1.8
diff -u -r1.8 hda_codec.c
--- alsa-kernel/pci/hda/hda_codec.c	18 Mar 2005 16:21:56 -0000	1.8
+++ alsa-kernel/pci/hda/hda_codec.c	21 Mar 2005 00:20:40 -0000
@@ -611,6 +611,8 @@
 	if (! info)
 		return 0;
 	if (! (info->status & INFO_AMP_CAPS)) {
+		if (!(snd_hda_param_read(codec, nid, AC_PAR_AUDIO_WIDGET_CAP) & AC_WCAP_AMP_OVRD))
+			nid = codec->afg;
 		info->amp_caps = snd_hda_param_read(codec, nid, direction == HDA_OUTPUT ?
 						    AC_PAR_AMP_OUT_CAP : AC_PAR_AMP_IN_CAP);
 		info->status |= INFO_AMP_CAPS;


-------------------------------------------------------
SF email is sponsored by - The IT Product Guide
Read honest & candid reviews on hundreds of IT Products from real users.
Discover which products truly live up to the hype. Start reading now.
http://ads.osdn.com/?ad_id=6595&alloc_id=14396&op=click

Re: [PATCH] hda: use amp capabilities from afg if amp override not set

[Takashi Iwai]

At Sun, 20 Mar 2005 17:36:05 -0700,
Matt wrote:
> 
> Some HDA codec nodes contain an amp, but do not provide local amp
> capabilities.  In these cases, AC_WCAP_AMP_OVRD is not set so we
> should query the AFG nid in order to get the general amp capabilities.

Thanks, applied to CVS now.

At the next time, could you provide "signed-off-by" line, too, to
include your credit properly in changelog?


Takashi


-------------------------------------------------------
SF email is sponsored by - The IT Product Guide
Read honest & candid reviews on hundreds of IT Products from real users.
Discover which products truly live up to the hype. Start reading now.
http://ads.osdn.com/?ad_id=6595&alloc_id=14396&op=click

Re: [PATCH] hda: use amp capabilities from afg if amp override not set

[Matt]

On Mon, Mar 21, 2005 at 08:42:50PM +0100, Takashi Iwai wrote:
> At Sun, 20 Mar 2005 17:36:05 -0700,
> Matt wrote:
> > 
> > Some HDA codec nodes contain an amp, but do not provide local amp
> > capabilities.  In these cases, AC_WCAP_AMP_OVRD is not set so we
> > should query the AFG nid in order to get the general amp capabilities.
> 
> Thanks, applied to CVS now.
> 
> At the next time, could you provide "signed-off-by" line, too, to
> include your credit properly in changelog?

Will do. Sorry, I forgot that this time.

Thanks,
Matt


-------------------------------------------------------
SF email is sponsored by - The IT Product Guide
Read honest & candid reviews on hundreds of IT Products from real users.
Discover which products truly live up to the hype. Start reading now.
http://ads.osdn.com/?ad_id=6595&alloc_id=14396&op=click