Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a9995a35 authored by Takashi Iwai's avatar Takashi Iwai Committed by Jaroslav Kysela
Browse files

[ALSA] hda-intel - Fix codec probe with ATI contorllers 



ATI controllers may have up to 4 codecs while ICH up to 3.
Thus the earlier fix to change AZX_MAX_CODECS to 3 cause a regression
on some devices that have the audio codec at bit#3.
Now max codecs is defined according to the driver type, either 3 or 4.
Currently 4 is set only to ATI chips.  Other might need the same
change, too.

Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
Signed-off-by: default avatarJaroslav Kysela <perex@suse.cz>
parent a64c8cd6

sound/pci/hda/hda_intel.c

+11 −2
Original line number Diff line number Diff line
@@ -199,7 +199,6 @@ enum { SDI0, SDI1, SDI2, SDI3, SDO0, SDO1, SDO2, SDO3 }; 


/* STATESTS int mask: SD2,SD1,SD0 */

#define STATESTS_INT_MASK	0x07

#define AZX_MAX_CODECS		3



/* SD_CTL bits */

#define SD_CTL_STREAM_RESET	0x01	/* stream reset bit */
@@ -966,6 +965,16 @@ static int azx_setup_controller(struct azx *chip, struct azx_dev *azx_dev) 
 * Codec initialization

 */



static unsigned int azx_max_codecs[] __devinitdata = {

	[AZX_DRIVER_ICH] = 3,

	[AZX_DRIVER_ATI] = 4,

	[AZX_DRIVER_ATIHDMI] = 4,

	[AZX_DRIVER_VIA] = 3,		/* FIXME: correct? */

	[AZX_DRIVER_SIS] = 3,		/* FIXME: correct? */

	[AZX_DRIVER_ULI] = 3,		/* FIXME: correct? */

	[AZX_DRIVER_NVIDIA] = 3,	/* FIXME: correct? */

};



static int __devinit azx_codec_create(struct azx *chip, const char *model)

{

	struct hda_bus_template bus_temp;
@@ -982,7 +991,7 @@ static int __devinit azx_codec_create(struct azx *chip, const char *model) 
		return err;



	codecs = 0;

	for (c = 0; c < AZX_MAX_CODECS; c++) {

	for (c = 0; c < azx_max_codecs[chip->driver_type]; c++) {

		if ((chip->codec_mask & (1 << c)) & probe_mask) {

			err = snd_hda_codec_new(chip->bus, c, NULL);

			if (err < 0)