Commit ddfe8031 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'sound-5.19-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound 

Pull sound fixes from Takashi Iwai:
 "All small changes, mostly device-specific:

   - A regression fix for PCM WC-page allocation on x86

   - A regression fix for i915 audio component binding

   - Fixes for (longstanding) beep handling bug

   - Runtime PM fixes for Intel LPE HDMI audio

   - A couple of pending FireWire fixes

   - Usual HD-audio and USB-audio quirks, new Intel dspconf entries"

* tag 'sound-5.19-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:
  ALSA: hda/realtek: Add quirk for Clevo NS50PU
  ALSA: hda: Fix discovery of i915 graphics PCI device
  ALSA: hda/via: Fix missing beep setup
  ALSA: hda/conexant: Fix missing beep setup
  ALSA: memalloc: Drop x86-specific hack for WC allocations
  ALSA: hda/realtek: Add quirk for Clevo PD70PNT
  ALSA: x86: intel_hdmi_audio: use pm_runtime_resume_and_get()
  ALSA: x86: intel_hdmi_audio: enable pm_runtime and set autosuspend delay
  ALSA: hda: intel-nhlt: remove use of __func__ in dev_dbg
  ALSA: hda: intel-dspcfg: use SOF for UpExtreme and UpExtreme11 boards
  firewire: convert sysfs sprintf/snprintf family to sysfs_emit
  firewire: cdev: fix potential leak of kernel stack due to uninitialized value
  ALSA: hda/realtek: Apply fixup for Lenovo Yoga Duet 7 properly
  ALSA: hda/realtek - ALC897 headset MIC no sound
  ALSA: usb-audio: US16x08: Move overflow check before array access
  ALSA: hda/realtek: Add mute LED quirk for HP Omen laptop
parents de5c208d 627ce0d6

drivers/firewire/core-cdev.c

+1 −1
Original line number Diff line number Diff line
@@ -1211,7 +1211,7 @@ static int ioctl_get_cycle_timer2(struct client *client, union ioctl_arg *arg) 
	struct fw_cdev_get_cycle_timer2 *a = &arg->get_cycle_timer2;

	struct fw_card *card = client->device->card;

	struct timespec64 ts = {0, 0};

	u32 cycle_time;

	u32 cycle_time = 0;

	int ret = 0;



	local_irq_disable();

drivers/firewire/core-device.c

+2 −4
Original line number Diff line number Diff line
@@ -372,8 +372,7 @@ static ssize_t rom_index_show(struct device *dev, 
	struct fw_device *device = fw_device(dev->parent);

	struct fw_unit *unit = fw_unit(dev);



	return snprintf(buf, PAGE_SIZE, "%d\n",

			(int)(unit->directory - device->config_rom));

	return sysfs_emit(buf, "%td\n", unit->directory - device->config_rom);

}



static struct device_attribute fw_unit_attributes[] = {
@@ -403,8 +402,7 @@ static ssize_t guid_show(struct device *dev, 
	int ret;



	down_read(&fw_device_rwsem);

	ret = snprintf(buf, PAGE_SIZE, "0x%08x%08x\n",

		       device->config_rom[3], device->config_rom[4]);

	ret = sysfs_emit(buf, "0x%08x%08x\n", device->config_rom[3], device->config_rom[4]);

	up_read(&fw_device_rwsem);



	return ret;

sound/core/memalloc.c

+1 −22
Original line number Diff line number Diff line
@@ -431,33 +431,17 @@ static const struct snd_malloc_ops snd_dma_iram_ops = { 
 */

static void *snd_dma_dev_alloc(struct snd_dma_buffer *dmab, size_t size)

{

	void *p;



	p = dma_alloc_coherent(dmab->dev.dev, size, &dmab->addr, DEFAULT_GFP);

#ifdef CONFIG_X86

	if (p && dmab->dev.type == SNDRV_DMA_TYPE_DEV_WC)

		set_memory_wc((unsigned long)p, PAGE_ALIGN(size) >> PAGE_SHIFT);

#endif

	return p;

	return dma_alloc_coherent(dmab->dev.dev, size, &dmab->addr, DEFAULT_GFP);

}



static void snd_dma_dev_free(struct snd_dma_buffer *dmab)

{

#ifdef CONFIG_X86

	if (dmab->dev.type == SNDRV_DMA_TYPE_DEV_WC)

		set_memory_wb((unsigned long)dmab->area,

			      PAGE_ALIGN(dmab->bytes) >> PAGE_SHIFT);

#endif

	dma_free_coherent(dmab->dev.dev, dmab->bytes, dmab->area, dmab->addr);

}



static int snd_dma_dev_mmap(struct snd_dma_buffer *dmab,

			    struct vm_area_struct *area)

{

#ifdef CONFIG_X86

	if (dmab->dev.type == SNDRV_DMA_TYPE_DEV_WC)

		area->vm_page_prot = pgprot_writecombine(area->vm_page_prot);

#endif

	return dma_mmap_coherent(dmab->dev.dev, area,

				 dmab->area, dmab->addr, dmab->bytes);

}
@@ -471,10 +455,6 @@ static const struct snd_malloc_ops snd_dma_dev_ops = { 
/*

 * Write-combined pages

 */

#ifdef CONFIG_X86

/* On x86, share the same ops as the standard dev ops */

#define snd_dma_wc_ops	snd_dma_dev_ops

#else /* CONFIG_X86 */

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);
@@ -497,7 +477,6 @@ static const struct snd_malloc_ops snd_dma_wc_ops = { 
	.free = snd_dma_wc_free,

	.mmap = snd_dma_wc_mmap,

};

#endif /* CONFIG_X86 */



#ifdef CONFIG_SND_DMA_SGBUF

static void *snd_dma_sg_fallback_alloc(struct snd_dma_buffer *dmab, size_t size);

sound/hda/hdac_i915.c

+6 −9
Original line number Diff line number Diff line
@@ -119,21 +119,18 @@ static int i915_component_master_match(struct device *dev, int subcomponent, 
/* check whether Intel graphics is present and reachable */

static int i915_gfx_present(struct pci_dev *hdac_pci)

{

	unsigned int class = PCI_BASE_CLASS_DISPLAY << 16;

	struct pci_dev *display_dev = NULL;

	bool match = false;



	do {

		display_dev = pci_get_class(class, display_dev);



		if (display_dev && display_dev->vendor == PCI_VENDOR_ID_INTEL &&

	for_each_pci_dev(display_dev) {

		if (display_dev->vendor == PCI_VENDOR_ID_INTEL &&

		    (display_dev->class >> 16) == PCI_BASE_CLASS_DISPLAY &&

		    connectivity_check(display_dev, hdac_pci)) {

			pci_dev_put(display_dev);

			match = true;

			return true;

		}

	}

	} while (!match && display_dev);



	return match;

	return false;

}



/**

sound/hda/intel-dsp-config.c

+12 −0
Original line number Diff line number Diff line
@@ -196,6 +196,12 @@ static const struct config_entry config_table[] = { 
					DMI_MATCH(DMI_SYS_VENDOR, "Google"),

				}

			},

			{

				.ident = "UP-WHL",

				.matches = {

					DMI_MATCH(DMI_SYS_VENDOR, "AAEON"),

				}

			},

			{}

		}

	},
@@ -358,6 +364,12 @@ static const struct config_entry config_table[] = { 
					DMI_MATCH(DMI_SYS_VENDOR, "Google"),

				}

			},

			{

				.ident = "UPX-TGL",

				.matches = {

					DMI_MATCH(DMI_SYS_VENDOR, "AAEON"),

				}

			},

			{}

		}

	},