Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'sound-6.3-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound
Pull sound fixes from Takashi Iwai:
"A collection of small fixes.
At this time, quite a few fixes for the old PCI drivers are found.
Although they are not regression fixes, I took these as they are
materials for stable kernels.
In addition, a couple of regression fixes and another couple of
HD-audio quirks are included"
* tag 'sound-6.3-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:
ALSA: hda/hdmi: disable KAE for Intel DG2
ALSA: hda/realtek: Add quirks for Lenovo Z13/Z16 Gen2
ALSA: hda: patch_realtek: add quirk for Asus N7601ZM
ALSA: firewire-tascam: add missing unwind goto in snd_tscm_stream_start_duplex()
ALSA: emu10k1: don't create old pass-through playback device on Audigy
ALSA: emu10k1: fix capture interrupt handler unlinking
ALSA: hda/sigmatel: fix S/PDIF out on Intel D*45* motherboards
ALSA: hda/sigmatel: add pin overrides for Intel DP45SG motherboard
ALSA: i2c/cs8427: fix iec958 mixer control deactivation
+56
-10
+1
-1
Documentation/sound/hd-audio/models.rst
+1
-1
Documentation/sound/hd-audio/models.rst
+1
-1
sound/firewire/tascam/tascam-stream.c
+1
-1
sound/firewire/tascam/tascam-stream.c
···
490
490
// packet is important for media clock recovery.
491
491
err = amdtp_domain_start(&tscm->domain, tx_init_skip_cycles, true, true);
492
492
if (err < 0)
493
-
return err;
493
+
goto error;
494
494
495
495
if (!amdtp_domain_wait_ready(&tscm->domain, READY_TIMEOUT_MS)) {
496
496
err = -ETIMEDOUT;
+5
-2
sound/i2c/cs8427.c
+5
-2
sound/i2c/cs8427.c
···
561
561
if (snd_BUG_ON(!cs8427))
562
562
return -ENXIO;
563
563
chip = cs8427->private_data;
564
-
if (active)
564
+
if (active) {
565
565
memcpy(chip->playback.pcm_status,
566
566
chip->playback.def_status, 24);
567
-
chip->playback.pcm_ctl->vd[0].access &= ~SNDRV_CTL_ELEM_ACCESS_INACTIVE;
567
+
chip->playback.pcm_ctl->vd[0].access &= ~SNDRV_CTL_ELEM_ACCESS_INACTIVE;
568
+
} else {
569
+
chip->playback.pcm_ctl->vd[0].access |= SNDRV_CTL_ELEM_ACCESS_INACTIVE;
570
+
}
568
571
snd_ctl_notify(cs8427->bus->card,
569
572
SNDRV_CTL_EVENT_MASK_VALUE | SNDRV_CTL_EVENT_MASK_INFO,
570
573
&chip->playback.pcm_ctl->id);
+9
-5
sound/pci/emu10k1/emupcm.c
+9
-5
sound/pci/emu10k1/emupcm.c
···
1236
1236
{
1237
1237
struct snd_emu10k1 *emu = snd_pcm_substream_chip(substream);
1238
1238
1239
-
emu->capture_interrupt = NULL;
1239
+
emu->capture_mic_interrupt = NULL;
1240
1240
emu->pcm_capture_mic_substream = NULL;
1241
1241
return 0;
1242
1242
}
···
1344
1344
{
1345
1345
struct snd_emu10k1 *emu = snd_pcm_substream_chip(substream);
1346
1346
1347
-
emu->capture_interrupt = NULL;
1347
+
emu->capture_efx_interrupt = NULL;
1348
1348
emu->pcm_capture_efx_substream = NULL;
1349
1349
return 0;
1350
1350
}
···
1781
1781
struct snd_kcontrol *kctl;
1782
1782
int err;
1783
1783
1784
-
err = snd_pcm_new(emu->card, "emu10k1 efx", device, 8, 1, &pcm);
1784
+
err = snd_pcm_new(emu->card, "emu10k1 efx", device, emu->audigy ? 0 : 8, 1, &pcm);
1785
1785
if (err < 0)
1786
1786
return err;
1787
1787
1788
1788
pcm->private_data = emu;
1789
1789
1790
-
snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_PLAYBACK, &snd_emu10k1_fx8010_playback_ops);
1790
+
if (!emu->audigy)
1791
+
snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_PLAYBACK, &snd_emu10k1_fx8010_playback_ops);
1791
1792
snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_CAPTURE, &snd_emu10k1_capture_efx_ops);
1792
1793
1793
1794
pcm->info_flags = 0;
1794
-
strcpy(pcm->name, "Multichannel Capture/PT Playback");
1795
+
if (emu->audigy)
1796
+
strcpy(pcm->name, "Multichannel Capture");
1797
+
else
1798
+
strcpy(pcm->name, "Multichannel Capture/PT Playback");
1795
1799
emu->pcm_efx = pcm;
1796
1800
1797
1801
/* EFX capture - record the "FXBUS2" channels, by default we connect the EXTINs
+1
-1
sound/pci/hda/patch_hdmi.c
+1
-1
sound/pci/hda/patch_hdmi.c
···
4604
4604
HDA_CODEC_ENTRY(0x80862815, "Alderlake HDMI", patch_i915_tgl_hdmi),
4605
4605
HDA_CODEC_ENTRY(0x80862816, "Rocketlake HDMI", patch_i915_tgl_hdmi),
4606
4606
HDA_CODEC_ENTRY(0x80862818, "Raptorlake HDMI", patch_i915_tgl_hdmi),
4607
-
HDA_CODEC_ENTRY(0x80862819, "DG2 HDMI", patch_i915_adlp_hdmi),
4607
+
HDA_CODEC_ENTRY(0x80862819, "DG2 HDMI", patch_i915_tgl_hdmi),
4608
4608
HDA_CODEC_ENTRY(0x8086281a, "Jasperlake HDMI", patch_i915_icl_hdmi),
4609
4609
HDA_CODEC_ENTRY(0x8086281b, "Elkhartlake HDMI", patch_i915_icl_hdmi),
4610
4610
HDA_CODEC_ENTRY(0x8086281c, "Alderlake-P HDMI", patch_i915_adlp_hdmi),
+29
sound/pci/hda/patch_realtek.c
+29
sound/pci/hda/patch_realtek.c
···
6960
6960
ALC269_FIXUP_DELL_M101Z,
6961
6961
ALC269_FIXUP_SKU_IGNORE,
6962
6962
ALC269_FIXUP_ASUS_G73JW,
6963
+
ALC269_FIXUP_ASUS_N7601ZM_PINS,
6964
+
ALC269_FIXUP_ASUS_N7601ZM,
6963
6965
ALC269_FIXUP_LENOVO_EAPD,
6964
6966
ALC275_FIXUP_SONY_HWEQ,
6965
6967
ALC275_FIXUP_SONY_DISABLE_AAMIX,
···
7257
7255
{ 0x17, 0x99130111 }, /* subwoofer */
7258
7256
{ }
7259
7257
}
7258
+
},
7259
+
[ALC269_FIXUP_ASUS_N7601ZM_PINS] = {
7260
+
.type = HDA_FIXUP_PINS,
7261
+
.v.pins = (const struct hda_pintbl[]) {
7262
+
{ 0x19, 0x03A11050 },
7263
+
{ 0x1a, 0x03A11C30 },
7264
+
{ 0x21, 0x03211420 },
7265
+
{ }
7266
+
}
7267
+
},
7268
+
[ALC269_FIXUP_ASUS_N7601ZM] = {
7269
+
.type = HDA_FIXUP_VERBS,
7270
+
.v.verbs = (const struct hda_verb[]) {
7271
+
{0x20, AC_VERB_SET_COEF_INDEX, 0x62},
7272
+
{0x20, AC_VERB_SET_PROC_COEF, 0xa007},
7273
+
{0x20, AC_VERB_SET_COEF_INDEX, 0x10},
7274
+
{0x20, AC_VERB_SET_PROC_COEF, 0x8420},
7275
+
{0x20, AC_VERB_SET_COEF_INDEX, 0x0f},
7276
+
{0x20, AC_VERB_SET_PROC_COEF, 0x7774},
7277
+
{ }
7278
+
},
7279
+
.chained = true,
7280
+
.chain_id = ALC269_FIXUP_ASUS_N7601ZM_PINS,
7260
7281
},
7261
7282
[ALC269_FIXUP_LENOVO_EAPD] = {
7262
7283
.type = HDA_FIXUP_VERBS,
···
9491
9466
SND_PCI_QUIRK(0x1043, 0x1271, "ASUS X430UN", ALC256_FIXUP_ASUS_MIC_NO_PRESENCE),
9492
9467
SND_PCI_QUIRK(0x1043, 0x1290, "ASUS X441SA", ALC233_FIXUP_EAPD_COEF_AND_MIC_NO_PRESENCE),
9493
9468
SND_PCI_QUIRK(0x1043, 0x12a0, "ASUS X441UV", ALC233_FIXUP_EAPD_COEF_AND_MIC_NO_PRESENCE),
9469
+
SND_PCI_QUIRK(0x1043, 0x12a3, "Asus N7691ZM", ALC269_FIXUP_ASUS_N7601ZM),
9494
9470
SND_PCI_QUIRK(0x1043, 0x12af, "ASUS UX582ZS", ALC245_FIXUP_CS35L41_SPI_2),
9495
9471
SND_PCI_QUIRK(0x1043, 0x12e0, "ASUS X541SA", ALC256_FIXUP_ASUS_MIC),
9496
9472
SND_PCI_QUIRK(0x1043, 0x12f0, "ASUS X541UV", ALC256_FIXUP_ASUS_MIC),
···
9689
9663
SND_PCI_QUIRK(0x17aa, 0x22f1, "Thinkpad", ALC287_FIXUP_CS35L41_I2C_2),
9690
9664
SND_PCI_QUIRK(0x17aa, 0x22f2, "Thinkpad", ALC287_FIXUP_CS35L41_I2C_2),
9691
9665
SND_PCI_QUIRK(0x17aa, 0x22f3, "Thinkpad", ALC287_FIXUP_CS35L41_I2C_2),
9666
+
SND_PCI_QUIRK(0x17aa, 0x2318, "Thinkpad Z13 Gen2", ALC287_FIXUP_CS35L41_I2C_2),
9667
+
SND_PCI_QUIRK(0x17aa, 0x2319, "Thinkpad Z16 Gen2", ALC287_FIXUP_CS35L41_I2C_2),
9668
+
SND_PCI_QUIRK(0x17aa, 0x231a, "Thinkpad Z16 Gen2", ALC287_FIXUP_CS35L41_I2C_2),
9692
9669
SND_PCI_QUIRK(0x17aa, 0x30bb, "ThinkCentre AIO", ALC233_FIXUP_LENOVO_LINE2_MIC_HOTKEY),
9693
9670
SND_PCI_QUIRK(0x17aa, 0x30e2, "ThinkCentre AIO", ALC233_FIXUP_LENOVO_LINE2_MIC_HOTKEY),
9694
9671
SND_PCI_QUIRK(0x17aa, 0x310c, "ThinkCentre Station", ALC294_FIXUP_LENOVO_MIC_LOCATION),
+10
sound/pci/hda/patch_sigmatel.c
+10
sound/pci/hda/patch_sigmatel.c
···
1707
1707
};
1708
1708
1709
1709
static const struct hda_pintbl ref92hd73xx_pin_configs[] = {
1710
+
// Port A-H
1710
1711
{ 0x0a, 0x02214030 },
1711
1712
{ 0x0b, 0x02a19040 },
1712
1713
{ 0x0c, 0x01a19020 },
···
1716
1715
{ 0x0f, 0x01014010 },
1717
1716
{ 0x10, 0x01014020 },
1718
1717
{ 0x11, 0x01014030 },
1718
+
// CD in
1719
1719
{ 0x12, 0x02319040 },
1720
+
// Digial Mic ins
1720
1721
{ 0x13, 0x90a000f0 },
1721
1722
{ 0x14, 0x90a000f0 },
1723
+
// Digital outs
1722
1724
{ 0x22, 0x01452050 },
1723
1725
{ 0x23, 0x01452050 },
1724
1726
{}
···
1762
1758
};
1763
1759
1764
1760
static const struct hda_pintbl intel_dg45id_pin_configs[] = {
1761
+
// Analog outputs
1765
1762
{ 0x0a, 0x02214230 },
1766
1763
{ 0x0b, 0x02A19240 },
1767
1764
{ 0x0c, 0x01013214 },
···
1770
1765
{ 0x0e, 0x01A19250 },
1771
1766
{ 0x0f, 0x01011212 },
1772
1767
{ 0x10, 0x01016211 },
1768
+
// Digital output
1769
+
{ 0x22, 0x01451380 },
1770
+
{ 0x23, 0x40f000f0 },
1773
1771
{}
1774
1772
};
1775
1773
···
1963
1955
"DFI LanParty", STAC_92HD73XX_REF),
1964
1956
SND_PCI_QUIRK(PCI_VENDOR_ID_DFI, 0x3101,
1965
1957
"DFI LanParty", STAC_92HD73XX_REF),
1958
+
SND_PCI_QUIRK(PCI_VENDOR_ID_INTEL, 0x5001,
1959
+
"Intel DP45SG", STAC_92HD73XX_INTEL),
1966
1960
SND_PCI_QUIRK(PCI_VENDOR_ID_INTEL, 0x5002,
1967
1961
"Intel DG45ID", STAC_92HD73XX_INTEL),
1968
1962
SND_PCI_QUIRK(PCI_VENDOR_ID_INTEL, 0x5003,