Commit 86edf52e authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull sound fixes from Takashi Iwai:
 "A collection of small changes, nothing intrusive:

   - remaining tasklet API conversions, now all sound stuff have been
     converted

   - a few HD-audio and USB-audio quirks and minor fixes

   - FireWire Tascam and Digi00xx fixes

   - drop a kernel WARNING from PCM OSS for syzkaller"

* tag 'sound-5.9-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: (29 commits)
  ALSA: hda/realtek - Improved routing for Thinkpad X1 7th/8th Gen
  ALSA: hda: use consistent HDAudio spelling in comments/docs
  ALSA: hda: add dev_dbg log when driver is not selected
  ALSA: hda: fix a runtime pm issue in SOF when integrated GPU is disabled
  ALSA: hda: hdmi - add Rocketlake support
  ALSA: ua101: convert tasklets to use new tasklet_setup() API
  ALSA: usb-audio: convert tasklets to use new tasklet_setup() API
  ASoC: txx9: convert tasklets to use new tasklet_setup() API
  ASoC: siu: convert tasklets to use new tasklet_setup() API
  ASoC: fsl_esai: convert tasklets to use new tasklet_setup() API
  ALSA: hdsp: convert tasklets to use new tasklet_setup() API
  ALSA: riptide: convert tasklets to use new tasklet_setup() API
  ALSA: pci/asihpi: convert tasklets to use new tasklet_setup() API
  ALSA: firewire: convert tasklets to use new tasklet_setup() API
  ALSA: core: convert tasklets to use new tasklet_setup() API
  ALSA: pcm: oss: Remove superfluous WARN_ON() for mulaw sanity check
  ALSA: hda - Fix silent audio output and corrupted input on MSI X570-A PRO
  ALSA: hda/hdmi: always check pin power status in i915 pin fixup
  ALSA: hda/realtek: Add quirk for Samsung Galaxy Book Ion NT950XCJ-X716A
  ALSA: usb-audio: Add basic capture support for Pioneer DJ DJM-250MK2
  ...
parents cf85f5de 6a6660d0

Documentation/sound/cards/audigy-mixer.rst

+1 −1
Original line number Diff line number Diff line
@@ -332,7 +332,7 @@ WO 9901953 (A1) 




US Patents (https://www.uspto.gov/)

----------------------------------

-----------------------------------



US 5925841

	Digital Sampling Instrument employing cache memory (Jul. 20, 1999)

Documentation/sound/cards/sb-live-mixer.rst

+1 −1
Original line number Diff line number Diff line
@@ -337,7 +337,7 @@ WO 9901953 (A1) 




US Patents (https://www.uspto.gov/)

----------------------------------

-----------------------------------



US 5925841

	Digital Sampling Instrument employing cache memory (Jul. 20, 1999)

Documentation/sound/designs/timestamping.rst

+1 −1
Original line number Diff line number Diff line
@@ -143,7 +143,7 @@ timestamp shows when the information is put together by the driver 
before returning from the ``STATUS`` and ``STATUS_EXT`` ioctl. in most cases

this driver_timestamp will be identical to the regular system tstamp.



Examples of typestamping with HDaudio:

Examples of timestamping with HDAudio:



1. DMA timestamp, no compensation for DMA+analog delay

::

sound/core/oss/mulaw.c

+2 −2
Original line number Diff line number Diff line
@@ -329,8 +329,8 @@ int snd_pcm_plugin_build_mulaw(struct snd_pcm_substream *plug, 
		snd_BUG();

		return -EINVAL;

	}

	if (snd_BUG_ON(!snd_pcm_format_linear(format->format)))

		return -ENXIO;

	if (!snd_pcm_format_linear(format->format))

		return -EINVAL;



	err = snd_pcm_plugin_build(plug, "Mu-Law<->linear conversion",

				   src_format, dst_format,

sound/core/timer.c

+3 −4
Original line number Diff line number Diff line
@@ -816,9 +816,9 @@ static void snd_timer_clear_callbacks(struct snd_timer *timer, 
 * timer tasklet

 *

 */

static void snd_timer_tasklet(unsigned long arg)

static void snd_timer_tasklet(struct tasklet_struct *t)

{

	struct snd_timer *timer = (struct snd_timer *) arg;

	struct snd_timer *timer = from_tasklet(timer, t, task_queue);

	unsigned long flags;



	if (timer->card && timer->card->shutdown) {
@@ -967,8 +967,7 @@ int snd_timer_new(struct snd_card *card, char *id, struct snd_timer_id *tid, 
	INIT_LIST_HEAD(&timer->ack_list_head);

	INIT_LIST_HEAD(&timer->sack_list_head);

	spin_lock_init(&timer->lock);

	tasklet_init(&timer->task_queue, snd_timer_tasklet,

		     (unsigned long)timer);

	tasklet_setup(&timer->task_queue, snd_timer_tasklet);

	timer->max_instances = 1000; /* default limit per timer */

	if (card != NULL) {

		timer->module = card->module;

CRA Git | Maintained and supported by SUSTech CRA and CCSE