aboutsummaryrefslogtreecommitdiffstats
path: root/sound/pci/hda/hda_generic.h
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2013-01-21 09:11:25 -0500
committerTakashi Iwai <tiwai@suse.de>2013-01-21 09:11:25 -0500
commita1e908edccd1b6928cda78371026b458e2c1973a (patch)
treea6db12980efa5d13dee688dabeb51b1a4f2f44b8 /sound/pci/hda/hda_generic.h
parentf87498b65197f951899d8bbd99e5553227c41ec9 (diff)
ALSA: hda - Fix conflicts between Loopback Mixing and Independent HP
This patch eventually fixes two issues: - Handle the case where the primary output is a headphone and can have independent HP mode; so far we checked only the case where the headphone is the secondary output. - Fix the conflict of HP independent mode and aamix mode; when switched to aamix mode, the DAC might be also switched to another widget shared with other outputs. Then even if we disable the DAC for the original output, it doesn't change -- because the active route is from another (shared) DAC to HP pin through aamix. So, in such a case, we have to prohibit the switch to aamix for HP routes. This fixes issues appearing on VT codecs. Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci/hda/hda_generic.h')
-rw-r--r--sound/pci/hda/hda_generic.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/sound/pci/hda/hda_generic.h b/sound/pci/hda/hda_generic.h
index 696b6068a889..9c63555b971c 100644
--- a/sound/pci/hda/hda_generic.h
+++ b/sound/pci/hda/hda_generic.h
@@ -212,6 +212,7 @@ struct hda_gen_spec {
212 unsigned int no_analog:1; /* digital I/O only */ 212 unsigned int no_analog:1; /* digital I/O only */
213 unsigned int dyn_adc_switch:1; /* switch ADCs (for ALC275) */ 213 unsigned int dyn_adc_switch:1; /* switch ADCs (for ALC275) */
214 unsigned int indep_hp_enabled:1; /* independent HP enabled */ 214 unsigned int indep_hp_enabled:1; /* independent HP enabled */
215 unsigned int have_aamix_ctl:1;
215 216
216 /* loopback mixing mode */ 217 /* loopback mixing mode */
217 bool aamix_mode; 218 bool aamix_mode;