tmakin/tegra-linux-noble
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ALSA: scarlett2: Fix Scarlett 4th Gen input gain range again

Browse Source 
BugLink: https://bugs.launchpad.net/bugs/2060097

[ Upstream commit 6719cd5e45111449f4021e08f2e488f17a9b292b ]

The 4th Gen input preamp gain range is 0dB to +69dB, although the
control values range from 0 to 70. Replace SCARLETT2_MAX_GAIN with
SCARLETT2_MAX_GAIN_VALUE and SCARLETT2_MAX_GAIN_DB, and update the TLV
again.

Signed-off-by: Geoffrey D. Bennett <g@b4.vu>
Fixes: a45cf0a08347 ("ALSA: scarlett2: Fix Scarlett 4th Gen input gain range")
Message-ID: <Ze7OMA8ntG7KteGa@m.b4.vu>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Sasha Levin <sashal@kernel.org>
(cherry picked from commit 056a4f138a428299fe20a294912048c59b0c6752)
Signed-off-by: Paolo Pisati <paolo.pisati@canonical.com>
This commit is contained in:
Geoffrey D. Bennett
2024-03-11 19:56:08 +10:30
committed by Roxana Nicolescu
parent 0f688b96ed
commit 86410b7d8f
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sound/usb/mixer_scarlett2.c
+7 -4
View File
@@ -174,8 +174,11 @@
/* some gui mixers can't handle negative ctl values */
#define SCARLETT2_VOLUME_BIAS 127
/* maximum preamp input gain */
#define SCARLETT2_MAX_GAIN 70
/* maximum preamp input gain and value
* values are from 0 to 70, preamp gain is from 0 to 69 dB
*/
#define SCARLETT2_MAX_GAIN_VALUE 70
#define SCARLETT2_MAX_GAIN_DB 69
/* mixer range from -80dB to +6dB in 0.5dB steps */
#define SCARLETT2_MIXER_MIN_DB -80
@@ -3466,7 +3469,7 @@ static int scarlett2_input_gain_ctl_info(struct snd_kcontrol *kctl,
uinfo->type = SNDRV_CTL_ELEM_TYPE_INTEGER;
uinfo->count = elem->channels;
uinfo->value.integer.min = 0;
uinfo->value.integer.max = SCARLETT2_MAX_GAIN;
uinfo->value.integer.max = SCARLETT2_MAX_GAIN_VALUE;
uinfo->value.integer.step = 1;
unlock:
@@ -3543,7 +3546,7 @@ unlock:
}
static const DECLARE_TLV_DB_MINMAX(
db_scale_scarlett2_gain, 0, SCARLETT2_MAX_GAIN * 100
db_scale_scarlett2_gain, 0, SCARLETT2_MAX_GAIN_DB * 100
);
static const struct snd_kcontrol_new scarlett2_input_gain_ctl = {