sound fixes for 3.18-rc2
Linus,
please pull sound fixes for v3.18-rc2 from:
git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git tags/sound-3.18-rc2
The topmost commit is fb54a645b2739fb196446ffbbbe3f3589d117b55
----------------------------------------------------------------
sound fixes for 3.18-rc2
Here are a chunk of small fixes since rc1: two PCM core fixes, one is a long-standing annoyance about lockdep and another is an ARM64 mmap fix. The rest are a HD-audio HDMI hotplug notification fix, a fix for missing NULL termination in Realtek codec quirks and a few new device/codec-specific quirks as usual.
----------------------------------------------------------------
Anatol Pomozov (1):
ALSA: pcm: use the same dma mmap codepath both for arm and arm64
Anssi Hannula (1):
ALSA: hda - hdmi: Fix missing ELD change event on plug/unplug
David Henningsson (1):
ALSA: hda - Add missing terminating entry to SND_HDA_PIN_QUIRK macro
Harsha Priya (1):
ALSA: ALC283 codec - Avoid pop noise on headphones during suspend/resume
Takashi Iwai (2):
ALSA: hda - Fix inverted LED gpio setup for Lenovo Ideapad
ALSA: pcm: Fix false lockdep warnings
Vlad Catoi (1):
ALSA: usb-audio: Add support for Steinberg UR22 USB interface
--- sound/core/pcm_native.c | 14 ++++++-------- sound/pci/hda/hda_local.h | 4 ++-- sound/pci/hda/patch_hdmi.c | 15 +++++++++------ sound/pci/hda/patch_realtek.c | 7 +++++-- sound/usb/quirks-table.h | 30 ++++++++++++++++++++++++++++++ 5 files changed, 52 insertions(+), 18 deletions(-)
sound/core/pcm_native.c +6 -8
@@ -781,16 +781,15 @@ static int snd_pcm_action_group(struct action_ops *ops, {struct snd_pcm_substream *s =NULL ;struct snd_pcm_substream *s1; -int res =0 ; +int res =0 , depth =1 ;snd_pcm_group_for_each_entry (s, substream) {if (do_lock && s != substream) {if (s->pcm->nonatomic) -mutex_lock_nested (&s->self_group.mutex, -SINGLE_DEPTH_NESTING ); +mutex_lock_nested (&s->self_group.mutex, depth);else -spin_lock_nested (&s->self_group.lock, -SINGLE_DEPTH_NESTING ); +spin_lock_nested (&s->self_group.lock, depth); + depth++; } res = ops->pre_action (s, state);if (res <0 )
@@ -906,8 +905,7 @@ static int snd_pcm_action_lock_mutex(struct action_ops *ops,down_read (&snd_pcm_link_rwsem);if (snd_pcm_stream_linked (substream)) {mutex_lock (&substream->group->mutex); -mutex_lock_nested (&substream->self_group.mutex, -SINGLE_DEPTH_NESTING ); +mutex_lock (&substream->self_group.mutex); res =snd_pcm_action_group (ops, substream, state,1 );mutex_unlock (&substream->self_group.mutex);mutex_unlock (&substream->group->mutex);
@@ -3311,7 +3309,7 @@ static const struct vm_operations_struct snd_pcm_vm_ops_data_fault = {#ifndef ARCH_HAS_DMA_MMAP_COHERENT /* This should be defined / handled globally! */ -#ifdef CONFIG_ARM +#if defined(CONFIG_ARM ) || defined(CONFIG_ARM64 )#define ARCH_HAS_DMA_MMAP_COHERENT #endif #endif
sound/pci/hda/hda_local.h +2 -2
@@ -419,7 +419,7 @@ struct snd_hda_pin_quirk { .subvendor = _subvendor,\ .name = _name,\ .value = _value,\ - .pins = (const struct hda_pintbl[]) { _pins } \ + .pins = (const struct hda_pintbl[]) { _pins, {0, 0}} \ }#else
@@ -427,7 +427,7 @@ struct snd_hda_pin_quirk { { .codec = _codec,\ .subvendor = _subvendor,\ .value = _value,\ - .pins = (const struct hda_pintbl[]) { _pins } \ + .pins = (const struct hda_pintbl[]) { _pins, {0, 0}} \ }#endif
sound/pci/hda/patch_hdmi.c +9 -6
@@ -1583,19 +1583,22 @@ static bool hdmi_present_sense(struct hdmi_spec_per_pin *per_pin, int repoll) } } -if (pin_eld->eld_valid && !eld->eld_valid) { - update_eld = true; +if (pin_eld->eld_valid != eld->eld_valid) eld_changed = true; - } + +if (pin_eld->eld_valid && !eld->eld_valid) + update_eld = true; +if (update_eld) {bool old_eld_valid = pin_eld->eld_valid; pin_eld->eld_valid = eld->eld_valid; - eld_changed = pin_eld->eld_size != eld->eld_size || +if (pin_eld->eld_size != eld->eld_size ||memcmp (pin_eld->eld_buffer, eld->eld_buffer, - eld->eld_size) !=0 ; -if (eld_changed) + eld->eld_size) !=0 ) {memcpy (pin_eld->eld_buffer, eld->eld_buffer, eld->eld_size); + eld_changed = true; + } pin_eld->eld_size = eld->eld_size; pin_eld->info = eld->info;
sound/pci/hda/patch_realtek.c +5 -2
@@ -2884,6 +2884,9 @@ static void alc283_shutup(struct hda_codec *codec)alc_write_coef_idx (codec,0x43 ,0x9004 ); +/*depop hp during suspend*/ +alc_write_coef_idx (codec,0x06 ,0x2100 ); +snd_hda_codec_write (codec, hp_pin,0 ,AC_VERB_SET_AMP_GAIN_MUTE ,AMP_OUT_MUTE );
@@ -5610,9 +5613,9 @@ static void alc662_led_gpio1_mute_hook(void *private_data, int enabled)unsigned int oldval = spec->gpio_led;if (enabled) - spec->gpio_led &= ~0x01 ; -else spec->gpio_led |=0x01 ; +else + spec->gpio_led &= ~0x01 ;if (spec->gpio_led != oldval)snd_hda_codec_write (codec,0x01 ,0 ,AC_VERB_SET_GPIO_DATA , spec->gpio_led);
sound/usb/quirks-table.h +30 -0
@@ -385,6 +385,36 @@ YAMAHA_DEVICE(0x105d, NULL), } }, { + USB_DEVICE(0x0499, 0x1509), + .driver_info = (unsigned long ) & (const struct snd_usb_audio_quirk ) { +/* .vendor_name = "Yamaha", */ +/* .product_name = "Steinberg UR22", */ + .ifnum =QUIRK_ANY_INTERFACE , + .type =QUIRK_COMPOSITE , + .data = (const struct snd_usb_audio_quirk []) { + { + .ifnum =1 , + .type =QUIRK_AUDIO_STANDARD_INTERFACE + }, + { + .ifnum =2 , + .type =QUIRK_AUDIO_STANDARD_INTERFACE + }, + { + .ifnum =3 , + .type =QUIRK_MIDI_YAMAHA + }, + { + .ifnum =4 , + .type =QUIRK_IGNORE_INTERFACE + }, + { + .ifnum =-1 + } + } + } +}, +{ USB_DEVICE(0x0499, 0x150a), .driver_info = (unsigned long ) & (const struct snd_usb_audio_quirk ) {/* .vendor_name = "Yamaha", */