korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-12-13 14:04:05 +08:00
Code Issues Packages Projects Releases Wiki Activity

ALSA: hda/ca0132 - Add full-range speaker selection controls.

Browse Source 
Add functions for setting full-range speakers and controls to
enable/disable the setting. Setting a speaker to full-range means that
the channels won't have their bass redirected to the LFE channel.

Signed-off-by: Connor McAdams <conmanx360@gmail.com>
Link: https://lore.kernel.org/r/20200825201040.30339-5-conmanx360@gmail.com
Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Connor McAdams 2020-08-25 16:10:23 -04:00 committed by Takashi Iwai
parent 01464a566e
commit 670c5f484a
1 changed files with 117 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

117
sound/pci/hda/patch_ca0132.c
View File

@ -147,6 +147,8 @@ enum {
AE5_SOUND_FILTER_ENUM,
ZXR_HEADPHONE_GAIN,
SPEAKER_CHANNEL_CFG_ENUM,
SPEAKER_FULL_RANGE_FRONT,
SPEAKER_FULL_RANGE_REAR,
#define EFFECTS_COUNT (EFFECT_END_NID - EFFECT_START_NID)
};
@ -592,6 +594,24 @@ static const struct ct_eq_preset ca0132_alt_eq_presets[] = {
}
};
/*
* DSP reqs for handling full-range speakers/bass redirection. If a speaker is
* set as not being full range, and bass redirection is enabled, all
* frequencies below the crossover frequency are redirected to the LFE
* channel. If the surround configuration has no LFE channel, this can't be
* enabled. X-Bass must be disabled when using these.
*/
enum speaker_range_reqs {
SPEAKER_BASS_REDIRECT = 0x15,
SPEAKER_BASS_REDIRECT_XOVER_FREQ = 0x16,
/* Between 0x16-0x1a are the X-Bass reqs. */
SPEAKER_FULL_RANGE_FRONT_L_R = 0x1a,
SPEAKER_FULL_RANGE_CENTER_LFE = 0x1b,
SPEAKER_FULL_RANGE_REAR_L_R = 0x1c,
SPEAKER_FULL_RANGE_SURROUND_L_R = 0x1d,
SPEAKER_BASS_REDIRECT_SUB_GAIN = 0x1e,
};
/*
* Definitions for the DSP req's to handle speaker tuning. These all belong to
* module ID 0x96, the output effects module.
@ -1100,6 +1120,7 @@ struct ca0132_spec {
unsigned char in_enum_val;
unsigned char out_enum_val;
unsigned char channel_cfg_val;
unsigned char speaker_range_val[2];
unsigned char mic_boost_enum_val;
unsigned char smart_volume_setting;
long fx_ctl_val[EFFECT_LEVEL_SLIDERS];
@ -4259,6 +4280,50 @@ static void ae5_mmio_select_out(struct hda_codec *codec)
ae5_ca0113_output_presets[spec->cur_out_type].vals[i]);
}
static int ca0132_alt_set_full_range_speaker(struct hda_codec *codec)
{
struct ca0132_spec *spec = codec->spec;
unsigned int tmp;
int err;
/* 2.0/4.0 setup has no LFE channel, so setting full-range does nothing. */
if (spec->channel_cfg_val == SPEAKER_CHANNELS_4_0
|| spec->channel_cfg_val == SPEAKER_CHANNELS_2_0)
return 0;
/* Set front L/R full range. Zero for full-range, one for redirection. */
tmp = spec->speaker_range_val[0] ? FLOAT_ZERO : FLOAT_ONE;
err = dspio_set_uint_param(codec, 0x96,
SPEAKER_FULL_RANGE_FRONT_L_R, tmp);
if (err < 0)
return err;
/* When setting full-range rear, both rear and center/lfe are set. */
tmp = spec->speaker_range_val[1] ? FLOAT_ZERO : FLOAT_ONE;
err = dspio_set_uint_param(codec, 0x96,
SPEAKER_FULL_RANGE_CENTER_LFE, tmp);
if (err < 0)
return err;
err = dspio_set_uint_param(codec, 0x96,
SPEAKER_FULL_RANGE_REAR_L_R, tmp);
if (err < 0)
return err;
/*
* Only the AE series cards set this value when setting full-range,
* and it's always 1.0f.
*/
if (ca0132_quirk(spec) == QUIRK_AE5) {
err = dspio_set_uint_param(codec, 0x96,
SPEAKER_FULL_RANGE_SURROUND_L_R, FLOAT_ONE);
if (err < 0)
return err;
}
return 0;
}
/*
* These are the commands needed to setup output on each of the different card
* types.
@ -4539,6 +4604,9 @@ static int ca0132_alt_select_out(struct hda_codec *codec)
goto exit;
}
if (spec->cur_out_type == SURROUND_OUT)
err = ca0132_alt_set_full_range_speaker(codec);
exit:
snd_hda_power_down_pm(codec);
@ -5269,6 +5337,7 @@ static int ca0132_alt_xbass_xover_slider_ctl_get(struct snd_kcontrol *kcontrol,
long *valp = ucontrol->value.integer.value;
*valp = spec->xbass_xover_freq;
return 0;
}
@ -5894,6 +5963,11 @@ static int ca0132_switch_get(struct snd_kcontrol *kcontrol,
return 0;
}
if (nid == SPEAKER_FULL_RANGE_FRONT || nid == SPEAKER_FULL_RANGE_REAR) {
*valp = spec->speaker_range_val[nid - SPEAKER_FULL_RANGE_FRONT];
return 0;
}
return 0;
}
@ -5972,6 +6046,14 @@ static int ca0132_switch_put(struct snd_kcontrol *kcontrol,
goto exit;
}
if (nid == SPEAKER_FULL_RANGE_FRONT || nid == SPEAKER_FULL_RANGE_REAR) {
spec->speaker_range_val[nid - SPEAKER_FULL_RANGE_FRONT] = *valp;
if (spec->cur_out_type == SURROUND_OUT)
ca0132_alt_set_full_range_speaker(codec);
changed = 0;
}
exit:
snd_hda_power_down(codec);
return changed;
@ -6329,6 +6411,31 @@ static int ca0132_alt_add_speaker_channel_cfg_enum(struct hda_codec *codec)
snd_ctl_new1(&knew, codec));
}
/*
* Full range front stereo and rear surround switches. When these are set to
* full range, the lower frequencies from these channels are no longer
* redirected to the LFE channel.
*/
static int ca0132_alt_add_front_full_range_switch(struct hda_codec *codec)
{
struct snd_kcontrol_new knew =
CA0132_CODEC_MUTE_MONO("Full-Range Front Speakers",
SPEAKER_FULL_RANGE_FRONT, 1, HDA_OUTPUT);
return snd_hda_ctl_add(codec, SPEAKER_FULL_RANGE_FRONT,
snd_ctl_new1(&knew, codec));
}
static int ca0132_alt_add_rear_full_range_switch(struct hda_codec *codec)
{
struct snd_kcontrol_new knew =
CA0132_CODEC_MUTE_MONO("Full-Range Rear Speakers",
SPEAKER_FULL_RANGE_REAR, 1, HDA_OUTPUT);
return snd_hda_ctl_add(codec, SPEAKER_FULL_RANGE_REAR,
snd_ctl_new1(&knew, codec));
}
/*
* Create an Input Source enumerated control for the alternate ca0132 codecs
* because the front microphone has no auto-detect, and Line-in has to be set
@ -6636,6 +6743,12 @@ static int ca0132_build_controls(struct hda_codec *codec)
if (err < 0)
return err;
err = ca0132_alt_add_speaker_channel_cfg_enum(codec);
if (err < 0)
return err;
err = ca0132_alt_add_front_full_range_switch(codec);
if (err < 0)
return err;
err = ca0132_alt_add_rear_full_range_switch(codec);
if (err < 0)
return err;
err = ca0132_alt_add_mic_boost_enum(codec);
@ -7982,6 +8095,10 @@ static void ca0132_init_chip(struct hda_codec *codec)
* ca0132 codecs. Also sets x-bass crossover frequency to 80hz.
*/
if (ca0132_use_alt_controls(spec)) {
/* Set speakers to default to full range. */
spec->speaker_range_val[0] = 1;
spec->speaker_range_val[1] = 1;
spec->xbass_xover_freq = 8;
for (i = 0; i < EFFECT_LEVEL_SLIDERS; i++)
spec->fx_ctl_val[i] = effect_slider_defaults[i];