evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ALSA: hda - Optimize the check of ALC269 codec variants

Browse source 
Don't call the COEF check for checking ACL269 codec variants at each
time in init but remember the type at the initialization.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Takashi Iwai 2010-09-20 15:11:54 +02:00
parent e1ca7b4ea2
commit d433a67831
1 changed files with 15 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
sound/pci/hda/patch_realtek.c
View file

@ -393,6 +393,7 @@ struct alc_spec {
unsigned int no_analog :1; /* digital I/O only */ unsigned int no_analog :1; /* digital I/O only */
unsigned int dual_adc_switch:1; /* switch ADCs (for ALC275) */ unsigned int dual_adc_switch:1; /* switch ADCs (for ALC275) */
int init_amp; int init_amp;
int codec_variant; /* flag for other variants */
/* for virtual master */ /* for virtual master */
hda_nid_t vmaster_nid; hda_nid_t vmaster_nid;
@ -14568,6 +14569,13 @@ static int alc275_setup_dual_adc(struct hda_codec *codec)
return 0; return 0;
} }
/* different alc269-variants */
enum {
ALC269_TYPE_NORMAL,
ALC269_TYPE_ALC259,
ALC269_TYPE_ALC271X,
};
/* /*
* BIOS auto configuration * BIOS auto configuration
*/ */
@ -14596,7 +14604,7 @@ static int alc269_parse_auto_config(struct hda_codec *codec)
if (spec->kctls.list) if (spec->kctls.list)
add_mixer(spec, spec->kctls.list); add_mixer(spec, spec->kctls.list);
if ((alc_read_coef_idx(codec, 0) & 0x00f0) == 0x0010) { if (spec->codec_variant != ALC269_TYPE_NORMAL) {
add_verb(spec, alc269vb_init_verbs); add_verb(spec, alc269vb_init_verbs);
alc_ssid_check(codec, 0, 0x1b, 0x14, 0x21); alc_ssid_check(codec, 0, 0x1b, 0x14, 0x21);
} else { } else {
@ -14962,7 +14970,6 @@ static int patch_alc269(struct hda_codec *codec)
struct alc_spec *spec; struct alc_spec *spec;
int board_config; int board_config;
int err; int err;
int is_alc269vb = 0;
spec = kzalloc(sizeof(*spec), GFP_KERNEL); spec = kzalloc(sizeof(*spec), GFP_KERNEL);
if (spec == NULL) if (spec == NULL)
@ -14974,11 +14981,13 @@ static int patch_alc269(struct hda_codec *codec)
if ((alc_read_coef_idx(codec, 0) & 0x00f0) == 0x0010){ if ((alc_read_coef_idx(codec, 0) & 0x00f0) == 0x0010){
if (codec->bus->pci->subsystem_vendor == 0x1025 && if (codec->bus->pci->subsystem_vendor == 0x1025 &&
spec->cdefine.platform_type == 1) spec->cdefine.platform_type == 1) {
alc_codec_rename(codec, "ALC271X"); alc_codec_rename(codec, "ALC271X");
else spec->codec_variant = ALC269_TYPE_ALC271X;
} else {
alc_codec_rename(codec, "ALC259"); alc_codec_rename(codec, "ALC259");
is_alc269vb = 1; spec->codec_variant = ALC269_TYPE_ALC259;
}
} else } else
alc_fix_pll_init(codec, 0x20, 0x04, 15); alc_fix_pll_init(codec, 0x20, 0x04, 15);
@ -15040,7 +15049,7 @@ static int patch_alc269(struct hda_codec *codec)
spec->stream_digital_capture = &alc269_pcm_digital_capture; spec->stream_digital_capture = &alc269_pcm_digital_capture;
if (!spec->adc_nids) { /* wasn't filled automatically? use default */ if (!spec->adc_nids) { /* wasn't filled automatically? use default */
if (!is_alc269vb) { if (spec->codec_variant != ALC269_TYPE_NORMAL) {
spec->adc_nids = alc269_adc_nids; spec->adc_nids = alc269_adc_nids;
spec->num_adc_nids = ARRAY_SIZE(alc269_adc_nids); spec->num_adc_nids = ARRAY_SIZE(alc269_adc_nids);
spec->capsrc_nids = alc269_capsrc_nids; spec->capsrc_nids = alc269_capsrc_nids;