[2/2] ALSA: hda/realtek - Fix Lenovo Thinkpad X1 Carbon 7th quirk value
diff mbox series

Message ID 20200211055651.4405-2-benjamin.poirier@gmail.com
State New
Headers show
Series
  • [1/2] ALSA: hda/realtek - Fix Lenovo Thinkpad X1 Carbon 7th quirk subdevice id
Related show

Commit Message

Benjamin Poirier Feb. 11, 2020, 5:56 a.m. UTC
As a result of commit d2cd795c4ece ("ALSA: hda - fixup for the bass speaker
on Lenovo Carbon X1 7th gen"), the maximum sound output level on my
machine, an X1 Carbon, was reduced to ~60% of its previous level.

This laptop model has two sets of stereo speakers: Front and Bass (aka Rear
in some contexts).
Before commit d2cd795c4ece, volume control was commonly ineffective (using
the Master slider in alsa or pulseaudio apparently had little effect or
alternated between mute or max with nothing in between - more details
below)
commit d2cd795c4ece added quirk ALC285_FIXUP_SPEAKER2_TO_DAC1 which
resulted in assigning both sets of speakers to the same DAC, bringing
the two sets of speakers under one effective volume control but also
lowering the max output volume noticeably.

Fix this by changing the quirk so that each set of speakers can be
controlled individually and the max output volume is restored to what it
was before commit d2cd795c4ece.

Since there is no documentation about the audio codec, here is some
detailed information about the result of applying different quirks.
DAC connection (which is what's affected by the quirk) is reported as found
in /proc/asound/card0/codec#0, Node 0x17.
pavucontrol controls are reported with the device configured with the
"Analog Surround 4.0 Output" profile.

no quirk
	Loud max output volume
	DAC connection
	  Connection: 3
	     0x02 0x03 0x06*
	Controls in alsamixer
		Master controls front speakers only.
		Speaker controls front speakers only.
		Bass Speaker is a toggle that mutes everything.
		PCM controls all speakers.
		There is no "Front" mixer.
	Controls in pavucontrol
		"Front Left"/"Front Right" sliders work as expected.
		"Rear Left"/"Rear Right" sliders seem to operate in a
		non-linear fashion such that most values above 0% result in
		max volume output.
		-> Because the bass speakers (Rear) are more powerful, the
		net effect is that when the channels are linked into a
		single slider, it seems like it has just two modes: mute or
		max.
ALC285_FIXUP_SPEAKER2_TO_DAC1
	Weak (~60%) max output volume
	DAC connection
	  Connection: 3
	     0x02* 0x03 0x06
	  In-driver Connection: 1
	     0x02
	Controls in alsamixer
		Master controls all four speakers.
		Speaker controls all four speakers.
		Bass Speaker is a toggle that mutes everything.
		PCM controls all four speakers.
		There is no "Front" mixer.
	Controls in pavucontrol
		"Front Left"/"Front Right" sliders have no effect.
		"Rear Left"/"Rear Right" sliders control both front and
		bass speakers.
		-> Volume control is effective but it's not possible to
		control front and bass speakers individually.
ALC295_FIXUP_DISABLE_DAC3
	Loud max output volume
	DAC connection
	  Connection: 3
	     0x02 0x03* 0x06
	  In-driver Connection: 2
	     0x02 0x03
	Controls in alsamixer
		Master controls all speakers.
		Speaker is a toggle that mutes everything.
		Bass Speaker controls bass speakers only.
		PCM controls all speakers.
		Front controls front speakers only.
	Controls in pavucontrol
		"Front Left"/"Front Right" sliders control front speakers
		only.
		"Rear Left"/"Rear Right" sliders control bass speakers
		only.
		-> Volume control is effective and it's possible to control
		each of the four speakers individually.

In summary, Node 0x17 DAC connection 0x3 offers the loudest max volume and
the most detailed mixer controls. That connection is obtained with quirk
ALC295_FIXUP_DISABLE_DAC3. Therefore, change the ThinkPad X1 Carbon 7th to
use ALC295_FIXUP_DISABLE_DAC3.

Fixes: d2cd795c4ece ("ALSA: hda - fixup for the bass speaker on Lenovo Carbon X1 7th gen")
Link: https://lore.kernel.org/alsa-devel/20200210025249.GA2700@f3/
Cc: Jaroslav Kysela <perex@perex.cz>
Cc: Kailang Yang <kailang@realtek.com>
Signed-off-by: Benjamin Poirier <benjamin.poirier@gmail.com>
---
 sound/pci/hda/patch_realtek.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Jaroslav Kysela Feb. 11, 2020, 7:40 a.m. UTC | #1
Dne 11. 02. 20 v 6:56 Benjamin Poirier napsal(a):
> As a result of commit d2cd795c4ece ("ALSA: hda - fixup for the bass speaker
> on Lenovo Carbon X1 7th gen"), the maximum sound output level on my
> machine, an X1 Carbon, was reduced to ~60% of its previous level.
> 
> This laptop model has two sets of stereo speakers: Front and Bass (aka Rear
> in some contexts).
> Before commit d2cd795c4ece, volume control was commonly ineffective (using
> the Master slider in alsa or pulseaudio apparently had little effect or
> alternated between mute or max with nothing in between - more details
> below)
> commit d2cd795c4ece added quirk ALC285_FIXUP_SPEAKER2_TO_DAC1 which
> resulted in assigning both sets of speakers to the same DAC, bringing
> the two sets of speakers under one effective volume control but also
> lowering the max output volume noticeably.
> 
> Fix this by changing the quirk so that each set of speakers can be
> controlled individually and the max output volume is restored to what it
> was before commit d2cd795c4ece.
> 
> Since there is no documentation about the audio codec, here is some
> detailed information about the result of applying different quirks.
> DAC connection (which is what's affected by the quirk) is reported as found
> in /proc/asound/card0/codec#0, Node 0x17.
> pavucontrol controls are reported with the device configured with the
> "Analog Surround 4.0 Output" profile.
> 
> no quirk
> 	Loud max output volume
> 	DAC connection
> 	  Connection: 3
> 	     0x02 0x03 0x06*
> 	Controls in alsamixer
> 		Master controls front speakers only.
> 		Speaker controls front speakers only.
> 		Bass Speaker is a toggle that mutes everything.
> 		PCM controls all speakers.
> 		There is no "Front" mixer.
> 	Controls in pavucontrol
> 		"Front Left"/"Front Right" sliders work as expected.
> 		"Rear Left"/"Rear Right" sliders seem to operate in a
> 		non-linear fashion such that most values above 0% result in
> 		max volume output.
> 		-> Because the bass speakers (Rear) are more powerful, the
> 		net effect is that when the channels are linked into a
> 		single slider, it seems like it has just two modes: mute or
> 		max.
> ALC285_FIXUP_SPEAKER2_TO_DAC1
> 	Weak (~60%) max output volume
> 	DAC connection
> 	  Connection: 3
> 	     0x02* 0x03 0x06
> 	  In-driver Connection: 1
> 	     0x02
> 	Controls in alsamixer
> 		Master controls all four speakers.
> 		Speaker controls all four speakers.
> 		Bass Speaker is a toggle that mutes everything.
> 		PCM controls all four speakers.
> 		There is no "Front" mixer.
> 	Controls in pavucontrol
> 		"Front Left"/"Front Right" sliders have no effect.
> 		"Rear Left"/"Rear Right" sliders control both front and
> 		bass speakers.
> 		-> Volume control is effective but it's not possible to
> 		control front and bass speakers individually.
> ALC295_FIXUP_DISABLE_DAC3
> 	Loud max output volume
> 	DAC connection
> 	  Connection: 3
> 	     0x02 0x03* 0x06
> 	  In-driver Connection: 2
> 	     0x02 0x03
> 	Controls in alsamixer
> 		Master controls all speakers.
> 		Speaker is a toggle that mutes everything.
> 		Bass Speaker controls bass speakers only.
> 		PCM controls all speakers.
> 		Front controls front speakers only.
> 	Controls in pavucontrol
> 		"Front Left"/"Front Right" sliders control front speakers
> 		only.
> 		"Rear Left"/"Rear Right" sliders control bass speakers
> 		only.
> 		-> Volume control is effective and it's possible to control
> 		each of the four speakers individually.
> 
> In summary, Node 0x17 DAC connection 0x3 offers the loudest max volume and
> the most detailed mixer controls. That connection is obtained with quirk
> ALC295_FIXUP_DISABLE_DAC3. Therefore, change the ThinkPad X1 Carbon 7th to
> use ALC295_FIXUP_DISABLE_DAC3.

The volume split (individual volume control) will cause trouble for the UCM 
volume control at the moment which is the target for this device to get the 
digital microphone working. If there is no possibility to share DAC, it would 
be probably more nice to join the volume control in the driver.

Have you tried to use 0x03 as source for all four speakers?

Why PA handles the rear volume control with the current driver code in the 
legacy ALSA driver? It should be handled like standard stereo device. I'll check.

You should also test PA with UCM.

				Thanks,
					Jaroslav

> 
> Fixes: d2cd795c4ece ("ALSA: hda - fixup for the bass speaker on Lenovo Carbon X1 7th gen")
> Link: https://lore.kernel.org/alsa-devel/20200210025249.GA2700@f3/
> Cc: Jaroslav Kysela <perex@perex.cz>
> Cc: Kailang Yang <kailang@realtek.com>
> Signed-off-by: Benjamin Poirier <benjamin.poirier@gmail.com>
> ---
>   sound/pci/hda/patch_realtek.c | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c
> index 05d44df2008e..3171da10123e 100644
> --- a/sound/pci/hda/patch_realtek.c
> +++ b/sound/pci/hda/patch_realtek.c
> @@ -7268,7 +7268,7 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = {
>   	SND_PCI_QUIRK(0x17aa, 0x224c, "Thinkpad", ALC298_FIXUP_TPT470_DOCK),
>   	SND_PCI_QUIRK(0x17aa, 0x224d, "Thinkpad", ALC298_FIXUP_TPT470_DOCK),
>   	SND_PCI_QUIRK(0x17aa, 0x225d, "Thinkpad T480", ALC269_FIXUP_LIMIT_INT_MIC_BOOST),
> -	SND_PCI_QUIRK(0x17aa, 0x2292, "Thinkpad X1 Carbon 7th", ALC285_FIXUP_SPEAKER2_TO_DAC1),
> +	SND_PCI_QUIRK(0x17aa, 0x2292, "Thinkpad X1 Carbon 7th", ALC295_FIXUP_DISABLE_DAC3),
>   	SND_PCI_QUIRK(0x17aa, 0x30bb, "ThinkCentre AIO", ALC233_FIXUP_LENOVO_LINE2_MIC_HOTKEY),
>   	SND_PCI_QUIRK(0x17aa, 0x30e2, "ThinkCentre AIO", ALC233_FIXUP_LENOVO_LINE2_MIC_HOTKEY),
>   	SND_PCI_QUIRK(0x17aa, 0x310c, "ThinkCentre Station", ALC294_FIXUP_LENOVO_MIC_LOCATION),
>
Benjamin Poirier Feb. 11, 2020, 8:16 a.m. UTC | #2
On 2020/02/11 08:40 +0100, Jaroslav Kysela wrote:
[...]
> > 
> > In summary, Node 0x17 DAC connection 0x3 offers the loudest max volume and
> > the most detailed mixer controls. That connection is obtained with quirk
> > ALC295_FIXUP_DISABLE_DAC3. Therefore, change the ThinkPad X1 Carbon 7th to
> > use ALC295_FIXUP_DISABLE_DAC3.
> 
> The volume split (individual volume control) will cause trouble for the UCM
> volume control at the moment which is the target for this device to get the
> digital microphone working. If there is no possibility to share DAC, it
> would be probably more nice to join the volume control in the driver.
> 
> Have you tried to use 0x03 as source for all four speakers?

Front speakers are fixed to 0x02. Node 0x14
  Connection: 1
     0x02

> 
> Why PA handles the rear volume control with the current driver code in the
> legacy ALSA driver? It should be handled like standard stereo device. I'll
> check.

The device comes up with "Analog Stereo Output" profile by default. I
changed it to "Analog Surround 4.0 Output" to test controlling each
channel individually:

> > pavucontrol controls are reported with the device configured with the
> > "Analog Surround 4.0 Output" profile.

> 
> You should also test PA with UCM.

Please let me know what do I need to test exactly? I'm not familiar with
UCM.
Kailang Feb. 11, 2020, 9:10 a.m. UTC | #3
Hi,

Speaker 2 connect to DAC 0x2 was Lenovo requested.
This was tune for EQ setting.
I didn't know more for this.

BR,
Kailang

> -----Original Message-----
> From: Benjamin Poirier <benjamin.poirier@gmail.com>
> Sent: Tuesday, February 11, 2020 4:16 PM
> To: Jaroslav Kysela <perex@perex.cz>
> Cc: Takashi Iwai <tiwai@suse.de>; Kailang <kailang@realtek.com>;
> alsa-devel@alsa-project.org; linux-kernel@vger.kernel.org
> Subject: Re: [PATCH 2/2] ALSA: hda/realtek - Fix Lenovo Thinkpad X1 Carbon
> 7th quirk value
> 
> On 2020/02/11 08:40 +0100, Jaroslav Kysela wrote:
> [...]
> > >
> > > In summary, Node 0x17 DAC connection 0x3 offers the loudest max
> > > volume and the most detailed mixer controls. That connection is
> > > obtained with quirk ALC295_FIXUP_DISABLE_DAC3. Therefore, change the
> > > ThinkPad X1 Carbon 7th to use ALC295_FIXUP_DISABLE_DAC3.
> >
> > The volume split (individual volume control) will cause trouble for
> > the UCM volume control at the moment which is the target for this
> > device to get the digital microphone working. If there is no
> > possibility to share DAC, it would be probably more nice to join the volume
> control in the driver.
> >
> > Have you tried to use 0x03 as source for all four speakers?
> 
> Front speakers are fixed to 0x02. Node 0x14
>   Connection: 1
>      0x02
> 
> >
> > Why PA handles the rear volume control with the current driver code in
> > the legacy ALSA driver? It should be handled like standard stereo
> > device. I'll check.
> 
> The device comes up with "Analog Stereo Output" profile by default. I changed
> it to "Analog Surround 4.0 Output" to test controlling each channel individually:
> 
> > > pavucontrol controls are reported with the device configured with
> > > the "Analog Surround 4.0 Output" profile.
> 
> >
> > You should also test PA with UCM.
> 
> Please let me know what do I need to test exactly? I'm not familiar with UCM.
> 
> ------Please consider the environment before printing this e-mail.
Takashi Iwai Feb. 11, 2020, 9:20 a.m. UTC | #4
On Tue, 11 Feb 2020 10:10:50 +0100,
Kailang wrote:
> 
> Hi,
> 
> Speaker 2 connect to DAC 0x2 was Lenovo requested.
> This was tune for EQ setting.
> I didn't know more for this.

Thanks, that was my expectation, too.  Applying EQ to built-in
speakers is an oft-seen workaround for laptops to avoid the possible
hardware damage.

Now the question is whether this obvious level of lowering is the
expected result.

Kailang, could you try to ask Lenovo about it?


Takashi

> 
> BR,
> Kailang
> 
> > -----Original Message-----
> > From: Benjamin Poirier <benjamin.poirier@gmail.com>
> > Sent: Tuesday, February 11, 2020 4:16 PM
> > To: Jaroslav Kysela <perex@perex.cz>
> > Cc: Takashi Iwai <tiwai@suse.de>; Kailang <kailang@realtek.com>;
> > alsa-devel@alsa-project.org; linux-kernel@vger.kernel.org
> > Subject: Re: [PATCH 2/2] ALSA: hda/realtek - Fix Lenovo Thinkpad X1 Carbon
> > 7th quirk value
> > 
> > On 2020/02/11 08:40 +0100, Jaroslav Kysela wrote:
> > [...]
> > > >
> > > > In summary, Node 0x17 DAC connection 0x3 offers the loudest max
> > > > volume and the most detailed mixer controls. That connection is
> > > > obtained with quirk ALC295_FIXUP_DISABLE_DAC3. Therefore, change the
> > > > ThinkPad X1 Carbon 7th to use ALC295_FIXUP_DISABLE_DAC3.
> > >
> > > The volume split (individual volume control) will cause trouble for
> > > the UCM volume control at the moment which is the target for this
> > > device to get the digital microphone working. If there is no
> > > possibility to share DAC, it would be probably more nice to join the volume
> > control in the driver.
> > >
> > > Have you tried to use 0x03 as source for all four speakers?
> > 
> > Front speakers are fixed to 0x02. Node 0x14
> >   Connection: 1
> >      0x02
> > 
> > >
> > > Why PA handles the rear volume control with the current driver code in
> > > the legacy ALSA driver? It should be handled like standard stereo
> > > device. I'll check.
> > 
> > The device comes up with "Analog Stereo Output" profile by default. I changed
> > it to "Analog Surround 4.0 Output" to test controlling each channel individually:
> > 
> > > > pavucontrol controls are reported with the device configured with
> > > > the "Analog Surround 4.0 Output" profile.
> > 
> > >
> > > You should also test PA with UCM.
> > 
> > Please let me know what do I need to test exactly? I'm not familiar with UCM.
> > 
> > ------Please consider the environment before printing this e-mail.
>
Jaroslav Kysela Feb. 11, 2020, 9:35 a.m. UTC | #5
Dne 11. 02. 20 v 9:16 Benjamin Poirier napsal(a):
> On 2020/02/11 08:40 +0100, Jaroslav Kysela wrote:
> [...]
>>>
>>> In summary, Node 0x17 DAC connection 0x3 offers the loudest max volume and
>>> the most detailed mixer controls. That connection is obtained with quirk
>>> ALC295_FIXUP_DISABLE_DAC3. Therefore, change the ThinkPad X1 Carbon 7th to
>>> use ALC295_FIXUP_DISABLE_DAC3.
>>
>> The volume split (individual volume control) will cause trouble for the UCM
>> volume control at the moment which is the target for this device to get the
>> digital microphone working. If there is no possibility to share DAC, it
>> would be probably more nice to join the volume control in the driver.
>>
>> Have you tried to use 0x03 as source for all four speakers?
> 
> Front speakers are fixed to 0x02. Node 0x14
>    Connection: 1
>       0x02
> 

Yes, you're right. I forgot that.

>>
>> Why PA handles the rear volume control with the current driver code in the
>> legacy ALSA driver? It should be handled like standard stereo device. I'll
>> check.
> 
> The device comes up with "Analog Stereo Output" profile by default. I
> changed it to "Analog Surround 4.0 Output" to test controlling each
> channel individually:

Yes, but does the volume control work (does PA change the appropriate ALSA 
mixer volume)? Sometimes, it's difficult to see the difference between soft 
volume attenuation and the hardware volume control.

> 
>>> pavucontrol controls are reported with the device configured with the
>>> "Analog Surround 4.0 Output" profile.
> 
>>
>> You should also test PA with UCM.
> 
> Please let me know what do I need to test exactly? I'm not familiar with
> UCM.

Just install the latest pulseaudio (latest from repo), alsa-lib and 
alsa-ucm-conf (also from repo). If pulseaudio detects UCM, it has the preference.

						Jaroslav

>
Kailang Feb. 11, 2020, 9:57 a.m. UTC | #6
> -----Original Message-----
> From: Takashi Iwai <tiwai@suse.de>
> Sent: Tuesday, February 11, 2020 5:20 PM
> To: Kailang <kailang@realtek.com>
> Cc: Benjamin Poirier <benjamin.poirier@gmail.com>; Jaroslav Kysela
> <perex@perex.cz>; alsa-devel@alsa-project.org; linux-kernel@vger.kernel.org
> Subject: Re: [PATCH 2/2] ALSA: hda/realtek - Fix Lenovo Thinkpad X1 Carbon
> 7th quirk value
> 
> On Tue, 11 Feb 2020 10:10:50 +0100,
> Kailang wrote:
> >
> > Hi,
> >
> > Speaker 2 connect to DAC 0x2 was Lenovo requested.
> > This was tune for EQ setting.
> > I didn't know more for this.
> 
> Thanks, that was my expectation, too.  Applying EQ to built-in speakers is an
> oft-seen workaround for laptops to avoid the possible hardware damage.
> 
> Now the question is whether this obvious level of lowering is the expected
> result.
> 
> Kailang, could you try to ask Lenovo about it?
> 
Yes, this is expected. I confirm this with our Lenovo AE.

> 
> Takashi
> 
> >
> > BR,
> > Kailang
> >
> > > -----Original Message-----
> > > From: Benjamin Poirier <benjamin.poirier@gmail.com>
> > > Sent: Tuesday, February 11, 2020 4:16 PM
> > > To: Jaroslav Kysela <perex@perex.cz>
> > > Cc: Takashi Iwai <tiwai@suse.de>; Kailang <kailang@realtek.com>;
> > > alsa-devel@alsa-project.org; linux-kernel@vger.kernel.org
> > > Subject: Re: [PATCH 2/2] ALSA: hda/realtek - Fix Lenovo Thinkpad X1
> > > Carbon 7th quirk value
> > >
> > > On 2020/02/11 08:40 +0100, Jaroslav Kysela wrote:
> > > [...]
> > > > >
> > > > > In summary, Node 0x17 DAC connection 0x3 offers the loudest max
> > > > > volume and the most detailed mixer controls. That connection is
> > > > > obtained with quirk ALC295_FIXUP_DISABLE_DAC3. Therefore, change
> > > > > the ThinkPad X1 Carbon 7th to use ALC295_FIXUP_DISABLE_DAC3.
> > > >
> > > > The volume split (individual volume control) will cause trouble
> > > > for the UCM volume control at the moment which is the target for
> > > > this device to get the digital microphone working. If there is no
> > > > possibility to share DAC, it would be probably more nice to join
> > > > the volume
> > > control in the driver.
> > > >
> > > > Have you tried to use 0x03 as source for all four speakers?
> > >
> > > Front speakers are fixed to 0x02. Node 0x14
> > >   Connection: 1
> > >      0x02
> > >
> > > >
> > > > Why PA handles the rear volume control with the current driver
> > > > code in the legacy ALSA driver? It should be handled like standard
> > > > stereo device. I'll check.
> > >
> > > The device comes up with "Analog Stereo Output" profile by default.
> > > I changed it to "Analog Surround 4.0 Output" to test controlling each
> channel individually:
> > >
> > > > > pavucontrol controls are reported with the device configured
> > > > > with the "Analog Surround 4.0 Output" profile.
> > >
> > > >
> > > > You should also test PA with UCM.
> > >
> > > Please let me know what do I need to test exactly? I'm not familiar with
> UCM.
> > >
> > > ------Please consider the environment before printing this e-mail.
> >
Benjamin Poirier Feb. 11, 2020, 11:42 a.m. UTC | #7
On 2020/02/11 10:35 +0100, Jaroslav Kysela wrote:
> Dne 11. 02. 20 v 9:16 Benjamin Poirier napsal(a):
[...]
> > > 
> > > Why PA handles the rear volume control with the current driver code in the
> > > legacy ALSA driver? It should be handled like standard stereo device. I'll
> > > check.
> > 
> > The device comes up with "Analog Stereo Output" profile by default. I
> > changed it to "Analog Surround 4.0 Output" to test controlling each
> > channel individually:
> 
> Yes, but does the volume control work (does PA change the appropriate ALSA
> mixer volume)? Sometimes, it's difficult to see the difference between soft
> volume attenuation and the hardware volume control.

I see what you mean.
When set to the "Analog Surround 4.0 Output", pulseaudio didn't change
the "Bass Speaker" mixer (always at 0dB gain). It used a combination of
Master, Front and sometimes PCM mixers to control all four speakers.

For example:
pacmd list-sinks
	name: <alsa_output.pci-0000_00_1f.3.analog-surround-40>
	volume: front-left: 10349 /  16% / -48.09 dB,   front-right:
	39377 /  60% / -13.27 dB,   rear-left: 23979 /  37% / -26.20 dB,
	rear-right: 47974 /  73% / -8.13 dB
                balance 0.61
alsactl -f /tmp/output store 0
		iface MIXER
		name 'Front Playback Volume'
		value.0 33
		value.1 79
			range '0 - 87'

		name 'Bass Speaker Playback Volume'
		value.0 87
		value.1 87
			range '0 - 87'

		name 'Master Playback Volume'
		value 77
			range '0 - 87'

		name 'PCM Playback Volume'
		value.0 255
		value.1 255
			range '0 - 255'

> > > 
> > > You should also test PA with UCM.
> > 
> > Please let me know what do I need to test exactly? I'm not familiar with
> > UCM.
> 
> Just install the latest pulseaudio (latest from repo), alsa-lib and
> alsa-ucm-conf (also from repo). If pulseaudio detects UCM, it has the
> preference.

Using the packages in debian unstable, `pacmd list` shows "use_ucm=yes".
alsa-ucm-conf was already installed. Hopefully that's enough.

ii  alsa-ucm-conf    1.2.1.2-2    all          ALSA Use Case Manager configuration files
ii  libasound2:amd64 1.2.1.2-2    amd64        shared library for ALSA applications
ii  pulseaudio       13.0-5       amd64        PulseAudio sound server

pacmd list
        name: <module-alsa-card>
	argument: <device_id="0" name="pci-0000_00_1f.3"
	card_name="alsa_card.pci-0000_00_1f.3" namereg_fail=false
	tsched=yes fixed_latency_range=no ignore_dB=no
	deferred_volume=yes use_ucm=yes avoid_resampling=no
	card_properties="module-udev-detect.discovered=1">
Jaroslav Kysela Feb. 11, 2020, 1:56 p.m. UTC | #8
Dne 11. 02. 20 v 12:42 Benjamin Poirier napsal(a):
> On 2020/02/11 10:35 +0100, Jaroslav Kysela wrote:
>> Dne 11. 02. 20 v 9:16 Benjamin Poirier napsal(a):
> [...]
>>>>
>>>> Why PA handles the rear volume control with the current driver code in the
>>>> legacy ALSA driver? It should be handled like standard stereo device. I'll
>>>> check.
>>>
>>> The device comes up with "Analog Stereo Output" profile by default. I
>>> changed it to "Analog Surround 4.0 Output" to test controlling each
>>> channel individually:
>>
>> Yes, but does the volume control work (does PA change the appropriate ALSA
>> mixer volume)? Sometimes, it's difficult to see the difference between soft
>> volume attenuation and the hardware volume control.
> 
> I see what you mean.
> When set to the "Analog Surround 4.0 Output", pulseaudio didn't change
> the "Bass Speaker" mixer (always at 0dB gain). It used a combination of
> Master, Front and sometimes PCM mixers to control all four speakers.

Yes, that was the reason to keep only one volume control in the driver until 
we have a solution for this.

> For example:
> pacmd list-sinks
> 	name: <alsa_output.pci-0000_00_1f.3.analog-surround-40>
> 	volume: front-left: 10349 /  16% / -48.09 dB,   front-right:
> 	39377 /  60% / -13.27 dB,   rear-left: 23979 /  37% / -26.20 dB,
> 	rear-right: 47974 /  73% / -8.13 dB
>                  balance 0.61
> alsactl -f /tmp/output store 0
> 		iface MIXER
> 		name 'Front Playback Volume'
> 		value.0 33
> 		value.1 79
> 			range '0 - 87'
> 
> 		name 'Bass Speaker Playback Volume'
> 		value.0 87
> 		value.1 87
> 			range '0 - 87'
> 
> 		name 'Master Playback Volume'
> 		value 77
> 			range '0 - 87'
> 
> 		name 'PCM Playback Volume'
> 		value.0 255
> 		value.1 255
> 			range '0 - 255'
> 
>>>>
>>>> You should also test PA with UCM.
>>>
>>> Please let me know what do I need to test exactly? I'm not familiar with
>>> UCM.
>>
>> Just install the latest pulseaudio (latest from repo), alsa-lib and
>> alsa-ucm-conf (also from repo). If pulseaudio detects UCM, it has the
>> preference.
> 
> Using the packages in debian unstable, `pacmd list` shows "use_ucm=yes".
> alsa-ucm-conf was already installed. Hopefully that's enough.
> 
> ii  alsa-ucm-conf    1.2.1.2-2    all          ALSA Use Case Manager configuration files
> ii  libasound2:amd64 1.2.1.2-2    amd64        shared library for ALSA applications
> ii  pulseaudio       13.0-5       amd64        PulseAudio sound server

You should use the latest code. I will release ALSA packages version 1.2.2 
soon, but PA must be latest (not yet released 14.0). Previous versions do not 
handle the volume control and HDMI jack detection. There are many UCM changes 
in 14.0.

						Jaroslav

> 
> pacmd list
>          name: <module-alsa-card>
> 	argument: <device_id="0" name="pci-0000_00_1f.3"
> 	card_name="alsa_card.pci-0000_00_1f.3" namereg_fail=false
> 	tsched=yes fixed_latency_range=no ignore_dB=no
> 	deferred_volume=yes use_ucm=yes avoid_resampling=no
> 	card_properties="module-udev-detect.discovered=1">
>
Kailang Feb. 12, 2020, 6:32 a.m. UTC | #9
> -----Original Message-----
> From: Takashi Iwai <tiwai@suse.de>
> Sent: Tuesday, February 11, 2020 5:20 PM
> To: Kailang <kailang@realtek.com>
> Cc: Benjamin Poirier <benjamin.poirier@gmail.com>; Jaroslav Kysela
> <perex@perex.cz>; alsa-devel@alsa-project.org; linux-kernel@vger.kernel.org
> Subject: Re: [PATCH 2/2] ALSA: hda/realtek - Fix Lenovo Thinkpad X1 Carbon
> 7th quirk value
> 
> On Tue, 11 Feb 2020 10:10:50 +0100,
> Kailang wrote:
> >
> > Hi,
> >
> > Speaker 2 connect to DAC 0x2 was Lenovo requested.
> > This was tune for EQ setting.
> > I didn't know more for this.
> 
> Thanks, that was my expectation, too.  Applying EQ to built-in speakers is an
> oft-seen workaround for laptops to avoid the possible hardware damage.
> 
> Now the question is whether this obvious level of lowering is the expected
> result.
> 
> Kailang, could you try to ask Lenovo about it?

I have confirmed with our Lenovo AE.

> 
> 
> Takashi
> 
> >
> > BR,
> > Kailang
> >
> > > -----Original Message-----
> > > From: Benjamin Poirier <benjamin.poirier@gmail.com>
> > > Sent: Tuesday, February 11, 2020 4:16 PM
> > > To: Jaroslav Kysela <perex@perex.cz>
> > > Cc: Takashi Iwai <tiwai@suse.de>; Kailang <kailang@realtek.com>;
> > > alsa-devel@alsa-project.org; linux-kernel@vger.kernel.org
> > > Subject: Re: [PATCH 2/2] ALSA: hda/realtek - Fix Lenovo Thinkpad X1
> > > Carbon 7th quirk value
> > >
> > > On 2020/02/11 08:40 +0100, Jaroslav Kysela wrote:
> > > [...]
> > > > >
> > > > > In summary, Node 0x17 DAC connection 0x3 offers the loudest max
> > > > > volume and the most detailed mixer controls. That connection is
> > > > > obtained with quirk ALC295_FIXUP_DISABLE_DAC3. Therefore, change
> > > > > the ThinkPad X1 Carbon 7th to use ALC295_FIXUP_DISABLE_DAC3.
> > > >
> > > > The volume split (individual volume control) will cause trouble
> > > > for the UCM volume control at the moment which is the target for
> > > > this device to get the digital microphone working. If there is no
> > > > possibility to share DAC, it would be probably more nice to join
> > > > the volume
> > > control in the driver.
> > > >
> > > > Have you tried to use 0x03 as source for all four speakers?
> > >
> > > Front speakers are fixed to 0x02. Node 0x14
> > >   Connection: 1
> > >      0x02
> > >
> > > >
> > > > Why PA handles the rear volume control with the current driver
> > > > code in the legacy ALSA driver? It should be handled like standard
> > > > stereo device. I'll check.
> > >
> > > The device comes up with "Analog Stereo Output" profile by default.
> > > I changed it to "Analog Surround 4.0 Output" to test controlling each
> channel individually:
> > >
> > > > > pavucontrol controls are reported with the device configured
> > > > > with the "Analog Surround 4.0 Output" profile.
> > >
> > > >
> > > > You should also test PA with UCM.
> > >
> > > Please let me know what do I need to test exactly? I'm not familiar with
> UCM.
> > >
> > > ------Please consider the environment before printing this e-mail.
> >

Patch
diff mbox series

diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c
index 05d44df2008e..3171da10123e 100644
--- a/sound/pci/hda/patch_realtek.c
+++ b/sound/pci/hda/patch_realtek.c
@@ -7268,7 +7268,7 @@  static const struct snd_pci_quirk alc269_fixup_tbl[] = {
 	SND_PCI_QUIRK(0x17aa, 0x224c, "Thinkpad", ALC298_FIXUP_TPT470_DOCK),
 	SND_PCI_QUIRK(0x17aa, 0x224d, "Thinkpad", ALC298_FIXUP_TPT470_DOCK),
 	SND_PCI_QUIRK(0x17aa, 0x225d, "Thinkpad T480", ALC269_FIXUP_LIMIT_INT_MIC_BOOST),
-	SND_PCI_QUIRK(0x17aa, 0x2292, "Thinkpad X1 Carbon 7th", ALC285_FIXUP_SPEAKER2_TO_DAC1),
+	SND_PCI_QUIRK(0x17aa, 0x2292, "Thinkpad X1 Carbon 7th", ALC295_FIXUP_DISABLE_DAC3),
 	SND_PCI_QUIRK(0x17aa, 0x30bb, "ThinkCentre AIO", ALC233_FIXUP_LENOVO_LINE2_MIC_HOTKEY),
 	SND_PCI_QUIRK(0x17aa, 0x30e2, "ThinkCentre AIO", ALC233_FIXUP_LENOVO_LINE2_MIC_HOTKEY),
 	SND_PCI_QUIRK(0x17aa, 0x310c, "ThinkCentre Station", ALC294_FIXUP_LENOVO_MIC_LOCATION),