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

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

Pull sound fixes from Takashi Iwai:
 "A collection of small fixes gathered in the last two weeks.

  The major changes here are fixes for the recent DPCM regressions found
  on i.MX and Qualcomm platforms and fixes for resource leaks in ASoC
  DAI registrations.

  Other than those are mostly device-specific fixes including the usual
  USB- and HD-audio quirks, and a fix for syzkaller case and ID updates
  for new Intel platforms"

* tag 'sound-5.8-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: (32 commits)
  ALSA: usb-audio: Fix OOB access of mixer element list
  ALSA: usb-audio: add quirk for Samsung USBC Headset (AKG)
  ALSA: usb-audio: Add registration quirk for Kingston HyperX Cloud Flight S
  ASoC: rockchip: Fix a reference count leak.
  ASoC: amd: closing specific instance.
  ALSA: hda: Intel: add missing PCI IDs for ICL-H, TGL-H and EKL
  ASoC: hdac_hda: fix memleak with regmap not freed on remove
  ASoC: SOF: Intel: add PCI IDs for ICL-H and TGL-H
  ASoC: SOF: Intel: add PCI ID for CometLake-S
  ASoC: Intel: SOF: merge COMETLAKE_LP and COMETLAKE_H
  ALSA: hda/realtek: Add mute LED and micmute LED support for HP systems
  ALSA: usb-audio: Fix potential use-after-free of streams
  ALSA: hda/realtek - Add quirk for MSI GE63 laptop
  ASoC: fsl_ssi: Fix bclk calculation for mono channel
  ASoC: SOF: Intel: hda: Clear RIRB status before reading WP
  ASoC: rt1015: Update rt1015 default register value according to spec modification.
  ASoC: qcom: common: set correct directions for dailinks
  ASoc: q6afe: add support to get port direction
  ASoC: soc-pcm: fix checks for multi-cpu FE dailinks
  ASoC: rt5682: Let dai clks be registered whether mclk exists or not
  ...
parents 8be3a53e 220345e9

include/sound/dmaengine_pcm.h

