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

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

[ALSA] ac97 - Fix confliction of DRA and surround slots 



Modules: AC97 Codec

Fixed the confliction of DRA and surround slots 7/8.

Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent beef08a5

sound/pci/ac97/ac97_codec.c

+2 −0
Original line number Diff line number Diff line
@@ -2046,6 +2046,8 @@ int snd_ac97_mixer(ac97_bus_t *bus, ac97_template_t *template, ac97_t **rac97) 
		snd_ac97_update_bits(ac97, AC97_GENERAL_PURPOSE, AC97_GP_DRSS_MASK, AC97_GP_DRSS_78);

		if ((snd_ac97_read(ac97, AC97_GENERAL_PURPOSE) & AC97_GP_DRSS_MASK) == AC97_GP_DRSS_78)

			ac97->flags |= AC97_DOUBLE_RATE;

		/* restore to slots 10/11 to avoid the confliction with surrounds */

		snd_ac97_update_bits(ac97, AC97_GENERAL_PURPOSE, AC97_GP_DRSS_MASK, 0);

	}

	if (ac97->ext_id & AC97_EI_VRA) {	/* VRA support */

		snd_ac97_determine_rates(ac97, AC97_PCM_FRONT_DAC_RATE, 0, &ac97->rates[AC97_RATES_FRONT_DAC]);

sound/pci/ac97/ac97_pcm.c

+9 −0
Original line number Diff line number Diff line
@@ -303,6 +303,15 @@ int snd_ac97_set_rate(ac97_t *ac97, int reg, unsigned int rate) 
				     AC97_EA_DRA, dbl ? AC97_EA_DRA : 0);

	snd_ac97_update(ac97, reg, tmp & 0xffff);

	snd_ac97_read(ac97, reg);

	if ((ac97->ext_id & AC97_EI_DRA) && reg == AC97_PCM_FRONT_DAC_RATE) {

		/* Intel controllers require double rate data to be put in

		 * slots 7+8

		 */

		snd_ac97_update_bits(ac97, AC97_GENERAL_PURPOSE,

				     AC97_GP_DRSS_MASK,

				     dbl ? AC97_GP_DRSS_78 : 0);

		snd_ac97_read(ac97, AC97_GENERAL_PURPOSE);

	}

	return 0;

}