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

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

Pull sound fixes from Takashi Iwai:
 "A collection of small changes including a few regression fixes:

   - Regression fix for Intel SKL/KBL HD-audio bindings

   - Regression fix for missing Nvidia HDMI codec entries after the
     recent code reorganization

   - A few TAS2781 codec regression fixes

   - Fix for ASoC component lookup breakage

   - Usual HD-audio, USB-audio and SOF quirk entries"

* tag 'sound-6.17-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:
  ALSA: hda/hdmi: Add pin fix for another HP EliteDesk 800 G4 model
  ALSA: usb-audio: Allow Focusrite devices to use low samplerates
  ALSA: hda: tas2781: reorder tas2563 calibration variables
  ALSA: hda: tas2781: fix tas2563 EFI data endianness
  ALSA: firewire-motu: drop EPOLLOUT from poll return values as write is not supported
  ALSA: docs: Add documents for recently changes in snd-usb-audio
  ALSA: usb-audio: Add mute TLV for playback volumes on more devices
  ASoC: SOF: Intel: WCL: Add the sdw_process_wakeen op
  ALSA: hda: Avoid binding with SOF for SKL/KBL platforms
  ASoC: rsnd: tidyup direction name on rsnd_dai_connect()
  ALSA: hda/tas2781: Fix EFI name for calibration beginning with 1 instead of 0
  ALSA: usb-audio: move mixer_quirks' min_mute into common quirk
  ALSA: hda/realtek: Fix headset mic for TongFang X6[AF]R5xxY
  ALSA: hda/hdmi: Restore missing HDMI codec entries
  ASoC: codecs: idt821034: fix wrong log in idt821034_chip_direction_output()
  ASoC: soc-core: tidyup snd_soc_lookup_component_nolocked()
  ASoC: soc-core: care NULL dirver name on snd_soc_lookup_component_nolocked()
  ALSA: hda: intel-dsp-config: Select SOF driver on MTL Chromebooks
  ALSA: usb-audio: Add mute TLV for playback volumes on some devices
parents 8026aed0 bcd6659d

Documentation/sound/alsa-configuration.rst

+25 −4
Original line number Diff line number Diff line
@@ -2253,8 +2253,15 @@ device_setup 
    Default: 0x0000 

ignore_ctl_error

    Ignore any USB-controller regarding mixer interface (default: no)

    ``ignore_ctl_error=1`` may help when you get an error at accessing

    the mixer element such as URB error -22.  This happens on some

    buggy USB device or the controller.  This workaround corresponds to

    the ``quirk_flags`` bit 14, too.

autoclock

    Enable auto-clock selection for UAC2 devices (default: yes)

lowlatency

    Enable low latency playback mode (default: yes).

    Could disable it to switch back to the old mode if face a regression.

quirk_alias

    Quirk alias list, pass strings like ``0123abcd:5678beef``, which

    applies the existing quirk for the device 5678:beef to a new
@@ -2284,6 +2291,11 @@ delayed_register 
    The driver prints a message like "Found post-registration device

    assignment: 1234abcd:04" for such a device, so that user can

    notice the need.

skip_validation

    Skip unit descriptor validation (default: no).

    The option is used to ignores the validation errors with the hexdump

    of the unit descriptor instead of a driver probe error, so that we

    can check its details.

quirk_flags

    Contains the bit flags for various device specific workarounds.

    Applied to the corresponding card index.
@@ -2307,6 +2319,16 @@ quirk_flags 
        * bit 16: Set up the interface at first like UAC1

        * bit 17: Apply the generic implicit feedback sync mode

        * bit 18: Don't apply implicit feedback sync mode

        * bit 19: Don't closed interface during setting sample rate

        * bit 20: Force an interface reset whenever stopping & restarting

          a stream

        * bit 21: Do not set PCM rate (frequency) when only one rate is

          available for the given endpoint.

        * bit 22: Set the fixed resolution 16 for Mic Capture Volume

        * bit 23: Set the fixed resolution 384 for Mic Capture Volume

        * bit 24: Set minimum volume control value as mute for devices

          where the lowest playback value represents muted state instead

          of minimum audible volume



