sound fixes for 6.0-rc4
Just handful changes at this time. The only major change is the regression fix about the x86 WC-page buffer allocation. The rest are trivial data-race fixes for ALSA sequencer core, the possible out-of-bounds access fixes in the new ALSA control hash code, and a few device-specific workarounds and fixes. -----BEGIN PGP SIGNATURE----- iQJCBAABCAAsFiEEIXTw5fNLNI7mMiVaLtJE4w1nLE8FAmMQaOQOHHRpd2FpQHN1 c2UuZGUACgkQLtJE4w1nLE/5tBAAipTHkfJP7PBEmg4xYkrOP5CPH6epfsA5Pcxw Uyf6PX6ylvYK9SR2CyPLFXXWtyKrFXhhMp9J+36tO4tx5bH5lQ6HvkYfkRUNnq2S 2iHHctork6UmCmKYk6ChxngXoGqRWivFISqeEaU0kM2P1ke56y75gpDZfxstRVOD 6UIUavjAlosUh8QfxMMPaRIZG4KTKLLGraQ8EcZHAkyi2jnQevKY3VcGO8SkjBX0 nTLMcD5YaTURY8ZwaJcsd5hhbvmKehu2oMpDPyQR4ln+QcbYrYV2U9tWFGA065fa JK9z+wRC7h1iHgt7HjDZlnsVm+egNZ1cxs5KmJphC71YcceHKZm7fJYpQ3fnNvPB FJc4Esumx2CsAtj8NnDT82u+6GgQVrLqpNo+Cif1Pyu0Ek2wE8M6jZ4FM7xQaU1v +bFX91hqJbHc80hkK1oR/Pz+Op+OONA55kskKtCE3SZLvZm3EXD0ZXXeCGtj0ECw GxLRUqBd4KE3wOjHvwl2AZ4XZVedUIO2ddnyanPOKjH+lMFrW3uMvxOa0znd59Ym YGdlWVubJ4wEwnT3s1kZd0sOAykHTjrB4IBhCPysGpa0exaY5ZTE+rZ7VTu0Stav JXn3WtzYim7U5uUjQK8wqfe+gg42nHZ37KzQeJrUpv/Ybnh7SVEkuIwzLuFKKiyI RBZGGLs= =Ksu8 -----END PGP SIGNATURE----- Merge tag 'sound-6.0-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound Pull sound fixes from Takashi Iwai: "Just handful changes at this time. The only major change is the regression fix about the x86 WC-page buffer allocation. The rest are trivial data-race fixes for ALSA sequencer core, the possible out-of-bounds access fixes in the new ALSA control hash code, and a few device-specific workarounds and fixes" * tag 'sound-6.0-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: ALSA: usb-audio: Add quirk for LH Labs Geek Out HD Audio 1V5 ALSA: hda/realtek: Add speaker AMP init for Samsung laptops with ALC298 ALSA: control: Re-order bounds checking in get_ctl_id_hash() ALSA: control: Fix an out-of-bounds bug in get_ctl_id_hash() ALSA: hda: intel-nhlt: Correct the handling of fmt_config flexible array ALSA: seq: Fix data-race at module auto-loading ALSA: seq: oss: Fix data-race for max_midi_devs access ALSA: memalloc: Revive x86-specific WC page allocations again
This commit is contained in:
Linus Torvalds
commit
2880e1a175
@ -385,14 +385,14 @@ static bool elem_id_matches(const struct snd_kcontrol *kctl,
|
||||
#define MULTIPLIER 37
|
||||
static unsigned long get_ctl_id_hash(const struct snd_ctl_elem_id *id)
|
||||
{
|
||||
int i;
|
||||
unsigned long h;
|
||||
const unsigned char *p;
|
||||
|
||||
h = id->iface;
|
||||
h = MULTIPLIER * h + id->device;
|
||||
h = MULTIPLIER * h + id->subdevice;
|
||||
for (p = id->name; *p; p++)
|
||||
h = MULTIPLIER * h + *p;
|
||||
for (i = 0; i < SNDRV_CTL_ELEM_ID_NAME_MAXLEN && id->name[i]; i++)
|
||||
h = MULTIPLIER * h + id->name[i];
|
||||
h = MULTIPLIER * h + id->index;
|
||||
h &= LONG_MAX;
|
||||
return h;
|
||||
|
||||
@ -20,6 +20,13 @@
|
||||
|
||||
static const struct snd_malloc_ops *snd_dma_get_ops(struct snd_dma_buffer *dmab);
|
||||
|
||||
#ifdef CONFIG_SND_DMA_SGBUF
|
||||
static void *do_alloc_fallback_pages(struct device *dev, size_t size,
|
||||
dma_addr_t *addr, bool wc);
|
||||
static void do_free_fallback_pages(void *p, size_t size, bool wc);
|
||||
static void *snd_dma_sg_fallback_alloc(struct snd_dma_buffer *dmab, size_t size);
|
||||
#endif
|
||||
|
||||
/* a cast to gfp flag from the dev pointer; for CONTINUOUS and VMALLOC types */
|
||||
static inline gfp_t snd_mem_get_gfp_flags(const struct snd_dma_buffer *dmab,
|
||||
gfp_t default_gfp)
|
||||
@ -277,16 +284,21 @@ EXPORT_SYMBOL(snd_sgbuf_get_chunk_size);
|
||||
/*
|
||||
* Continuous pages allocator
|
||||
*/
|
||||
static void *snd_dma_continuous_alloc(struct snd_dma_buffer *dmab, size_t size)
|
||||
static void *do_alloc_pages(size_t size, dma_addr_t *addr, gfp_t gfp)
|
||||
{
|
||||
gfp_t gfp = snd_mem_get_gfp_flags(dmab, GFP_KERNEL);
|
||||
void *p = alloc_pages_exact(size, gfp);
|
||||
|
||||
if (p)
|
||||
dmab->addr = page_to_phys(virt_to_page(p));
|
||||
*addr = page_to_phys(virt_to_page(p));
|
||||
return p;
|
||||
}
|
||||
|
||||
static void *snd_dma_continuous_alloc(struct snd_dma_buffer *dmab, size_t size)
|
||||
{
|
||||
return do_alloc_pages(size, &dmab->addr,
|
||||
snd_mem_get_gfp_flags(dmab, GFP_KERNEL));
|
||||
}
|
||||
|
||||
static void snd_dma_continuous_free(struct snd_dma_buffer *dmab)
|
||||
{
|
||||
free_pages_exact(dmab->area, dmab->bytes);
|
||||
@ -463,6 +475,25 @@ static const struct snd_malloc_ops snd_dma_dev_ops = {
|
||||
/*
|
||||
* Write-combined pages
|
||||
*/
|
||||
/* x86-specific allocations */
|
||||
#ifdef CONFIG_SND_DMA_SGBUF
|
||||
static void *snd_dma_wc_alloc(struct snd_dma_buffer *dmab, size_t size)
|
||||
{
|
||||
return do_alloc_fallback_pages(dmab->dev.dev, size, &dmab->addr, true);
|
||||
}
|
||||
|
||||
static void snd_dma_wc_free(struct snd_dma_buffer *dmab)
|
||||
{
|
||||
do_free_fallback_pages(dmab->area, dmab->bytes, true);
|
||||
}
|
||||
|
||||
static int snd_dma_wc_mmap(struct snd_dma_buffer *dmab,
|
||||
struct vm_area_struct *area)
|
||||
{
|
||||
area->vm_page_prot = pgprot_writecombine(area->vm_page_prot);
|
||||
return snd_dma_continuous_mmap(dmab, area);
|
||||
}
|
||||
#else
|
||||
static void *snd_dma_wc_alloc(struct snd_dma_buffer *dmab, size_t size)
|
||||
{
|
||||
return dma_alloc_wc(dmab->dev.dev, size, &dmab->addr, DEFAULT_GFP);
|
||||
@ -479,6 +510,7 @@ static int snd_dma_wc_mmap(struct snd_dma_buffer *dmab,
|
||||
return dma_mmap_wc(dmab->dev.dev, area,
|
||||
dmab->area, dmab->addr, dmab->bytes);
|
||||
}
|
||||
#endif /* CONFIG_SND_DMA_SGBUF */
|
||||
|
||||
static const struct snd_malloc_ops snd_dma_wc_ops = {
|
||||
.alloc = snd_dma_wc_alloc,
|
||||
@ -486,10 +518,6 @@ static const struct snd_malloc_ops snd_dma_wc_ops = {
|
||||
.mmap = snd_dma_wc_mmap,
|
||||
};
|
||||
|
||||
#ifdef CONFIG_SND_DMA_SGBUF
|
||||
static void *snd_dma_sg_fallback_alloc(struct snd_dma_buffer *dmab, size_t size);
|
||||
#endif
|
||||
|
||||
/*
|
||||
* Non-contiguous pages allocator
|
||||
*/
|
||||
@ -669,6 +697,37 @@ static const struct snd_malloc_ops snd_dma_sg_wc_ops = {
|
||||
.get_chunk_size = snd_dma_noncontig_get_chunk_size,
|
||||
};
|
||||
|
||||
/* manual page allocations with wc setup */
|
||||
static void *do_alloc_fallback_pages(struct device *dev, size_t size,
|
||||
dma_addr_t *addr, bool wc)
|
||||
{
|
||||
gfp_t gfp = GFP_KERNEL | __GFP_NORETRY | __GFP_NOWARN;
|
||||
void *p;
|
||||
|
||||
again:
|
||||
p = do_alloc_pages(size, addr, gfp);
|
||||
if (!p || (*addr + size - 1) & ~dev->coherent_dma_mask) {
|
||||
if (IS_ENABLED(CONFIG_ZONE_DMA32) && !(gfp & GFP_DMA32)) {
|
||||
gfp |= GFP_DMA32;
|
||||
goto again;
|
||||
}
|
||||
if (IS_ENABLED(CONFIG_ZONE_DMA) && !(gfp & GFP_DMA)) {
|
||||
gfp = (gfp & ~GFP_DMA32) | GFP_DMA;
|
||||
goto again;
|
||||
}
|
||||
}
|
||||
if (p && wc)
|
||||
set_memory_wc((unsigned long)(p), size >> PAGE_SHIFT);
|
||||
return p;
|
||||
}
|
||||
|
||||
static void do_free_fallback_pages(void *p, size_t size, bool wc)
|
||||
{
|
||||
if (wc)
|
||||
set_memory_wb((unsigned long)(p), size >> PAGE_SHIFT);
|
||||
free_pages_exact(p, size);
|
||||
}
|
||||
|
||||
/* Fallback SG-buffer allocations for x86 */
|
||||
struct snd_dma_sg_fallback {
|
||||
size_t count;
|
||||
@ -679,14 +738,11 @@ struct snd_dma_sg_fallback {
|
||||
static void __snd_dma_sg_fallback_free(struct snd_dma_buffer *dmab,
|
||||
struct snd_dma_sg_fallback *sgbuf)
|
||||
{
|
||||
bool wc = dmab->dev.type == SNDRV_DMA_TYPE_DEV_WC_SG_FALLBACK;
|
||||
size_t i;
|
||||
|
||||
if (sgbuf->count && dmab->dev.type == SNDRV_DMA_TYPE_DEV_WC_SG_FALLBACK)
|
||||
set_pages_array_wb(sgbuf->pages, sgbuf->count);
|
||||
for (i = 0; i < sgbuf->count && sgbuf->pages[i]; i++)
|
||||
dma_free_coherent(dmab->dev.dev, PAGE_SIZE,
|
||||
page_address(sgbuf->pages[i]),
|
||||
sgbuf->addrs[i]);
|
||||
do_free_fallback_pages(page_address(sgbuf->pages[i]), PAGE_SIZE, wc);
|
||||
kvfree(sgbuf->pages);
|
||||
kvfree(sgbuf->addrs);
|
||||
kfree(sgbuf);
|
||||
@ -698,6 +754,7 @@ static void *snd_dma_sg_fallback_alloc(struct snd_dma_buffer *dmab, size_t size)
|
||||
struct page **pages;
|
||||
size_t i, count;
|
||||
void *p;
|
||||
bool wc = dmab->dev.type == SNDRV_DMA_TYPE_DEV_WC_SG_FALLBACK;
|
||||
|
||||
sgbuf = kzalloc(sizeof(*sgbuf), GFP_KERNEL);
|
||||
if (!sgbuf)
|
||||
@ -712,15 +769,13 @@ static void *snd_dma_sg_fallback_alloc(struct snd_dma_buffer *dmab, size_t size)
|
||||
goto error;
|
||||
|
||||
for (i = 0; i < count; sgbuf->count++, i++) {
|
||||
p = dma_alloc_coherent(dmab->dev.dev, PAGE_SIZE,
|
||||
&sgbuf->addrs[i], DEFAULT_GFP);
|
||||
p = do_alloc_fallback_pages(dmab->dev.dev, PAGE_SIZE,
|
||||
&sgbuf->addrs[i], wc);
|
||||
if (!p)
|
||||
goto error;
|
||||
sgbuf->pages[i] = virt_to_page(p);
|
||||
}
|
||||
|
||||
if (dmab->dev.type == SNDRV_DMA_TYPE_DEV_WC_SG_FALLBACK)
|
||||
set_pages_array_wc(pages, count);
|
||||
p = vmap(pages, count, VM_MAP, PAGE_KERNEL);
|
||||
if (!p)
|
||||
goto error;
|
||||
|
||||
@ -270,7 +270,9 @@ snd_seq_oss_midi_clear_all(void)
|
||||
void
|
||||
snd_seq_oss_midi_setup(struct seq_oss_devinfo *dp)
|
||||
{
|
||||
spin_lock_irq(®ister_lock);
|
||||
dp->max_mididev = max_midi_devs;
|
||||
spin_unlock_irq(®ister_lock);
|
||||
}
|
||||
|
||||
/*
|
||||
|
||||
@ -121,13 +121,13 @@ struct snd_seq_client *snd_seq_client_use_ptr(int clientid)
|
||||
spin_unlock_irqrestore(&clients_lock, flags);
|
||||
#ifdef CONFIG_MODULES
|
||||
if (!in_interrupt()) {
|
||||
static char client_requested[SNDRV_SEQ_GLOBAL_CLIENTS];
|
||||
static char card_requested[SNDRV_CARDS];
|
||||
static DECLARE_BITMAP(client_requested, SNDRV_SEQ_GLOBAL_CLIENTS);
|
||||
static DECLARE_BITMAP(card_requested, SNDRV_CARDS);
|
||||
|
||||
if (clientid < SNDRV_SEQ_GLOBAL_CLIENTS) {
|
||||
int idx;
|
||||
|
||||
if (!client_requested[clientid]) {
|
||||
client_requested[clientid] = 1;
|
||||
if (!test_and_set_bit(clientid, client_requested)) {
|
||||
for (idx = 0; idx < 15; idx++) {
|
||||
if (seq_client_load[idx] < 0)
|
||||
break;
|
||||
@ -142,10 +142,8 @@ struct snd_seq_client *snd_seq_client_use_ptr(int clientid)
|
||||
int card = (clientid - SNDRV_SEQ_GLOBAL_CLIENTS) /
|
||||
SNDRV_SEQ_CLIENTS_PER_CARD;
|
||||
if (card < snd_ecards_limit) {
|
||||
if (! card_requested[card]) {
|
||||
card_requested[card] = 1;
|
||||
if (!test_and_set_bit(card, card_requested))
|
||||
snd_request_card(card);
|
||||
}
|
||||
snd_seq_device_load_drivers();
|
||||
}
|
||||
}
|
||||
|
||||
@ -55,16 +55,22 @@ int intel_nhlt_get_dmic_geo(struct device *dev, struct nhlt_acpi_table *nhlt)
|
||||
|
||||
/* find max number of channels based on format_configuration */
|
||||
if (fmt_configs->fmt_count) {
|
||||
struct nhlt_fmt_cfg *fmt_cfg = fmt_configs->fmt_config;
|
||||
|
||||
dev_dbg(dev, "found %d format definitions\n",
|
||||
fmt_configs->fmt_count);
|
||||
|
||||
for (i = 0; i < fmt_configs->fmt_count; i++) {
|
||||
struct wav_fmt_ext *fmt_ext;
|
||||
|
||||
fmt_ext = &fmt_configs->fmt_config[i].fmt_ext;
|
||||
fmt_ext = &fmt_cfg->fmt_ext;
|
||||
|
||||
if (fmt_ext->fmt.channels > max_ch)
|
||||
max_ch = fmt_ext->fmt.channels;
|
||||
|
||||
/* Move to the next nhlt_fmt_cfg */
|
||||
fmt_cfg = (struct nhlt_fmt_cfg *)(fmt_cfg->config.caps +
|
||||
fmt_cfg->config.size);
|
||||
}
|
||||
dev_dbg(dev, "max channels found %d\n", max_ch);
|
||||
} else {
|
||||
|
||||
@ -4700,6 +4700,48 @@ static void alc236_fixup_hp_mute_led_micmute_vref(struct hda_codec *codec,
|
||||
alc236_fixup_hp_micmute_led_vref(codec, fix, action);
|
||||
}
|
||||
|
||||
static inline void alc298_samsung_write_coef_pack(struct hda_codec *codec,
|
||||
const unsigned short coefs[2])
|
||||
{
|
||||
alc_write_coef_idx(codec, 0x23, coefs[0]);
|
||||
alc_write_coef_idx(codec, 0x25, coefs[1]);
|
||||
alc_write_coef_idx(codec, 0x26, 0xb011);
|
||||
}
|
||||
|
||||
struct alc298_samsung_amp_desc {
|
||||
unsigned char nid;
|
||||
unsigned short init_seq[2][2];
|
||||
};
|
||||
|
||||
static void alc298_fixup_samsung_amp(struct hda_codec *codec,
|
||||
const struct hda_fixup *fix, int action)
|
||||
{
|
||||
int i, j;
|
||||
static const unsigned short init_seq[][2] = {
|
||||
{ 0x19, 0x00 }, { 0x20, 0xc0 }, { 0x22, 0x44 }, { 0x23, 0x08 },
|
||||
{ 0x24, 0x85 }, { 0x25, 0x41 }, { 0x35, 0x40 }, { 0x36, 0x01 },
|
||||
{ 0x38, 0x81 }, { 0x3a, 0x03 }, { 0x3b, 0x81 }, { 0x40, 0x3e },
|
||||
{ 0x41, 0x07 }, { 0x400, 0x1 }
|
||||
};
|
||||
static const struct alc298_samsung_amp_desc amps[] = {
|
||||
{ 0x3a, { { 0x18, 0x1 }, { 0x26, 0x0 } } },
|
||||
{ 0x39, { { 0x18, 0x2 }, { 0x26, 0x1 } } }
|
||||
};
|
||||
|
||||
if (action != HDA_FIXUP_ACT_INIT)
|
||||
return;
|
||||
|
||||
for (i = 0; i < ARRAY_SIZE(amps); i++) {
|
||||
alc_write_coef_idx(codec, 0x22, amps[i].nid);
|
||||
|
||||
for (j = 0; j < ARRAY_SIZE(amps[i].init_seq); j++)
|
||||
alc298_samsung_write_coef_pack(codec, amps[i].init_seq[j]);
|
||||
|
||||
for (j = 0; j < ARRAY_SIZE(init_seq); j++)
|
||||
alc298_samsung_write_coef_pack(codec, init_seq[j]);
|
||||
}
|
||||
}
|
||||
|
||||
#if IS_REACHABLE(CONFIG_INPUT)
|
||||
static void gpio2_mic_hotkey_event(struct hda_codec *codec,
|
||||
struct hda_jack_callback *event)
|
||||
@ -7030,6 +7072,7 @@ enum {
|
||||
ALC236_FIXUP_HP_GPIO_LED,
|
||||
ALC236_FIXUP_HP_MUTE_LED,
|
||||
ALC236_FIXUP_HP_MUTE_LED_MICMUTE_VREF,
|
||||
ALC298_FIXUP_SAMSUNG_AMP,
|
||||
ALC298_FIXUP_SAMSUNG_HEADPHONE_VERY_QUIET,
|
||||
ALC256_FIXUP_SAMSUNG_HEADPHONE_VERY_QUIET,
|
||||
ALC295_FIXUP_ASUS_MIC_NO_PRESENCE,
|
||||
@ -8396,6 +8439,12 @@ static const struct hda_fixup alc269_fixups[] = {
|
||||
.type = HDA_FIXUP_FUNC,
|
||||
.v.func = alc236_fixup_hp_mute_led_micmute_vref,
|
||||
},
|
||||
[ALC298_FIXUP_SAMSUNG_AMP] = {
|
||||
.type = HDA_FIXUP_FUNC,
|
||||
.v.func = alc298_fixup_samsung_amp,
|
||||
.chained = true,
|
||||
.chain_id = ALC298_FIXUP_SAMSUNG_HEADPHONE_VERY_QUIET
|
||||
},
|
||||
[ALC298_FIXUP_SAMSUNG_HEADPHONE_VERY_QUIET] = {
|
||||
.type = HDA_FIXUP_VERBS,
|
||||
.v.verbs = (const struct hda_verb[]) {
|
||||
@ -9342,13 +9391,13 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = {
|
||||
SND_PCI_QUIRK(0x10ec, 0x1254, "Intel Reference board", ALC295_FIXUP_CHROME_BOOK),
|
||||
SND_PCI_QUIRK(0x10f7, 0x8338, "Panasonic CF-SZ6", ALC269_FIXUP_HEADSET_MODE),
|
||||
SND_PCI_QUIRK(0x144d, 0xc109, "Samsung Ativ book 9 (NP900X3G)", ALC269_FIXUP_INV_DMIC),
|
||||
SND_PCI_QUIRK(0x144d, 0xc169, "Samsung Notebook 9 Pen (NP930SBE-K01US)", ALC298_FIXUP_SAMSUNG_HEADPHONE_VERY_QUIET),
|
||||
SND_PCI_QUIRK(0x144d, 0xc176, "Samsung Notebook 9 Pro (NP930MBE-K04US)", ALC298_FIXUP_SAMSUNG_HEADPHONE_VERY_QUIET),
|
||||
SND_PCI_QUIRK(0x144d, 0xc189, "Samsung Galaxy Flex Book (NT950QCG-X716)", ALC298_FIXUP_SAMSUNG_HEADPHONE_VERY_QUIET),
|
||||
SND_PCI_QUIRK(0x144d, 0xc18a, "Samsung Galaxy Book Ion (NP930XCJ-K01US)", ALC298_FIXUP_SAMSUNG_HEADPHONE_VERY_QUIET),
|
||||
SND_PCI_QUIRK(0x144d, 0xc169, "Samsung Notebook 9 Pen (NP930SBE-K01US)", ALC298_FIXUP_SAMSUNG_AMP),
|
||||
SND_PCI_QUIRK(0x144d, 0xc176, "Samsung Notebook 9 Pro (NP930MBE-K04US)", ALC298_FIXUP_SAMSUNG_AMP),
|
||||
SND_PCI_QUIRK(0x144d, 0xc189, "Samsung Galaxy Flex Book (NT950QCG-X716)", ALC298_FIXUP_SAMSUNG_AMP),
|
||||
SND_PCI_QUIRK(0x144d, 0xc18a, "Samsung Galaxy Book Ion (NP930XCJ-K01US)", ALC298_FIXUP_SAMSUNG_AMP),
|
||||
SND_PCI_QUIRK(0x144d, 0xc740, "Samsung Ativ book 8 (NP870Z5G)", ALC269_FIXUP_ATIV_BOOK_8),
|
||||
SND_PCI_QUIRK(0x144d, 0xc812, "Samsung Notebook Pen S (NT950SBE-X58)", ALC298_FIXUP_SAMSUNG_HEADPHONE_VERY_QUIET),
|
||||
SND_PCI_QUIRK(0x144d, 0xc830, "Samsung Galaxy Book Ion (NT950XCJ-X716A)", ALC298_FIXUP_SAMSUNG_HEADPHONE_VERY_QUIET),
|
||||
SND_PCI_QUIRK(0x144d, 0xc812, "Samsung Notebook Pen S (NT950SBE-X58)", ALC298_FIXUP_SAMSUNG_AMP),
|
||||
SND_PCI_QUIRK(0x144d, 0xc830, "Samsung Galaxy Book Ion (NT950XCJ-X716A)", ALC298_FIXUP_SAMSUNG_AMP),
|
||||
SND_PCI_QUIRK(0x144d, 0xc832, "Samsung Galaxy Book Flex Alpha (NP730QCJ)", ALC256_FIXUP_SAMSUNG_HEADPHONE_VERY_QUIET),
|
||||
SND_PCI_QUIRK(0x1458, 0xfa53, "Gigabyte BXBT-2807", ALC283_FIXUP_HEADSET_MIC),
|
||||
SND_PCI_QUIRK(0x1462, 0xb120, "MSI Cubi MS-B120", ALC283_FIXUP_HEADSET_MIC),
|
||||
@ -9716,7 +9765,7 @@ static const struct hda_model_fixup alc269_fixup_models[] = {
|
||||
{.id = ALC299_FIXUP_PREDATOR_SPK, .name = "predator-spk"},
|
||||
{.id = ALC298_FIXUP_HUAWEI_MBX_STEREO, .name = "huawei-mbx-stereo"},
|
||||
{.id = ALC256_FIXUP_MEDION_HEADSET_NO_PRESENCE, .name = "alc256-medion-headset"},
|
||||
{.id = ALC298_FIXUP_SAMSUNG_HEADPHONE_VERY_QUIET, .name = "alc298-samsung-headphone"},
|
||||
{.id = ALC298_FIXUP_SAMSUNG_AMP, .name = "alc298-samsung-amp"},
|
||||
{.id = ALC256_FIXUP_SAMSUNG_HEADPHONE_VERY_QUIET, .name = "alc256-samsung-headphone"},
|
||||
{.id = ALC255_FIXUP_XIAOMI_HEADSET_MIC, .name = "alc255-xiaomi-headset"},
|
||||
{.id = ALC274_FIXUP_HP_MIC, .name = "alc274-hp-mic-detect"},
|
||||
|
||||
@ -1903,6 +1903,8 @@ static const struct usb_audio_quirk_flags_table quirk_flags_table[] = {
|
||||
QUIRK_FLAG_SHARE_MEDIA_DEVICE | QUIRK_FLAG_ALIGN_TRANSFER),
|
||||
DEVICE_FLG(0x21b4, 0x0081, /* AudioQuest DragonFly */
|
||||
QUIRK_FLAG_GET_SAMPLE_RATE),
|
||||
DEVICE_FLG(0x2522, 0x0007, /* LH Labs Geek Out HD Audio 1V5 */
|
||||
QUIRK_FLAG_SET_IFACE_FIRST),
|
||||
DEVICE_FLG(0x2708, 0x0002, /* Audient iD14 */
|
||||
QUIRK_FLAG_IGNORE_CTL_ERROR),
|
||||
DEVICE_FLG(0x2912, 0x30c8, /* Audioengine D1 */
|
||||
|
||||
Loading…
Reference in New Issue
Block a user