Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'sound-5.4-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound
Pull sound fixes from Takashi Iwai:
"Just a few small fixes for the usual suspect, HD- and USB-audio:
enablement of runtime PM for Nvidia due to the recent PCI changes, a
fix for potential hangs with recent HD-audio platforms, and the rest
device-specific quirks"
* tag 'sound-5.4-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:
ALSA: hda - Force runtime PM on Nvidia HDMI codecs
ALSA: hda/realtek - Enable headset mic on Asus MJ401TA
ALSA: usb-audio: Disable quirks for BOSS Katana amplifiers
ALSA: hdac: clear link output stream mapping
ALSA: hda/realtek: Reduce the Headphone static noise on XPS 9350/9360
+45
-3
+3
include/sound/hda_register.h
+3
include/sound/hda_register.h
···
264
264
#define AZX_REG_ML_LOUTPAY 0x20
265
265
#define AZX_REG_ML_LINPAY 0x30
266
266
267
+
/* bit0 is reserved, with BIT(1) mapping to stream1 */
268
+
#define ML_LOSIDV_STREAM_MASK 0xFFFE
269
+
267
270
#define ML_LCTL_SCF_MASK 0xF
268
271
#define AZX_MLCTL_SPA (0x1 << 16)
269
272
#define AZX_MLCTL_CPA (0x1 << 23)
+5
sound/hda/ext/hdac_ext_controller.c
+5
sound/hda/ext/hdac_ext_controller.c
···
271
271
ret = snd_hdac_ext_bus_link_power_up(link);
272
272
273
273
/*
274
+
* clear the register to invalidate all the output streams
275
+
*/
276
+
snd_hdac_updatew(link->ml_addr, AZX_REG_ML_LOSIDV,
277
+
ML_LOSIDV_STREAM_MASK, 0);
278
+
/*
274
279
* wait for 521usec for codec to report status
275
280
* HDA spec section 4.3 - Codec Discovery
276
281
*/
+2
sound/pci/hda/patch_hdmi.c
+2
sound/pci/hda/patch_hdmi.c
+32
-3
sound/pci/hda/patch_realtek.c
+32
-3
sound/pci/hda/patch_realtek.c
···
5358
5358
}
5359
5359
}
5360
5360
5361
+
static void alc256_fixup_dell_xps_13_headphone_noise2(struct hda_codec *codec,
5362
+
const struct hda_fixup *fix,
5363
+
int action)
5364
+
{
5365
+
if (action != HDA_FIXUP_ACT_PRE_PROBE)
5366
+
return;
5367
+
5368
+
snd_hda_codec_amp_stereo(codec, 0x1a, HDA_INPUT, 0, HDA_AMP_VOLMASK, 1);
5369
+
snd_hda_override_wcaps(codec, 0x1a, get_wcaps(codec, 0x1a) & ~AC_WCAP_IN_AMP);
5370
+
}
5371
+
5361
5372
static void alc269_fixup_limit_int_mic_boost(struct hda_codec *codec,
5362
5373
const struct hda_fixup *fix,
5363
5374
int action)
···
5833
5822
ALC298_FIXUP_DELL_AIO_MIC_NO_PRESENCE,
5834
5823
ALC275_FIXUP_DELL_XPS,
5835
5824
ALC256_FIXUP_DELL_XPS_13_HEADPHONE_NOISE,
5825
+
ALC256_FIXUP_DELL_XPS_13_HEADPHONE_NOISE2,
5836
5826
ALC293_FIXUP_LENOVO_SPK_NOISE,
5837
5827
ALC233_FIXUP_LENOVO_LINE2_MIC_HOTKEY,
5838
5828
ALC255_FIXUP_DELL_SPK_NOISE,
···
5881
5869
ALC225_FIXUP_WYSE_AUTO_MUTE,
5882
5870
ALC225_FIXUP_WYSE_DISABLE_MIC_VREF,
5883
5871
ALC286_FIXUP_ACER_AIO_HEADSET_MIC,
5872
+
ALC256_FIXUP_ASUS_HEADSET_MIC,
5884
5873
ALC256_FIXUP_ASUS_MIC_NO_PRESENCE,
5885
5874
ALC299_FIXUP_PREDATOR_SPK,
5886
5875
ALC294_FIXUP_ASUS_INTSPK_HEADSET_MIC,
···
6571
6558
.chained = true,
6572
6559
.chain_id = ALC255_FIXUP_DELL1_MIC_NO_PRESENCE
6573
6560
},
6561
+
[ALC256_FIXUP_DELL_XPS_13_HEADPHONE_NOISE2] = {
6562
+
.type = HDA_FIXUP_FUNC,
6563
+
.v.func = alc256_fixup_dell_xps_13_headphone_noise2,
6564
+
.chained = true,
6565
+
.chain_id = ALC256_FIXUP_DELL_XPS_13_HEADPHONE_NOISE
6566
+
},
6574
6567
[ALC293_FIXUP_LENOVO_SPK_NOISE] = {
6575
6568
.type = HDA_FIXUP_FUNC,
6576
6569
.v.func = alc_fixup_disable_aamix,
···
6931
6912
.chained = true,
6932
6913
.chain_id = ALC286_FIXUP_ACER_AIO_MIC_NO_PRESENCE
6933
6914
},
6915
+
[ALC256_FIXUP_ASUS_HEADSET_MIC] = {
6916
+
.type = HDA_FIXUP_PINS,
6917
+
.v.pins = (const struct hda_pintbl[]) {
6918
+
{ 0x19, 0x03a11020 }, /* headset mic with jack detect */
6919
+
{ }
6920
+
},
6921
+
.chained = true,
6922
+
.chain_id = ALC256_FIXUP_ASUS_HEADSET_MODE
6923
+
},
6934
6924
[ALC256_FIXUP_ASUS_MIC_NO_PRESENCE] = {
6935
6925
.type = HDA_FIXUP_PINS,
6936
6926
.v.pins = (const struct hda_pintbl[]) {
···
7029
7001
SND_PCI_QUIRK(0x1028, 0x06de, "Dell", ALC293_FIXUP_DISABLE_AAMIX_MULTIJACK),
7030
7002
SND_PCI_QUIRK(0x1028, 0x06df, "Dell", ALC293_FIXUP_DISABLE_AAMIX_MULTIJACK),
7031
7003
SND_PCI_QUIRK(0x1028, 0x06e0, "Dell", ALC293_FIXUP_DISABLE_AAMIX_MULTIJACK),
7032
-
SND_PCI_QUIRK(0x1028, 0x0704, "Dell XPS 13 9350", ALC256_FIXUP_DELL_XPS_13_HEADPHONE_NOISE),
7004
+
SND_PCI_QUIRK(0x1028, 0x0704, "Dell XPS 13 9350", ALC256_FIXUP_DELL_XPS_13_HEADPHONE_NOISE2),
7033
7005
SND_PCI_QUIRK(0x1028, 0x0706, "Dell Inspiron 7559", ALC256_FIXUP_DELL_INSPIRON_7559_SUBWOOFER),
7034
7006
SND_PCI_QUIRK(0x1028, 0x0725, "Dell Inspiron 3162", ALC255_FIXUP_DELL_SPK_NOISE),
7035
7007
SND_PCI_QUIRK(0x1028, 0x0738, "Dell Precision 5820", ALC269_FIXUP_NO_SHUTUP),
7036
-
SND_PCI_QUIRK(0x1028, 0x075b, "Dell XPS 13 9360", ALC256_FIXUP_DELL_XPS_13_HEADPHONE_NOISE),
7008
+
SND_PCI_QUIRK(0x1028, 0x075b, "Dell XPS 13 9360", ALC256_FIXUP_DELL_XPS_13_HEADPHONE_NOISE2),
7037
7009
SND_PCI_QUIRK(0x1028, 0x075c, "Dell XPS 27 7760", ALC298_FIXUP_SPK_VOLUME),
7038
7010
SND_PCI_QUIRK(0x1028, 0x075d, "Dell AIO", ALC298_FIXUP_SPK_VOLUME),
7039
7011
SND_PCI_QUIRK(0x1028, 0x07b0, "Dell Precision 7520", ALC295_FIXUP_DISABLE_DAC3),
7040
7012
SND_PCI_QUIRK(0x1028, 0x0798, "Dell Inspiron 17 7000 Gaming", ALC256_FIXUP_DELL_INSPIRON_7559_SUBWOOFER),
7041
7013
SND_PCI_QUIRK(0x1028, 0x080c, "Dell WYSE", ALC225_FIXUP_DELL_WYSE_MIC_NO_PRESENCE),
7042
-
SND_PCI_QUIRK(0x1028, 0x082a, "Dell XPS 13 9360", ALC256_FIXUP_DELL_XPS_13_HEADPHONE_NOISE),
7014
+
SND_PCI_QUIRK(0x1028, 0x082a, "Dell XPS 13 9360", ALC256_FIXUP_DELL_XPS_13_HEADPHONE_NOISE2),
7043
7015
SND_PCI_QUIRK(0x1028, 0x084b, "Dell", ALC274_FIXUP_DELL_AIO_LINEOUT_VERB),
7044
7016
SND_PCI_QUIRK(0x1028, 0x084e, "Dell", ALC274_FIXUP_DELL_AIO_LINEOUT_VERB),
7045
7017
SND_PCI_QUIRK(0x1028, 0x0871, "Dell Precision 3630", ALC255_FIXUP_DELL_HEADSET_MIC),
···
7136
7108
SND_PCI_QUIRK(0x1043, 0x1517, "Asus Zenbook UX31A", ALC269VB_FIXUP_ASUS_ZENBOOK_UX31A),
7137
7109
SND_PCI_QUIRK(0x1043, 0x16e3, "ASUS UX50", ALC269_FIXUP_STEREO_DMIC),
7138
7110
SND_PCI_QUIRK(0x1043, 0x17d1, "ASUS UX431FL", ALC294_FIXUP_ASUS_INTSPK_HEADSET_MIC),
7111
+
SND_PCI_QUIRK(0x1043, 0x18b1, "Asus MJ401TA", ALC256_FIXUP_ASUS_HEADSET_MIC),
7139
7112
SND_PCI_QUIRK(0x1043, 0x1a13, "Asus G73Jw", ALC269_FIXUP_ASUS_G73JW),
7140
7113
SND_PCI_QUIRK(0x1043, 0x1a30, "ASUS X705UD", ALC256_FIXUP_ASUS_MIC),
7141
7114
SND_PCI_QUIRK(0x1043, 0x1b13, "Asus U41SV", ALC269_FIXUP_INV_DMIC),