Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'sound-6.7-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound
Pull sound fixes from Takashi Iwai:
"A collection of HD-audio quirks for TAS2781 codec and device-specific
workarounds"
* tag 'sound-6.7-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:
ALSA: hda/tas2781: reset the amp before component_add
ALSA: hda/tas2781: call cleanup functions only once
ALSA: hda/tas2781: handle missing EFI calibration data
ALSA: hda/tas2781: leave hda_component in usable state
ALSA: hda/realtek: Apply mute LED quirk for HP15-db
ALSA: hda/hdmi: add force-connect quirks for ASUSTeK Z170 variants
ALSA: hda/hdmi: add force-connect quirk for NUC5CPYB
+14
-11
+3
sound/pci/hda/patch_hdmi.c
+3
sound/pci/hda/patch_hdmi.c
···
1993
1993
SND_PCI_QUIRK(0x103c, 0x871a, "HP", 1),
1994
1994
SND_PCI_QUIRK(0x103c, 0x8711, "HP", 1),
1995
1995
SND_PCI_QUIRK(0x103c, 0x8715, "HP", 1),
1996
+
SND_PCI_QUIRK(0x1043, 0x86ae, "ASUS", 1), /* Z170 PRO */
1997
+
SND_PCI_QUIRK(0x1043, 0x86c7, "ASUS", 1), /* Z170M PLUS */
1996
1998
SND_PCI_QUIRK(0x1462, 0xec94, "MS-7C94", 1),
1999
+
SND_PCI_QUIRK(0x8086, 0x2060, "Intel NUC5CPYB", 1),
1997
2000
SND_PCI_QUIRK(0x8086, 0x2081, "Intel NUC 10", 1),
1998
2001
{}
1999
2002
};
+1
sound/pci/hda/patch_realtek.c
+1
sound/pci/hda/patch_realtek.c
···
9795
9795
SND_PCI_QUIRK(0x103c, 0x83b9, "HP Spectre x360", ALC269_FIXUP_HP_MUTE_LED_MIC3),
9796
9796
SND_PCI_QUIRK(0x103c, 0x841c, "HP Pavilion 15-CK0xx", ALC269_FIXUP_HP_MUTE_LED_MIC3),
9797
9797
SND_PCI_QUIRK(0x103c, 0x8497, "HP Envy x360", ALC269_FIXUP_HP_MUTE_LED_MIC3),
9798
+
SND_PCI_QUIRK(0x103c, 0x84ae, "HP 15-db0403ng", ALC236_FIXUP_HP_MUTE_LED_COEFBIT2),
9798
9799
SND_PCI_QUIRK(0x103c, 0x84da, "HP OMEN dc0019-ur", ALC295_FIXUP_HP_OMEN),
9799
9800
SND_PCI_QUIRK(0x103c, 0x84e7, "HP Pavilion 15", ALC269_FIXUP_HP_MUTE_LED_MIC3),
9800
9801
SND_PCI_QUIRK(0x103c, 0x8519, "HP Spectre x360 15-df0xxx", ALC285_FIXUP_HP_SPECTRE_X360),
+10
-11
sound/pci/hda/tas2781_hda_i2c.c
+10
-11
sound/pci/hda/tas2781_hda_i2c.c
···
455
455
status = efi.get_variable(efi_name, &efi_guid, &attr,
456
456
&tas_priv->cali_data.total_sz,
457
457
tas_priv->cali_data.data);
458
-
if (status != EFI_SUCCESS)
459
-
return -EINVAL;
460
458
}
459
+
if (status != EFI_SUCCESS)
460
+
return -EINVAL;
461
461
462
462
tmp_val = (unsigned int *)tas_priv->cali_data.data;
463
463
···
550
550
tas2781_save_calibration(tas_priv);
551
551
552
552
out:
553
-
if (tas_priv->fw_state == TASDEVICE_DSP_FW_FAIL) {
554
-
/*If DSP FW fail, kcontrol won't be created */
555
-
tasdevice_config_info_remove(tas_priv);
556
-
tasdevice_dsp_remove(tas_priv);
557
-
}
558
553
mutex_unlock(&tas_priv->codec_lock);
559
554
if (fmw)
560
555
release_firmware(fmw);
···
607
612
{
608
613
struct tasdevice_priv *tas_priv = dev_get_drvdata(dev);
609
614
struct hda_component *comps = master_data;
615
+
comps = &comps[tas_priv->index];
610
616
611
-
if (comps[tas_priv->index].dev == dev)
612
-
memset(&comps[tas_priv->index], 0, sizeof(*comps));
617
+
if (comps->dev == dev) {
618
+
comps->dev = NULL;
619
+
memset(comps->name, 0, sizeof(comps->name));
620
+
comps->playback_hook = NULL;
621
+
}
613
622
614
623
tasdevice_config_info_remove(tas_priv);
615
624
tasdevice_dsp_remove(tas_priv);
···
674
675
675
676
pm_runtime_put_autosuspend(tas_priv->dev);
676
677
678
+
tas2781_reset(tas_priv);
679
+
677
680
ret = component_add(tas_priv->dev, &tas2781_hda_comp_ops);
678
681
if (ret) {
679
682
dev_err(tas_priv->dev, "Register component failed: %d\n", ret);
680
683
pm_runtime_disable(tas_priv->dev);
681
-
goto err;
682
684
}
683
685
684
-
tas2781_reset(tas_priv);
685
686
err:
686
687
if (ret)
687
688
tas2781_hda_remove(&clt->dev);