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

Merge tag 'sound-6.2-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound 

Pull more sound updates from Takashi Iwai:
 "A few more updates for 6.2: most of changes are about ASoC
  device-specific fixes.

   - Lots of ASoC Intel AVS extensions and refactoring

   - Quirks for ASoC Intel SOF as well as regression fixes

   - ASoC Mediatek and Rockchip fixes

   - Intel HD-audio HDMI workarounds

   - Usual HD- and USB-audio device-specific quirks"

* tag 'sound-6.2-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: (54 commits)
  ALSA: usb-audio: Add new quirk FIXED_RATE for JBL Quantum810 Wireless
  ALSA: azt3328: Remove the unused function snd_azf3328_codec_outl()
  ASoC: lochnagar: Fix unused lochnagar_of_match warning
  ASoC: Intel: Add HP Stream 8 to bytcr_rt5640.c
  ASoC: SOF: mediatek: initialize panic_info to zero
  ASoC: rt5670: Remove unbalanced pm_runtime_put()
  ASoC: Intel: bytcr_rt5640: Add quirk for the Advantech MICA-071 tablet
  ASoC: Intel: soc-acpi: update codec addr on 0C11/0C4F product
  ASoC: rockchip: spdif: Add missing clk_disable_unprepare() in rk_spdif_runtime_resume()
  ASoC: wm8994: Fix potential deadlock
  ASoC: mediatek: mt8195: add sof be ops to check audio active
  ASoC: SOF: Revert: "core: unregister clients and machine drivers in .shutdown"
  ASoC: SOF: Intel: pci-tgl: unblock S5 entry if DMA stop has failed"
  ALSA: hda/hdmi: fix stream-id config keep-alive for rt suspend
  ALSA: hda/hdmi: set default audio parameters for KAE silent-stream
  ALSA: hda/hdmi: fix i915 silent stream programming flow
  ALSA: hda: Error out if invalid stream is being setup
  ASoC: dt-bindings: fsl-sai: Reinstate i.MX93 SAI compatible string
  ASoC: soc-pcm.c: Clear DAIs parameters after stream_active is updated
  ASoC: codecs: wcd-clsh: Remove the unused function
  ...
parents 55c7d6a9 6bf5f9a8

Documentation/devicetree/bindings/sound/fsl,sai.yaml

+1 −0
Original line number Diff line number Diff line
@@ -38,6 +38,7 @@ properties: 
              - fsl,imx8mq-sai

              - fsl,imx8qm-sai

              - fsl,imx8ulp-sai

              - fsl,imx93-sai

              - fsl,vf610-sai



  reg:

include/sound/hda_codec.h

+1 −0
Original line number Diff line number Diff line
@@ -258,6 +258,7 @@ struct hda_codec { 
	unsigned int link_down_at_suspend:1; /* link down at runtime suspend */

	unsigned int relaxed_resume:1;	/* don't resume forcibly for jack */

	unsigned int forced_resume:1; /* forced resume for jack */

	unsigned int no_stream_clean_at_suspend:1; /* do not clean streams at suspend */



#ifdef CONFIG_PM

	unsigned long power_on_acct;

include/sound/hdaudio_ext.h

+2 −0
Original line number Diff line number Diff line
@@ -75,6 +75,8 @@ struct hdac_ext_stream *snd_hdac_ext_stream_assign(struct hdac_bus *bus, 
					   struct snd_pcm_substream *substream,

					   int type);

void snd_hdac_ext_stream_release(struct hdac_ext_stream *hext_stream, int type);

struct hdac_ext_stream *snd_hdac_ext_cstream_assign(struct hdac_bus *bus,

						    struct snd_compr_stream *cstream);

void snd_hdac_ext_stream_decouple_locked(struct hdac_bus *bus,

					 struct hdac_ext_stream *hext_stream, bool decouple);

void snd_hdac_ext_stream_decouple(struct hdac_bus *bus,

sound/hda/ext/hdac_ext_stream.c

+41 −0
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ 
#include <sound/pcm.h>

#include <sound/hda_register.h>

#include <sound/hdaudio_ext.h>

#include <sound/compress_driver.h>



/**

 * snd_hdac_ext_stream_init - initialize each stream (aka device)
@@ -367,3 +368,43 @@ void snd_hdac_ext_stream_release(struct hdac_ext_stream *hext_stream, int type) 


}

EXPORT_SYMBOL_GPL(snd_hdac_ext_stream_release);



/**

 * snd_hdac_ext_cstream_assign - assign a host stream for compress

 * @bus: HD-audio core bus

 * @cstream: Compress stream to assign

 *

 * Assign an unused host stream for the given compress stream.

 * If no stream is free, NULL is returned. Stream is decoupled

 * before assignment.

 */

struct hdac_ext_stream *snd_hdac_ext_cstream_assign(struct hdac_bus *bus,

						    struct snd_compr_stream *cstream)

{

	struct hdac_ext_stream *res = NULL;

	struct hdac_stream *hstream;



	spin_lock_irq(&bus->reg_lock);

	list_for_each_entry(hstream, &bus->stream_list, list) {

		struct hdac_ext_stream *hext_stream = stream_to_hdac_ext_stream(hstream);



		if (hstream->direction != cstream->direction)

			continue;



		if (!hstream->opened) {

			res = hext_stream;

			break;

		}

	}



	if (res) {

		snd_hdac_ext_stream_decouple_locked(bus, res, true);

		res->hstream.opened = 1;

		res->hstream.running = 0;

		res->hstream.cstream = cstream;

	}

	spin_unlock_irq(&bus->reg_lock);



	return res;

}

EXPORT_SYMBOL_GPL(snd_hdac_ext_cstream_assign);

sound/hda/hdac_controller.c

+2 −2
Original line number Diff line number Diff line
@@ -578,8 +578,8 @@ int snd_hdac_bus_handle_stream_irq(struct hdac_bus *bus, unsigned int status, 
			sd_status = snd_hdac_stream_readb(azx_dev, SD_STS);

			snd_hdac_stream_writeb(azx_dev, SD_STS, SD_INT_MASK);

			handled |= 1 << azx_dev->index;

			if (!azx_dev->substream || !azx_dev->running ||

			    !(sd_status & SD_INT_COMPLETE))

			if ((!azx_dev->substream && !azx_dev->cstream) ||

			    !azx_dev->running || !(sd_status & SD_INT_COMPLETE))

				continue;

			if (ack)

				ack(bus, azx_dev);