Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'sound-4.9-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound
Pull sound fixes from Takashi Iwai:
"This contains the usual stuff -- the fixups and quirks for HD-audio
and USB-audio, in addition to a bad regression fix in ALSA sequencer
timer since 4.8, and a trivial fix for asihpi PCI driver"
* tag 'sound-4.9-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:
ALSA: usb-audio: Add quirk for Syntek STK1160
ALSA: seq: Fix time account regression
ALSA: hda - Fix surround output pins for ASRock B150M mobo
ALSA: hda - Fix headset mic detection problem for two Dell laptops
ALSA: asihpi: fix kernel memory disclosure
ALSA: hda - Adding a new group of pin cfg into ALC295 pin quirk table
ALSA: hda - allow 40 bit DMA mask for NVidia devices
+52
-8
+2
-2
sound/core/seq/seq_timer.c
+2
-2
sound/core/seq/seq_timer.c
···
448
448
449
449
ktime_get_ts64(&tm);
450
450
tm = timespec64_sub(tm, tmr->last_update);
451
-
cur_time.tv_nsec = tm.tv_nsec;
452
-
cur_time.tv_sec = tm.tv_sec;
451
+
cur_time.tv_nsec += tm.tv_nsec;
452
+
cur_time.tv_sec += tm.tv_sec;
453
453
snd_seq_sanity_real_time(&cur_time);
454
454
}
455
455
spin_unlock_irqrestore(&tmr->lock, flags);
+1
-1
sound/pci/asihpi/hpioctl.c
+1
-1
sound/pci/asihpi/hpioctl.c
+5
-2
sound/pci/hda/hda_intel.c
+5
-2
sound/pci/hda/hda_intel.c
···
341
341
342
342
/* quirks for Nvidia */
343
343
#define AZX_DCAPS_PRESET_NVIDIA \
344
-
(AZX_DCAPS_NO_MSI | /*AZX_DCAPS_ALIGN_BUFSIZE |*/ \
345
-
AZX_DCAPS_NO_64BIT | AZX_DCAPS_CORBRP_SELF_CLEAR |\
344
+
(AZX_DCAPS_NO_MSI | AZX_DCAPS_CORBRP_SELF_CLEAR |\
346
345
AZX_DCAPS_SNOOP_TYPE(NVIDIA))
347
346
348
347
#define AZX_DCAPS_PRESET_CTHDA \
···
1714
1715
pci_dev_put(p_smbus);
1715
1716
}
1716
1717
}
1718
+
1719
+
/* NVidia hardware normally only supports up to 40 bits of DMA */
1720
+
if (chip->pci->vendor == PCI_VENDOR_ID_NVIDIA)
1721
+
dma_bits = 40;
1717
1722
1718
1723
/* disable 64bit DMA address on some devices */
1719
1724
if (chip->driver_caps & AZX_DCAPS_NO_64BIT) {
+27
-3
sound/pci/hda/patch_realtek.c
+27
-3
sound/pci/hda/patch_realtek.c
···
5811
5811
#define ALC295_STANDARD_PINS \
5812
5812
{0x12, 0xb7a60130}, \
5813
5813
{0x14, 0x90170110}, \
5814
-
{0x17, 0x21014020}, \
5815
-
{0x18, 0x21a19030}, \
5816
5814
{0x21, 0x04211020}
5817
5815
5818
5816
#define ALC298_STANDARD_PINS \
···
5857
5859
{0x1b, 0x02011020},
5858
5860
{0x21, 0x0221101f}),
5859
5861
SND_HDA_PIN_QUIRK(0x10ec0255, 0x1028, "Dell", ALC255_FIXUP_DELL1_MIC_NO_PRESENCE,
5862
+
{0x14, 0x90170110},
5863
+
{0x1b, 0x01011020},
5864
+
{0x21, 0x0221101f}),
5865
+
SND_HDA_PIN_QUIRK(0x10ec0255, 0x1028, "Dell", ALC255_FIXUP_DELL1_MIC_NO_PRESENCE,
5860
5866
{0x14, 0x90170130},
5861
5867
{0x1b, 0x01014020},
5868
+
{0x21, 0x0221103f}),
5869
+
SND_HDA_PIN_QUIRK(0x10ec0255, 0x1028, "Dell", ALC255_FIXUP_DELL1_MIC_NO_PRESENCE,
5870
+
{0x14, 0x90170130},
5871
+
{0x1b, 0x01011020},
5862
5872
{0x21, 0x0221103f}),
5863
5873
SND_HDA_PIN_QUIRK(0x10ec0255, 0x1028, "Dell", ALC255_FIXUP_DELL1_MIC_NO_PRESENCE,
5864
5874
{0x14, 0x90170130},
···
6045
6039
ALC292_STANDARD_PINS,
6046
6040
{0x13, 0x90a60140}),
6047
6041
SND_HDA_PIN_QUIRK(0x10ec0295, 0x1028, "Dell", ALC269_FIXUP_DELL1_MIC_NO_PRESENCE,
6048
-
ALC295_STANDARD_PINS),
6042
+
ALC295_STANDARD_PINS,
6043
+
{0x17, 0x21014020},
6044
+
{0x18, 0x21a19030}),
6045
+
SND_HDA_PIN_QUIRK(0x10ec0295, 0x1028, "Dell", ALC269_FIXUP_DELL1_MIC_NO_PRESENCE,
6046
+
ALC295_STANDARD_PINS,
6047
+
{0x17, 0x21014040},
6048
+
{0x18, 0x21a19050}),
6049
6049
SND_HDA_PIN_QUIRK(0x10ec0298, 0x1028, "Dell", ALC298_FIXUP_DELL1_MIC_NO_PRESENCE,
6050
6050
ALC298_STANDARD_PINS,
6051
6051
{0x17, 0x90170110}),
···
6625
6613
ALC891_FIXUP_HEADSET_MODE,
6626
6614
ALC891_FIXUP_DELL_MIC_NO_PRESENCE,
6627
6615
ALC662_FIXUP_ACER_VERITON,
6616
+
ALC892_FIXUP_ASROCK_MOBO,
6628
6617
};
6629
6618
6630
6619
static const struct hda_fixup alc662_fixups[] = {
···
6902
6889
{ }
6903
6890
}
6904
6891
},
6892
+
[ALC892_FIXUP_ASROCK_MOBO] = {
6893
+
.type = HDA_FIXUP_PINS,
6894
+
.v.pins = (const struct hda_pintbl[]) {
6895
+
{ 0x15, 0x40f000f0 }, /* disabled */
6896
+
{ 0x16, 0x40f000f0 }, /* disabled */
6897
+
{ 0x18, 0x01014011 }, /* LO */
6898
+
{ 0x1a, 0x01014012 }, /* LO */
6899
+
{ }
6900
+
}
6901
+
},
6905
6902
};
6906
6903
6907
6904
static const struct snd_pci_quirk alc662_fixup_tbl[] = {
···
6949
6926
SND_PCI_QUIRK(0x144d, 0xc051, "Samsung R720", ALC662_FIXUP_IDEAPAD),
6950
6927
SND_PCI_QUIRK(0x17aa, 0x38af, "Lenovo Ideapad Y550P", ALC662_FIXUP_IDEAPAD),
6951
6928
SND_PCI_QUIRK(0x17aa, 0x3a0d, "Lenovo Ideapad Y550", ALC662_FIXUP_IDEAPAD),
6929
+
SND_PCI_QUIRK(0x1849, 0x5892, "ASRock B150M", ALC892_FIXUP_ASROCK_MOBO),
6952
6930
SND_PCI_QUIRK(0x19da, 0xa130, "Zotac Z68", ALC662_FIXUP_ZOTAC_Z68),
6953
6931
SND_PCI_QUIRK(0x1b0a, 0x01b8, "ACER Veriton", ALC662_FIXUP_ACER_VERITON),
6954
6932
SND_PCI_QUIRK(0x1b35, 0x2206, "CZC P10T", ALC662_FIXUP_CZC_P10T),
+17
sound/usb/quirks-table.h
+17
sound/usb/quirks-table.h
···
2907
2907
AU0828_DEVICE(0x2040, 0x7213, "Hauppauge", "HVR-950Q"),
2908
2908
AU0828_DEVICE(0x2040, 0x7270, "Hauppauge", "HVR-950Q"),
2909
2909
2910
+
/* Syntek STK1160 */
2911
+
{
2912
+
.match_flags = USB_DEVICE_ID_MATCH_DEVICE |
2913
+
USB_DEVICE_ID_MATCH_INT_CLASS |
2914
+
USB_DEVICE_ID_MATCH_INT_SUBCLASS,
2915
+
.idVendor = 0x05e1,
2916
+
.idProduct = 0x0408,
2917
+
.bInterfaceClass = USB_CLASS_AUDIO,
2918
+
.bInterfaceSubClass = USB_SUBCLASS_AUDIOCONTROL,
2919
+
.driver_info = (unsigned long) &(const struct snd_usb_audio_quirk) {
2920
+
.vendor_name = "Syntek",
2921
+
.product_name = "STK1160",
2922
+
.ifnum = QUIRK_ANY_INTERFACE,
2923
+
.type = QUIRK_AUDIO_ALIGN_TRANSFER
2924
+
}
2925
+
},
2926
+
2910
2927
/* Digidesign Mbox */
2911
2928
{
2912
2929
/* Thanks to Clemens Ladisch <clemens@ladisch.de> */