+11 −0
Original line number Diff line number Diff line
@@ -161,4 +161,15 @@ int snd_dmaengine_pcm_prepare_slave_config(struct snd_pcm_substream *substream, 


#define SND_DMAENGINE_PCM_DRV_NAME "snd_dmaengine_pcm"



struct dmaengine_pcm {

	struct dma_chan *chan[SNDRV_PCM_STREAM_LAST + 1];

	const struct snd_dmaengine_pcm_config *config;

	struct snd_soc_component component;

	unsigned int flags;

};



static inline struct dmaengine_pcm *soc_component_to_pcm(struct snd_soc_component *p)

{

	return container_of(p, struct dmaengine_pcm, component);

}

#endif

include/sound/soc.h

+6 −0
Original line number Diff line number Diff line
@@ -444,6 +444,8 @@ int devm_snd_soc_register_component(struct device *dev, 
			 const struct snd_soc_component_driver *component_driver,

			 struct snd_soc_dai_driver *dai_drv, int num_dai);

void snd_soc_unregister_component(struct device *dev);

struct snd_soc_component *snd_soc_lookup_component_nolocked(struct device *dev,

							    const char *driver_name);

struct snd_soc_component *snd_soc_lookup_component(struct device *dev,

						   const char *driver_name);
@@ -1361,6 +1363,10 @@ void snd_soc_remove_pcm_runtime(struct snd_soc_card *card, 
struct snd_soc_dai *snd_soc_register_dai(struct snd_soc_component *component,

					 struct snd_soc_dai_driver *dai_drv,

					 bool legacy_dai_naming);

struct snd_soc_dai *devm_snd_soc_register_dai(struct device *dev,

					      struct snd_soc_component *component,

					      struct snd_soc_dai_driver *dai_drv,

					      bool legacy_dai_naming);

void snd_soc_unregister_dai(struct snd_soc_dai *dai);



struct snd_soc_dai *snd_soc_find_dai(

sound/hda/intel-dsp-config.c

+1 −3
Original line number Diff line number Diff line
@@ -208,8 +208,8 @@ static const struct config_entry config_table[] = { 
	},

#endif



#if IS_ENABLED(CONFIG_SND_SOC_SOF_COMETLAKE)

/* Cometlake-LP */

#if IS_ENABLED(CONFIG_SND_SOC_SOF_COMETLAKE_LP)

	{

		.flags = FLAG_SOF,

		.device = 0x02c8,
@@ -240,9 +240,7 @@ static const struct config_entry config_table[] = { 
		.flags = FLAG_SOF | FLAG_SOF_ONLY_IF_DMIC_OR_SOUNDWIRE,

		.device = 0x02c8,

	},

#endif

/* Cometlake-H */

#if IS_ENABLED(CONFIG_SND_SOC_SOF_COMETLAKE_H)

	{

		.flags = FLAG_SOF,

		.device = 0x06c8,

sound/pci/hda/hda_intel.c

+8 −0
Original line number Diff line number Diff line
@@ -2470,6 +2470,9 @@ static const struct pci_device_id azx_ids[] = { 
	/* Icelake */

	{ PCI_DEVICE(0x8086, 0x34c8),

	  .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE},

	/* Icelake-H */

	{ PCI_DEVICE(0x8086, 0x3dc8),

	  .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE},

	/* Jasperlake */

	{ PCI_DEVICE(0x8086, 0x38c8),

	  .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE},
@@ -2478,9 +2481,14 @@ static const struct pci_device_id azx_ids[] = { 
	/* Tigerlake */

	{ PCI_DEVICE(0x8086, 0xa0c8),

	  .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE},

	/* Tigerlake-H */

	{ PCI_DEVICE(0x8086, 0x43c8),

	  .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE},

	/* Elkhart Lake */

	{ PCI_DEVICE(0x8086, 0x4b55),

	  .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE},

	{ PCI_DEVICE(0x8086, 0x4b58),

	  .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE},

	/* Broxton-P(Apollolake) */

	{ PCI_DEVICE(0x8086, 0x5a98),

	  .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_BROXTON },

sound/pci/hda/patch_hdmi.c

+5 −0
Original line number Diff line number Diff line
@@ -4145,6 +4145,11 @@ HDA_CODEC_ENTRY(0x10de0095, "GPU 95 HDMI/DP", patch_nvhdmi), 
HDA_CODEC_ENTRY(0x10de0097, "GPU 97 HDMI/DP",	patch_nvhdmi),

HDA_CODEC_ENTRY(0x10de0098, "GPU 98 HDMI/DP",	patch_nvhdmi),

HDA_CODEC_ENTRY(0x10de0099, "GPU 99 HDMI/DP",	patch_nvhdmi),

HDA_CODEC_ENTRY(0x10de009a, "GPU 9a HDMI/DP",	patch_nvhdmi),

HDA_CODEC_ENTRY(0x10de009d, "GPU 9d HDMI/DP",	patch_nvhdmi),

HDA_CODEC_ENTRY(0x10de009e, "GPU 9e HDMI/DP",	patch_nvhdmi),

HDA_CODEC_ENTRY(0x10de009f, "GPU 9f HDMI/DP",	patch_nvhdmi),

HDA_CODEC_ENTRY(0x10de00a0, "GPU a0 HDMI/DP",	patch_nvhdmi),

HDA_CODEC_ENTRY(0x10de8001, "MCP73 HDMI",	patch_nvhdmi_2ch),

HDA_CODEC_ENTRY(0x10de8067, "MCP67/68 HDMI",	patch_nvhdmi_2ch),

HDA_CODEC_ENTRY(0x11069f80, "VX900 HDMI/DP",	patch_via_hdmi),

CRA Git | Maintained and supported by SUSTech CRA and CCSE