forked from Minki/linux
sound fixes for 5.15-rc6
This contains quite a few device-specific fixes for usual HD- and USB-audio in addition to a couple of ALSA core fixes (a UAF fix in sequencer and a fix for a misplaced PCM 32bit compat ioctl). Nothing really stands out. -----BEGIN PGP SIGNATURE----- iQJCBAABCAAsFiEEIXTw5fNLNI7mMiVaLtJE4w1nLE8FAmFoIj8OHHRpd2FpQHN1 c2UuZGUACgkQLtJE4w1nLE9IrBAAvYoJvsUsZUwUSw0istIVaNiVBE4u91IBsNe/ W3WHVYAO4rLgZFfnasZ0kaPQ/BEwNhuk/vrJueZJuKU/kF8nCrYNX+nr8SB902Ws xdoZhROtIIh9B8NO0D6yeYlIByJ1dldlqn/4+ujzPnY7ISWGbJ2KIcusnSsCte+e 2qMhT2paxjuSUFPZiPbXDGKPYcWYwn0lf7XjLe5lVlTAmHW2wX2PDs0wppkIXcXZ C9Tkbz4SfCWh+HKrAd1AbYpP+OAF/9EetXGdBFDaZHex/AxNNi02588Fc84/Ofno XxlO5/Z9O5VYVflsEGnF6B18D+Xsj94TC5h598OVDPgi5z2UgpQZusWTLGBfn4O4 LUbM+NYbLeaWLAwKi6wdAWq1b4eKx5m9Uxysb40bumR38rfauCTedolB+8OpsaRs /kRjZmthgNXWDfjgAT6bPubwzpRdqscxA/SfY8lCObXVqgSdrmeFPCCqXYekKx4L Xazx0tyMxbpIAoSo+rWzErLntpQ4Rijtq4t3mLcfl1U7m3tkq/D2zBHrrxENJSuC TMko6F3maUSkGcGv+MMA2YO+J8juVEZ/vQFVT4C6PbOt1UnlpDQ8BHDxor+bVRpf txK0o+5WOkPySRik1IkLRhScF0QIYbZnrdG/zSbSkcsDmxNbt3F1Jb5EGLheBpA4 yvzncTk= =sxyi -----END PGP SIGNATURE----- Merge tag 'sound-5.15-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound Pull sound fixes from Takashi Iwai: "This contains quite a few device-specific fixes for usual HD- and USB-audio in addition to a couple of ALSA core fixes (a UAF fix in sequencer and a fix for a misplaced PCM 32bit compat ioctl). Nothing really stands out" * tag 'sound-5.15-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: ALSA: usb-audio: Add quirk for VF0770 ALSA: hda: avoid write to STATESTS if controller is in reset ALSA: hda/realtek: Fix the mic type detection issue for ASUS G551JW ALSA: pcm: Workaround for a wrong offset in SYNC_PTR compat ioctl ALSA: hda/realtek: Fix for quirk to enable speaker output on the Lenovo 13s Gen2 ALSA: hda: intel: Allow repeatedly probing on codec configuration errors ALSA: hda/realtek: Add quirk for TongFang PHxTxX1 ALSA: hda/realtek - ALC236 headset MIC recording issue ALSA: usb-audio: Enable rate validation for Scarlett devices ALSA: hda/realtek: Add quirk for Clevo X170KM-G ALSA: hda/realtek: Complete partial device name to avoid ambiguity ALSA: hda - Enable headphone mic on Dell Latitude laptops with ALC3254 ALSA: seq: Fix a potential UAF by wrong private_free call order ALSA: hda/realtek: Enable 4-speaker output for Dell Precision 5560 laptop ALSA: usb-audio: Fix a missing error check in scarlett gen2 mixer
This commit is contained in:
Linus Torvalds
commit
1626d9a35e
@ -224,6 +224,7 @@ struct hda_codec {
|
||||
#endif
|
||||
|
||||
/* misc flags */
|
||||
unsigned int configured:1; /* codec was configured */
|
||||
unsigned int in_freeing:1; /* being released */
|
||||
unsigned int registered:1; /* codec was registered */
|
||||
unsigned int display_power_control:1; /* needs display power */
|
||||
|
||||
@ -468,6 +468,76 @@ static int snd_pcm_ioctl_sync_ptr_x32(struct snd_pcm_substream *substream,
|
||||
}
|
||||
#endif /* CONFIG_X86_X32 */
|
||||
|
||||
#ifdef __BIG_ENDIAN
|
||||
typedef char __pad_before_u32[4];
|
||||
typedef char __pad_after_u32[0];
|
||||
#else
|
||||
typedef char __pad_before_u32[0];
|
||||
typedef char __pad_after_u32[4];
|
||||
#endif
|
||||
|
||||
/* PCM 2.0.15 API definition had a bug in mmap control; it puts the avail_min
|
||||
* at the wrong offset due to a typo in padding type.
|
||||
* The bug hits only 32bit.
|
||||
* A workaround for incorrect read/write is needed only in 32bit compat mode.
|
||||
*/
|
||||
struct __snd_pcm_mmap_control64_buggy {
|
||||
__pad_before_u32 __pad1;
|
||||
__u32 appl_ptr;
|
||||
__pad_before_u32 __pad2; /* SiC! here is the bug */
|
||||
__pad_before_u32 __pad3;
|
||||
__u32 avail_min;
|
||||
__pad_after_uframe __pad4;
|
||||
};
|
||||
|
||||
static int snd_pcm_ioctl_sync_ptr_buggy(struct snd_pcm_substream *substream,
|
||||
struct snd_pcm_sync_ptr __user *_sync_ptr)
|
||||
{
|
||||
struct snd_pcm_runtime *runtime = substream->runtime;
|
||||
struct snd_pcm_sync_ptr sync_ptr;
|
||||
struct __snd_pcm_mmap_control64_buggy *sync_cp;
|
||||
volatile struct snd_pcm_mmap_status *status;
|
||||
volatile struct snd_pcm_mmap_control *control;
|
||||
int err;
|
||||
|
||||
memset(&sync_ptr, 0, sizeof(sync_ptr));
|
||||
sync_cp = (struct __snd_pcm_mmap_control64_buggy *)&sync_ptr.c.control;
|
||||
if (get_user(sync_ptr.flags, (unsigned __user *)&(_sync_ptr->flags)))
|
||||
return -EFAULT;
|
||||
if (copy_from_user(sync_cp, &(_sync_ptr->c.control), sizeof(*sync_cp)))
|
||||
return -EFAULT;
|
||||
status = runtime->status;
|
||||
control = runtime->control;
|
||||
if (sync_ptr.flags & SNDRV_PCM_SYNC_PTR_HWSYNC) {
|
||||
err = snd_pcm_hwsync(substream);
|
||||
if (err < 0)
|
||||
return err;
|
||||
}
|
||||
snd_pcm_stream_lock_irq(substream);
|
||||
if (!(sync_ptr.flags & SNDRV_PCM_SYNC_PTR_APPL)) {
|
||||
err = pcm_lib_apply_appl_ptr(substream, sync_cp->appl_ptr);
|
||||
if (err < 0) {
|
||||
snd_pcm_stream_unlock_irq(substream);
|
||||
return err;
|
||||
}
|
||||
} else {
|
||||
sync_cp->appl_ptr = control->appl_ptr;
|
||||
}
|
||||
if (!(sync_ptr.flags & SNDRV_PCM_SYNC_PTR_AVAIL_MIN))
|
||||
control->avail_min = sync_cp->avail_min;
|
||||
else
|
||||
sync_cp->avail_min = control->avail_min;
|
||||
sync_ptr.s.status.state = status->state;
|
||||
sync_ptr.s.status.hw_ptr = status->hw_ptr;
|
||||
sync_ptr.s.status.tstamp = status->tstamp;
|
||||
sync_ptr.s.status.suspended_state = status->suspended_state;
|
||||
sync_ptr.s.status.audio_tstamp = status->audio_tstamp;
|
||||
snd_pcm_stream_unlock_irq(substream);
|
||||
if (copy_to_user(_sync_ptr, &sync_ptr, sizeof(sync_ptr)))
|
||||
return -EFAULT;
|
||||
return 0;
|
||||
}
|
||||
|
||||
/*
|
||||
*/
|
||||
enum {
|
||||
@ -537,7 +607,7 @@ static long snd_pcm_ioctl_compat(struct file *file, unsigned int cmd, unsigned l
|
||||
if (in_x32_syscall())
|
||||
return snd_pcm_ioctl_sync_ptr_x32(substream, argp);
|
||||
#endif /* CONFIG_X86_X32 */
|
||||
return snd_pcm_common_ioctl(file, substream, cmd, argp);
|
||||
return snd_pcm_ioctl_sync_ptr_buggy(substream, argp);
|
||||
case SNDRV_PCM_IOCTL_HW_REFINE32:
|
||||
return snd_pcm_ioctl_hw_params_compat(substream, 1, argp);
|
||||
case SNDRV_PCM_IOCTL_HW_PARAMS32:
|
||||
|
||||
@ -156,6 +156,8 @@ static int snd_seq_device_dev_free(struct snd_device *device)
|
||||
struct snd_seq_device *dev = device->device_data;
|
||||
|
||||
cancel_autoload_drivers();
|
||||
if (dev->private_free)
|
||||
dev->private_free(dev);
|
||||
put_device(&dev->dev);
|
||||
return 0;
|
||||
}
|
||||
@ -183,11 +185,7 @@ static int snd_seq_device_dev_disconnect(struct snd_device *device)
|
||||
|
||||
static void snd_seq_dev_release(struct device *dev)
|
||||
{
|
||||
struct snd_seq_device *sdev = to_seq_dev(dev);
|
||||
|
||||
if (sdev->private_free)
|
||||
sdev->private_free(sdev);
|
||||
kfree(sdev);
|
||||
kfree(to_seq_dev(dev));
|
||||
}
|
||||
|
||||
/*
|
||||
|
||||
@ -421,8 +421,9 @@ int snd_hdac_bus_reset_link(struct hdac_bus *bus, bool full_reset)
|
||||
if (!full_reset)
|
||||
goto skip_reset;
|
||||
|
||||
/* clear STATESTS */
|
||||
snd_hdac_chip_writew(bus, STATESTS, STATESTS_INT_MASK);
|
||||
/* clear STATESTS if not in reset */
|
||||
if (snd_hdac_chip_readb(bus, GCTL) & AZX_GCTL_RESET)
|
||||
snd_hdac_chip_writew(bus, STATESTS, STATESTS_INT_MASK);
|
||||
|
||||
/* reset controller */
|
||||
snd_hdac_bus_enter_link_reset(bus);
|
||||
|
||||
@ -298,29 +298,31 @@ int snd_hda_codec_configure(struct hda_codec *codec)
|
||||
{
|
||||
int err;
|
||||
|
||||
if (codec->configured)
|
||||
return 0;
|
||||
|
||||
if (is_generic_config(codec))
|
||||
codec->probe_id = HDA_CODEC_ID_GENERIC;
|
||||
else
|
||||
codec->probe_id = 0;
|
||||
|
||||
err = snd_hdac_device_register(&codec->core);
|
||||
if (err < 0)
|
||||
return err;
|
||||
if (!device_is_registered(&codec->core.dev)) {
|
||||
err = snd_hdac_device_register(&codec->core);
|
||||
if (err < 0)
|
||||
return err;
|
||||
}
|
||||
|
||||
if (!codec->preset)
|
||||
codec_bind_module(codec);
|
||||
if (!codec->preset) {
|
||||
err = codec_bind_generic(codec);
|
||||
if (err < 0) {
|
||||
codec_err(codec, "Unable to bind the codec\n");
|
||||
goto error;
|
||||
codec_dbg(codec, "Unable to bind the codec\n");
|
||||
return err;
|
||||
}
|
||||
}
|
||||
|
||||
codec->configured = 1;
|
||||
return 0;
|
||||
|
||||
error:
|
||||
snd_hdac_device_unregister(&codec->core);
|
||||
return err;
|
||||
}
|
||||
EXPORT_SYMBOL_GPL(snd_hda_codec_configure);
|
||||
|
||||
@ -791,6 +791,7 @@ void snd_hda_codec_cleanup_for_unbind(struct hda_codec *codec)
|
||||
snd_array_free(&codec->nids);
|
||||
remove_conn_list(codec);
|
||||
snd_hdac_regmap_exit(&codec->core);
|
||||
codec->configured = 0;
|
||||
}
|
||||
EXPORT_SYMBOL_GPL(snd_hda_codec_cleanup_for_unbind);
|
||||
|
||||
|
||||
@ -25,6 +25,7 @@
|
||||
#include <sound/core.h>
|
||||
#include <sound/initval.h>
|
||||
#include "hda_controller.h"
|
||||
#include "hda_local.h"
|
||||
|
||||
#define CREATE_TRACE_POINTS
|
||||
#include "hda_controller_trace.h"
|
||||
@ -1248,17 +1249,24 @@ EXPORT_SYMBOL_GPL(azx_probe_codecs);
|
||||
int azx_codec_configure(struct azx *chip)
|
||||
{
|
||||
struct hda_codec *codec, *next;
|
||||
int success = 0;
|
||||
|
||||
/* use _safe version here since snd_hda_codec_configure() deregisters
|
||||
* the device upon error and deletes itself from the bus list.
|
||||
*/
|
||||
list_for_each_codec_safe(codec, next, &chip->bus) {
|
||||
snd_hda_codec_configure(codec);
|
||||
list_for_each_codec(codec, &chip->bus) {
|
||||
if (!snd_hda_codec_configure(codec))
|
||||
success++;
|
||||
}
|
||||
|
||||
if (!azx_bus(chip)->num_codecs)
|
||||
return -ENODEV;
|
||||
return 0;
|
||||
if (success) {
|
||||
/* unregister failed codecs if any codec has been probed */
|
||||
list_for_each_codec_safe(codec, next, &chip->bus) {
|
||||
if (!codec->configured) {
|
||||
codec_err(codec, "Unable to configure, disabling\n");
|
||||
snd_hdac_device_unregister(&codec->core);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return success ? 0 : -ENODEV;
|
||||
}
|
||||
EXPORT_SYMBOL_GPL(azx_codec_configure);
|
||||
|
||||
|
||||
@ -41,7 +41,7 @@
|
||||
/* 24 unused */
|
||||
#define AZX_DCAPS_COUNT_LPIB_DELAY (1 << 25) /* Take LPIB as delay */
|
||||
#define AZX_DCAPS_PM_RUNTIME (1 << 26) /* runtime PM support */
|
||||
/* 27 unused */
|
||||
#define AZX_DCAPS_RETRY_PROBE (1 << 27) /* retry probe if no codec is configured */
|
||||
#define AZX_DCAPS_CORBRP_SELF_CLEAR (1 << 28) /* CORBRP clears itself after reset */
|
||||
#define AZX_DCAPS_NO_MSI64 (1 << 29) /* Stick to 32-bit MSIs */
|
||||
#define AZX_DCAPS_SEPARATE_STREAM_TAG (1 << 30) /* capture and playback use separate stream tag */
|
||||
|
||||
@ -307,7 +307,8 @@ enum {
|
||||
/* quirks for AMD SB */
|
||||
#define AZX_DCAPS_PRESET_AMD_SB \
|
||||
(AZX_DCAPS_NO_TCSEL | AZX_DCAPS_AMD_WORKAROUND |\
|
||||
AZX_DCAPS_SNOOP_TYPE(ATI) | AZX_DCAPS_PM_RUNTIME)
|
||||
AZX_DCAPS_SNOOP_TYPE(ATI) | AZX_DCAPS_PM_RUNTIME |\
|
||||
AZX_DCAPS_RETRY_PROBE)
|
||||
|
||||
/* quirks for Nvidia */
|
||||
#define AZX_DCAPS_PRESET_NVIDIA \
|
||||
@ -1723,7 +1724,7 @@ static void azx_check_snoop_available(struct azx *chip)
|
||||
|
||||
static void azx_probe_work(struct work_struct *work)
|
||||
{
|
||||
struct hda_intel *hda = container_of(work, struct hda_intel, probe_work);
|
||||
struct hda_intel *hda = container_of(work, struct hda_intel, probe_work.work);
|
||||
azx_probe_continue(&hda->chip);
|
||||
}
|
||||
|
||||
@ -1828,7 +1829,7 @@ static int azx_create(struct snd_card *card, struct pci_dev *pci,
|
||||
}
|
||||
|
||||
/* continue probing in work context as may trigger request module */
|
||||
INIT_WORK(&hda->probe_work, azx_probe_work);
|
||||
INIT_DELAYED_WORK(&hda->probe_work, azx_probe_work);
|
||||
|
||||
*rchip = chip;
|
||||
|
||||
@ -2142,7 +2143,7 @@ static int azx_probe(struct pci_dev *pci,
|
||||
#endif
|
||||
|
||||
if (schedule_probe)
|
||||
schedule_work(&hda->probe_work);
|
||||
schedule_delayed_work(&hda->probe_work, 0);
|
||||
|
||||
dev++;
|
||||
if (chip->disabled)
|
||||
@ -2228,6 +2229,11 @@ static int azx_probe_continue(struct azx *chip)
|
||||
int dev = chip->dev_index;
|
||||
int err;
|
||||
|
||||
if (chip->disabled || hda->init_failed)
|
||||
return -EIO;
|
||||
if (hda->probe_retry)
|
||||
goto probe_retry;
|
||||
|
||||
to_hda_bus(bus)->bus_probing = 1;
|
||||
hda->probe_continued = 1;
|
||||
|
||||
@ -2289,10 +2295,20 @@ static int azx_probe_continue(struct azx *chip)
|
||||
#endif
|
||||
}
|
||||
#endif
|
||||
|
||||
probe_retry:
|
||||
if (bus->codec_mask && !(probe_only[dev] & 1)) {
|
||||
err = azx_codec_configure(chip);
|
||||
if (err < 0)
|
||||
if (err) {
|
||||
if ((chip->driver_caps & AZX_DCAPS_RETRY_PROBE) &&
|
||||
++hda->probe_retry < 60) {
|
||||
schedule_delayed_work(&hda->probe_work,
|
||||
msecs_to_jiffies(1000));
|
||||
return 0; /* keep things up */
|
||||
}
|
||||
dev_err(chip->card->dev, "Cannot probe codecs, giving up\n");
|
||||
goto out_free;
|
||||
}
|
||||
}
|
||||
|
||||
err = snd_card_register(chip->card);
|
||||
@ -2322,6 +2338,7 @@ out_free:
|
||||
display_power(chip, false);
|
||||
complete_all(&hda->probe_wait);
|
||||
to_hda_bus(bus)->bus_probing = 0;
|
||||
hda->probe_retry = 0;
|
||||
return 0;
|
||||
}
|
||||
|
||||
@ -2347,7 +2364,7 @@ static void azx_remove(struct pci_dev *pci)
|
||||
* device during cancel_work_sync() call.
|
||||
*/
|
||||
device_unlock(&pci->dev);
|
||||
cancel_work_sync(&hda->probe_work);
|
||||
cancel_delayed_work_sync(&hda->probe_work);
|
||||
device_lock(&pci->dev);
|
||||
|
||||
snd_card_free(card);
|
||||
|
||||
@ -14,7 +14,7 @@ struct hda_intel {
|
||||
|
||||
/* sync probing */
|
||||
struct completion probe_wait;
|
||||
struct work_struct probe_work;
|
||||
struct delayed_work probe_work;
|
||||
|
||||
/* card list (for power_save trigger) */
|
||||
struct list_head list;
|
||||
@ -30,6 +30,8 @@ struct hda_intel {
|
||||
unsigned int freed:1; /* resources already released */
|
||||
|
||||
bool need_i915_power:1; /* the hda controller needs i915 power */
|
||||
|
||||
int probe_retry; /* being probe-retry */
|
||||
};
|
||||
|
||||
#endif
|
||||
|
||||
@ -526,6 +526,8 @@ static void alc_shutup_pins(struct hda_codec *codec)
|
||||
struct alc_spec *spec = codec->spec;
|
||||
|
||||
switch (codec->core.vendor_id) {
|
||||
case 0x10ec0236:
|
||||
case 0x10ec0256:
|
||||
case 0x10ec0283:
|
||||
case 0x10ec0286:
|
||||
case 0x10ec0288:
|
||||
@ -2537,7 +2539,8 @@ static const struct snd_pci_quirk alc882_fixup_tbl[] = {
|
||||
SND_PCI_QUIRK(0x1558, 0x67e1, "Clevo PB71[DE][CDF]", ALC1220_FIXUP_CLEVO_PB51ED_PINS),
|
||||
SND_PCI_QUIRK(0x1558, 0x67e5, "Clevo PC70D[PRS](?:-D|-G)?", ALC1220_FIXUP_CLEVO_PB51ED_PINS),
|
||||
SND_PCI_QUIRK(0x1558, 0x70d1, "Clevo PC70[ER][CDF]", ALC1220_FIXUP_CLEVO_PB51ED_PINS),
|
||||
SND_PCI_QUIRK(0x1558, 0x7714, "Clevo X170", ALC1220_FIXUP_CLEVO_PB51ED_PINS),
|
||||
SND_PCI_QUIRK(0x1558, 0x7714, "Clevo X170SM", ALC1220_FIXUP_CLEVO_PB51ED_PINS),
|
||||
SND_PCI_QUIRK(0x1558, 0x7715, "Clevo X170KM-G", ALC1220_FIXUP_CLEVO_PB51ED),
|
||||
SND_PCI_QUIRK(0x1558, 0x9501, "Clevo P950HR", ALC1220_FIXUP_CLEVO_P950),
|
||||
SND_PCI_QUIRK(0x1558, 0x9506, "Clevo P955HQ", ALC1220_FIXUP_CLEVO_P950),
|
||||
SND_PCI_QUIRK(0x1558, 0x950a, "Clevo P955H[PR]", ALC1220_FIXUP_CLEVO_P950),
|
||||
@ -3528,7 +3531,8 @@ static void alc256_shutup(struct hda_codec *codec)
|
||||
/* If disable 3k pulldown control for alc257, the Mic detection will not work correctly
|
||||
* when booting with headset plugged. So skip setting it for the codec alc257
|
||||
*/
|
||||
if (codec->core.vendor_id != 0x10ec0257)
|
||||
if (spec->codec_variant != ALC269_TYPE_ALC257 &&
|
||||
spec->codec_variant != ALC269_TYPE_ALC256)
|
||||
alc_update_coef_idx(codec, 0x46, 0, 3 << 12);
|
||||
|
||||
if (!spec->no_shutup_pins)
|
||||
@ -6449,6 +6453,24 @@ static void alc287_fixup_legion_15imhg05_speakers(struct hda_codec *codec,
|
||||
/* for alc285_fixup_ideapad_s740_coef() */
|
||||
#include "ideapad_s740_helper.c"
|
||||
|
||||
static void alc256_fixup_tongfang_reset_persistent_settings(struct hda_codec *codec,
|
||||
const struct hda_fixup *fix,
|
||||
int action)
|
||||
{
|
||||
/*
|
||||
* A certain other OS sets these coeffs to different values. On at least one TongFang
|
||||
* barebone these settings might survive even a cold reboot. So to restore a clean slate the
|
||||
* values are explicitly reset to default here. Without this, the external microphone is
|
||||
* always in a plugged-in state, while the internal microphone is always in an unplugged
|
||||
* state, breaking the ability to use the internal microphone.
|
||||
*/
|
||||
alc_write_coef_idx(codec, 0x24, 0x0000);
|
||||
alc_write_coef_idx(codec, 0x26, 0x0000);
|
||||
alc_write_coef_idx(codec, 0x29, 0x3000);
|
||||
alc_write_coef_idx(codec, 0x37, 0xfe05);
|
||||
alc_write_coef_idx(codec, 0x45, 0x5089);
|
||||
}
|
||||
|
||||
enum {
|
||||
ALC269_FIXUP_GPIO2,
|
||||
ALC269_FIXUP_SONY_VAIO,
|
||||
@ -6663,7 +6685,8 @@ enum {
|
||||
ALC287_FIXUP_LEGION_15IMHG05_SPEAKERS,
|
||||
ALC287_FIXUP_LEGION_15IMHG05_AUTOMUTE,
|
||||
ALC287_FIXUP_YOGA7_14ITL_SPEAKERS,
|
||||
ALC287_FIXUP_13S_GEN2_SPEAKERS
|
||||
ALC287_FIXUP_13S_GEN2_SPEAKERS,
|
||||
ALC256_FIXUP_TONGFANG_RESET_PERSISTENT_SETTINGS,
|
||||
};
|
||||
|
||||
static const struct hda_fixup alc269_fixups[] = {
|
||||
@ -8344,7 +8367,7 @@ static const struct hda_fixup alc269_fixups[] = {
|
||||
.v.verbs = (const struct hda_verb[]) {
|
||||
{ 0x20, AC_VERB_SET_COEF_INDEX, 0x24 },
|
||||
{ 0x20, AC_VERB_SET_PROC_COEF, 0x41 },
|
||||
{ 0x20, AC_VERB_SET_PROC_COEF, 0xb020 },
|
||||
{ 0x20, AC_VERB_SET_COEF_INDEX, 0x26 },
|
||||
{ 0x20, AC_VERB_SET_PROC_COEF, 0x2 },
|
||||
{ 0x20, AC_VERB_SET_PROC_COEF, 0x0 },
|
||||
{ 0x20, AC_VERB_SET_PROC_COEF, 0x0 },
|
||||
@ -8361,6 +8384,10 @@ static const struct hda_fixup alc269_fixups[] = {
|
||||
.chained = true,
|
||||
.chain_id = ALC269_FIXUP_HEADSET_MODE,
|
||||
},
|
||||
[ALC256_FIXUP_TONGFANG_RESET_PERSISTENT_SETTINGS] = {
|
||||
.type = HDA_FIXUP_FUNC,
|
||||
.v.func = alc256_fixup_tongfang_reset_persistent_settings,
|
||||
},
|
||||
};
|
||||
|
||||
static const struct snd_pci_quirk alc269_fixup_tbl[] = {
|
||||
@ -8452,6 +8479,9 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = {
|
||||
SND_PCI_QUIRK(0x1028, 0x0a30, "Dell", ALC236_FIXUP_DELL_AIO_HEADSET_MIC),
|
||||
SND_PCI_QUIRK(0x1028, 0x0a58, "Dell", ALC255_FIXUP_DELL_HEADSET_MIC),
|
||||
SND_PCI_QUIRK(0x1028, 0x0a61, "Dell XPS 15 9510", ALC289_FIXUP_DUAL_SPK),
|
||||
SND_PCI_QUIRK(0x1028, 0x0a62, "Dell Precision 5560", ALC289_FIXUP_DUAL_SPK),
|
||||
SND_PCI_QUIRK(0x1028, 0x0a9d, "Dell Latitude 5430", ALC269_FIXUP_DELL4_MIC_NO_PRESENCE),
|
||||
SND_PCI_QUIRK(0x1028, 0x0a9e, "Dell Latitude 5430", ALC269_FIXUP_DELL4_MIC_NO_PRESENCE),
|
||||
SND_PCI_QUIRK(0x1028, 0x164a, "Dell", ALC293_FIXUP_DELL1_MIC_NO_PRESENCE),
|
||||
SND_PCI_QUIRK(0x1028, 0x164b, "Dell", ALC293_FIXUP_DELL1_MIC_NO_PRESENCE),
|
||||
SND_PCI_QUIRK(0x103c, 0x1586, "HP", ALC269_FIXUP_HP_MUTE_LED_MIC2),
|
||||
@ -8789,6 +8819,7 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = {
|
||||
SND_PCI_QUIRK(0x1b7d, 0xa831, "Ordissimo EVE2 ", ALC269VB_FIXUP_ORDISSIMO_EVE2), /* Also known as Malata PC-B1303 */
|
||||
SND_PCI_QUIRK(0x1c06, 0x2013, "Lemote A1802", ALC269_FIXUP_LEMOTE_A1802),
|
||||
SND_PCI_QUIRK(0x1c06, 0x2015, "Lemote A190X", ALC269_FIXUP_LEMOTE_A190X),
|
||||
SND_PCI_QUIRK(0x1d05, 0x1132, "TongFang PHxTxX1", ALC256_FIXUP_TONGFANG_RESET_PERSISTENT_SETTINGS),
|
||||
SND_PCI_QUIRK(0x1d72, 0x1602, "RedmiBook", ALC255_FIXUP_XIAOMI_HEADSET_MIC),
|
||||
SND_PCI_QUIRK(0x1d72, 0x1701, "XiaomiNotebook Pro", ALC298_FIXUP_DELL1_MIC_NO_PRESENCE),
|
||||
SND_PCI_QUIRK(0x1d72, 0x1901, "RedmiBook 14", ALC256_FIXUP_ASUS_HEADSET_MIC),
|
||||
@ -10166,6 +10197,9 @@ enum {
|
||||
ALC671_FIXUP_HP_HEADSET_MIC2,
|
||||
ALC662_FIXUP_ACER_X2660G_HEADSET_MODE,
|
||||
ALC662_FIXUP_ACER_NITRO_HEADSET_MODE,
|
||||
ALC668_FIXUP_ASUS_NO_HEADSET_MIC,
|
||||
ALC668_FIXUP_HEADSET_MIC,
|
||||
ALC668_FIXUP_MIC_DET_COEF,
|
||||
};
|
||||
|
||||
static const struct hda_fixup alc662_fixups[] = {
|
||||
@ -10549,6 +10583,29 @@ static const struct hda_fixup alc662_fixups[] = {
|
||||
.chained = true,
|
||||
.chain_id = ALC662_FIXUP_USI_FUNC
|
||||
},
|
||||
[ALC668_FIXUP_ASUS_NO_HEADSET_MIC] = {
|
||||
.type = HDA_FIXUP_PINS,
|
||||
.v.pins = (const struct hda_pintbl[]) {
|
||||
{ 0x1b, 0x04a1112c },
|
||||
{ }
|
||||
},
|
||||
.chained = true,
|
||||
.chain_id = ALC668_FIXUP_HEADSET_MIC
|
||||
},
|
||||
[ALC668_FIXUP_HEADSET_MIC] = {
|
||||
.type = HDA_FIXUP_FUNC,
|
||||
.v.func = alc269_fixup_headset_mic,
|
||||
.chained = true,
|
||||
.chain_id = ALC668_FIXUP_MIC_DET_COEF
|
||||
},
|
||||
[ALC668_FIXUP_MIC_DET_COEF] = {
|
||||
.type = HDA_FIXUP_VERBS,
|
||||
.v.verbs = (const struct hda_verb[]) {
|
||||
{ 0x20, AC_VERB_SET_COEF_INDEX, 0x15 },
|
||||
{ 0x20, AC_VERB_SET_PROC_COEF, 0x0d60 },
|
||||
{}
|
||||
},
|
||||
},
|
||||
};
|
||||
|
||||
static const struct snd_pci_quirk alc662_fixup_tbl[] = {
|
||||
@ -10584,6 +10641,7 @@ static const struct snd_pci_quirk alc662_fixup_tbl[] = {
|
||||
SND_PCI_QUIRK(0x1043, 0x15a7, "ASUS UX51VZH", ALC662_FIXUP_BASS_16),
|
||||
SND_PCI_QUIRK(0x1043, 0x177d, "ASUS N551", ALC668_FIXUP_ASUS_Nx51),
|
||||
SND_PCI_QUIRK(0x1043, 0x17bd, "ASUS N751", ALC668_FIXUP_ASUS_Nx51),
|
||||
SND_PCI_QUIRK(0x1043, 0x185d, "ASUS G551JW", ALC668_FIXUP_ASUS_NO_HEADSET_MIC),
|
||||
SND_PCI_QUIRK(0x1043, 0x1963, "ASUS X71SL", ALC662_FIXUP_ASUS_MODE8),
|
||||
SND_PCI_QUIRK(0x1043, 0x1b73, "ASUS N55SF", ALC662_FIXUP_BASS_16),
|
||||
SND_PCI_QUIRK(0x1043, 0x1bf3, "ASUS N76VZ", ALC662_FIXUP_BASS_MODE4_CHMAP),
|
||||
|
||||
@ -2450,6 +2450,8 @@ static int scarlett2_update_monitor_other(struct usb_mixer_interface *mixer)
|
||||
err = scarlett2_usb_get_config(mixer,
|
||||
SCARLETT2_CONFIG_TALKBACK_MAP,
|
||||
1, &bitmap);
|
||||
if (err < 0)
|
||||
return err;
|
||||
for (i = 0; i < num_mixes; i++, bitmap >>= 1)
|
||||
private->talkback_map[i] = bitmap & 1;
|
||||
}
|
||||
|
||||
@ -77,6 +77,48 @@
|
||||
/* E-Mu 0204 USB */
|
||||
{ USB_DEVICE_VENDOR_SPEC(0x041e, 0x3f19) },
|
||||
|
||||
/*
|
||||
* Creative Technology, Ltd Live! Cam Sync HD [VF0770]
|
||||
* The device advertises 8 formats, but only a rate of 48kHz is honored by the
|
||||
* hardware and 24 bits give chopped audio, so only report the one working
|
||||
* combination.
|
||||
*/
|
||||
{
|
||||
USB_DEVICE(0x041e, 0x4095),
|
||||
.driver_info = (unsigned long) &(const struct snd_usb_audio_quirk) {
|
||||
.ifnum = QUIRK_ANY_INTERFACE,
|
||||
.type = QUIRK_COMPOSITE,
|
||||
.data = &(const struct snd_usb_audio_quirk[]) {
|
||||
{
|
||||
.ifnum = 2,
|
||||
.type = QUIRK_AUDIO_STANDARD_MIXER,
|
||||
},
|
||||
{
|
||||
.ifnum = 3,
|
||||
.type = QUIRK_AUDIO_FIXED_ENDPOINT,
|
||||
.data = &(const struct audioformat) {
|
||||
.formats = SNDRV_PCM_FMTBIT_S16_LE,
|
||||
.channels = 2,
|
||||
.fmt_bits = 16,
|
||||
.iface = 3,
|
||||
.altsetting = 4,
|
||||
.altset_idx = 4,
|
||||
.endpoint = 0x82,
|
||||
.ep_attr = 0x05,
|
||||
.rates = SNDRV_PCM_RATE_48000,
|
||||
.rate_min = 48000,
|
||||
.rate_max = 48000,
|
||||
.nr_rates = 1,
|
||||
.rate_table = (unsigned int[]) { 48000 },
|
||||
},
|
||||
},
|
||||
{
|
||||
.ifnum = -1
|
||||
},
|
||||
},
|
||||
},
|
||||
},
|
||||
|
||||
/*
|
||||
* HP Wireless Audio
|
||||
* When not ignored, causes instability issues for some users, forcing them to
|
||||
|
||||
@ -1900,6 +1900,8 @@ static const struct usb_audio_quirk_flags_table quirk_flags_table[] = {
|
||||
QUIRK_FLAG_CTL_MSG_DELAY | QUIRK_FLAG_IFACE_DELAY),
|
||||
VENDOR_FLG(0x07fd, /* MOTU */
|
||||
QUIRK_FLAG_VALIDATE_RATES),
|
||||
VENDOR_FLG(0x1235, /* Focusrite Novation */
|
||||
QUIRK_FLAG_VALIDATE_RATES),
|
||||
VENDOR_FLG(0x152a, /* Thesycon devices */
|
||||
QUIRK_FLAG_DSD_RAW),
|
||||
VENDOR_FLG(0x1de7, /* Phoenix Audio */
|
||||
|
||||
Loading…
Reference in New Issue
Block a user