This module supports multiple devices, autoprobe and hotplugging.
@@ -2314,10 +2336,9 @@ NB: ``nrpacks`` parameter can be modified dynamically via sysfs. 
Don't put the value over 20.  Changing via sysfs has no sanity

check.



NB: ``ignore_ctl_error=1`` may help when you get an error at accessing

the mixer element such as URB error -22.  This happens on some

buggy USB device or the controller.  This workaround corresponds to

the ``quirk_flags`` bit 14, too.

NB: ``ignore_ctl_error=1`` just provides a quick way to work around the

issues.  If you have a buggy device that requires these quirks, please

report it to the upstream.



NB: ``quirk_alias`` option is provided only for testing / development.

If you want to have a proper support, contact to upstream for

sound/firewire/motu/motu-hwdep.c

+1 −1
Original line number Diff line number Diff line
@@ -111,7 +111,7 @@ static __poll_t hwdep_poll(struct snd_hwdep *hwdep, struct file *file, 
		events = 0;

	spin_unlock_irq(&motu->lock);



	return events | EPOLLOUT;

	return events;

}



static int hwdep_get_info(struct snd_motu *motu, void __user *arg)

sound/hda/codecs/hdmi/hdmi.c

+1 −0
Original line number Diff line number Diff line
@@ -1582,6 +1582,7 @@ static int hdmi_add_cvt(struct hda_codec *codec, hda_nid_t cvt_nid) 
static const struct snd_pci_quirk force_connect_list[] = {

	SND_PCI_QUIRK(0x103c, 0x83e2, "HP EliteDesk 800 G4", 1),

	SND_PCI_QUIRK(0x103c, 0x83ef, "HP MP9 G4 Retail System AMS", 1),

	SND_PCI_QUIRK(0x103c, 0x845a, "HP EliteDesk 800 G4 DM 65W", 1),

	SND_PCI_QUIRK(0x103c, 0x870f, "HP", 1),

	SND_PCI_QUIRK(0x103c, 0x871a, "HP", 1),

	SND_PCI_QUIRK(0x103c, 0x8711, "HP", 1),

sound/hda/codecs/hdmi/nvhdmi.c

+17 −0
Original line number Diff line number Diff line
@@ -198,15 +198,32 @@ static const struct hda_device_id snd_hda_id_nvhdmi[] = { 
	HDA_CODEC_ID_MODEL(0x10de0098, "GPU 98 HDMI/DP",	MODEL_GENERIC),

	HDA_CODEC_ID_MODEL(0x10de0099, "GPU 99 HDMI/DP",	MODEL_GENERIC),

	HDA_CODEC_ID_MODEL(0x10de009a, "GPU 9a HDMI/DP",	MODEL_GENERIC),

	HDA_CODEC_ID_MODEL(0x10de009b, "GPU 9b HDMI/DP",	MODEL_GENERIC),

	HDA_CODEC_ID_MODEL(0x10de009c, "GPU 9c HDMI/DP",	MODEL_GENERIC),

	HDA_CODEC_ID_MODEL(0x10de009d, "GPU 9d HDMI/DP",	MODEL_GENERIC),

	HDA_CODEC_ID_MODEL(0x10de009e, "GPU 9e HDMI/DP",	MODEL_GENERIC),

	HDA_CODEC_ID_MODEL(0x10de009f, "GPU 9f HDMI/DP",	MODEL_GENERIC),

	HDA_CODEC_ID_MODEL(0x10de00a0, "GPU a0 HDMI/DP",	MODEL_GENERIC),

	HDA_CODEC_ID_MODEL(0x10de00a1, "GPU a1 HDMI/DP",	MODEL_GENERIC),

	HDA_CODEC_ID_MODEL(0x10de00a3, "GPU a3 HDMI/DP",	MODEL_GENERIC),

	HDA_CODEC_ID_MODEL(0x10de00a4, "GPU a4 HDMI/DP",	MODEL_GENERIC),

	HDA_CODEC_ID_MODEL(0x10de00a5, "GPU a5 HDMI/DP",	MODEL_GENERIC),

	HDA_CODEC_ID_MODEL(0x10de00a6, "GPU a6 HDMI/DP",	MODEL_GENERIC),

	HDA_CODEC_ID_MODEL(0x10de00a7, "GPU a7 HDMI/DP",	MODEL_GENERIC),

	HDA_CODEC_ID_MODEL(0x10de00a8, "GPU a8 HDMI/DP",	MODEL_GENERIC),

	HDA_CODEC_ID_MODEL(0x10de00a9, "GPU a9 HDMI/DP",	MODEL_GENERIC),

	HDA_CODEC_ID_MODEL(0x10de00aa, "GPU aa HDMI/DP",	MODEL_GENERIC),

	HDA_CODEC_ID_MODEL(0x10de00ab, "GPU ab HDMI/DP",	MODEL_GENERIC),

	HDA_CODEC_ID_MODEL(0x10de00ad, "GPU ad HDMI/DP",	MODEL_GENERIC),

	HDA_CODEC_ID_MODEL(0x10de00ae, "GPU ae HDMI/DP",	MODEL_GENERIC),

	HDA_CODEC_ID_MODEL(0x10de00af, "GPU af HDMI/DP",	MODEL_GENERIC),

	HDA_CODEC_ID_MODEL(0x10de00b0, "GPU b0 HDMI/DP",	MODEL_GENERIC),

	HDA_CODEC_ID_MODEL(0x10de00b1, "GPU b1 HDMI/DP",	MODEL_GENERIC),

	HDA_CODEC_ID_MODEL(0x10de00c0, "GPU c0 HDMI/DP",	MODEL_GENERIC),

	HDA_CODEC_ID_MODEL(0x10de00c1, "GPU c1 HDMI/DP",	MODEL_GENERIC),

	HDA_CODEC_ID_MODEL(0x10de00c3, "GPU c3 HDMI/DP",	MODEL_GENERIC),

	HDA_CODEC_ID_MODEL(0x10de00c4, "GPU c4 HDMI/DP",	MODEL_GENERIC),

	HDA_CODEC_ID_MODEL(0x10de00c5, "GPU c5 HDMI/DP",	MODEL_GENERIC),

	{} /* terminator */

};

MODULE_DEVICE_TABLE(hdaudio, snd_hda_id_nvhdmi);

sound/hda/codecs/hdmi/tegrahdmi.c

+2 −0
Original line number Diff line number Diff line
@@ -299,7 +299,9 @@ static const struct hda_device_id snd_hda_id_tegrahdmi[] = { 
	HDA_CODEC_ID_MODEL(0x10de002f, "Tegra194 HDMI/DP2",	MODEL_TEGRA),

	HDA_CODEC_ID_MODEL(0x10de0030, "Tegra194 HDMI/DP3",	MODEL_TEGRA),

	HDA_CODEC_ID_MODEL(0x10de0031, "Tegra234 HDMI/DP",	MODEL_TEGRA234),

	HDA_CODEC_ID_MODEL(0x10de0033, "SoC 33 HDMI/DP",	MODEL_TEGRA234),

	HDA_CODEC_ID_MODEL(0x10de0034, "Tegra264 HDMI/DP",	MODEL_TEGRA234),

	HDA_CODEC_ID_MODEL(0x10de0035, "SoC 35 HDMI/DP",	MODEL_TEGRA234),

	{} /* terminator */

};

MODULE_DEVICE_TABLE(hdaudio, snd_hda_id_tegrahdmi);