sound fixes for 3.15-rc5
Linus,
please pull sound fixes for v3.15-rc5 from:
git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git tags/sound-3.15-rc5
The topmost commit is f06ab794af7055d0949b09885f79f8b493deec64
----------------------------------------------------------------
sound fixes for 3.15-rc5
A bunch of small fixes for USB-audio and HD-audio, where most of them are for regressions: USB-audio PM fixes, ratelimit annoyance fix, HDMI offline state fix, and a couple of device-specific quirks.
----------------------------------------------------------------
Anssi Hannula (1):
ALSA: hda - hdmi: Set converter channel count even without sink
Clemens Ladisch (1):
ALSA: usb-audio: work around corrupted TEAC UD-H01 feedback data
Hui Wang (1):
ALSA: hda - add headset mic detect quirk for a Dell laptop
Sander Eikelenboom (1):
ALSA: usb-audio: Prevent printk ratelimiting from spamming kernel log while DEBUG not defined
Takashi Iwai (2):
ALSA: usb-audio: Save mixer status only once at suspend
ALSA: usb-audio: Fix deadlocks at resuming
--- sound/pci/hda/patch_hdmi.c | 4 +++- sound/pci/hda/patch_realtek.c | 1 + sound/usb/card.c | 12 ++++++++---- sound/usb/card.h | 1 + sound/usb/endpoint.c | 15 ++++++++++++++- sound/usb/pcm.c | 5 ++--- sound/usb/usbaudio.h | 1 + 7 files changed, 30 insertions(+), 9 deletions(-)
sound/pci/hda/patch_hdmi.c +3 -1
@@ -1127,8 +1127,10 @@ static void hdmi_setup_audio_infoframe(struct hda_codec *codec, AMP_OUT_UNMUTE); eld = &per_pin->sink_eld; -if (!eld->monitor_present) +if (!eld->monitor_present) { +hdmi_set_channel_count (codec, per_pin->cvt_nid, channels);return ; + }if (!non_pcm && per_pin->chmap_set) ca =hdmi_manual_channel_allocation (channels, per_pin->chmap);
sound/pci/hda/patch_realtek.c +1 -0
@@ -4622,6 +4622,7 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = {SND_PCI_QUIRK (0x1028 ,0x0668 ,"Dell" ,ALC255_FIXUP_DELL2_MIC_NO_PRESENCE ),SND_PCI_QUIRK (0x1028 ,0x0669 ,"Dell" ,ALC255_FIXUP_DELL2_MIC_NO_PRESENCE ),SND_PCI_QUIRK (0x1028 ,0x0674 ,"Dell" ,ALC255_FIXUP_DELL1_MIC_NO_PRESENCE ), +SND_PCI_QUIRK (0x1028 ,0x067e ,"Dell" ,ALC255_FIXUP_DELL1_MIC_NO_PRESENCE ),SND_PCI_QUIRK (0x1028 ,0x067f ,"Dell" ,ALC255_FIXUP_DELL1_MIC_NO_PRESENCE ),SND_PCI_QUIRK (0x1028 ,0x15cc ,"Dell X5 Precision" ,ALC269_FIXUP_DELL2_MIC_NO_PRESENCE ), SND_PCI_QUIRK(0x1028, 0x15cd, "Dell X5 Precision", ALC269_FIXUP_DELL2_MIC_NO_PRESENCE),
sound/usb/card.c +8 -4
@@ -651,7 +651,7 @@ int snd_usb_autoresume(struct snd_usb_audio *chip)int err = -ENODEV ;down_read (&chip->shutdown_rwsem); -if (chip->probing) +if (chip->probing && chip->in_pm) err =0 ;else if (!chip->shutdown) err =usb_autopm_get_interface (chip->pm_intf);
@@ -663,7 +663,7 @@ int snd_usb_autoresume(struct snd_usb_audio *chip)void snd_usb_autosuspend (struct snd_usb_audio *chip) {down_read (&chip->shutdown_rwsem); -if (!chip->shutdown && !chip->probing) +if (!chip->shutdown && !chip->probing && !chip->in_pm)usb_autopm_put_interface (chip->pm_intf);up_read (&chip->shutdown_rwsem); }
@@ -695,8 +695,9 @@ static int usb_audio_suspend(struct usb_interface *intf, pm_message_t message) chip->autosuspended =1 ; } -list_for_each_entry (mixer, &chip->mixer_list, list) -snd_usb_mixer_suspend (mixer); +if (chip->num_suspended_intf ==1 ) +list_for_each_entry (mixer, &chip->mixer_list, list) +snd_usb_mixer_suspend (mixer);return 0 ; }
@@ -711,6 +712,8 @@ static int __usb_audio_resume(struct usb_interface *intf, bool reset_resume)return 0 ;if (--chip->num_suspended_intf)return 0 ; + + chip->in_pm =1 ;/* * ALSA leaves material resumption to user space * we just notify and restart the mixers
@@ -726,6 +729,7 @@ static int __usb_audio_resume(struct usb_interface *intf, bool reset_resume) chip->autosuspended =0 ; err_out: + chip->in_pm =0 ;return err; }
sound/usb/card.h +1 -0
@@ -92,6 +92,7 @@ struct snd_usb_endpoint {unsigned int curframesize;/* current packet size in frames (for capture) */ unsigned int syncmaxsize;/* sync endpoint packet size */ unsigned int fill_max:1; /* fill max packet size always */ + unsigned int udh01_fb_quirk:1; /* corrupted feedback data */unsigned int datainterval;/* log_2 of data packet interval */ unsigned int syncinterval;/* P for adaptive mode, 0 otherwise */ unsigned char silence_value;
sound/usb/endpoint.c +14 -1
@@ -471,6 +471,10 @@ struct snd_usb_endpoint *snd_usb_add_endpoint(struct snd_usb_audio *chip, ep->syncinterval =3 ; ep->syncmaxsize =le16_to_cpu (get_endpoint (alts,1 )->wMaxPacketSize); + +if (chip->usb_id ==USB_ID (0x0644 ,0x8038 )/* TEAC UD-H01 */ && + ep->syncmaxsize ==4 ) + ep->udh01_fb_quirk =1 ; }list_add_tail (&ep->list, &chip->ep_list);
@@ -1105,7 +1109,16 @@ void snd_usb_handle_sync_urb(struct snd_usb_endpoint *ep,if (f ==0 )return ; -if (unlikely (ep->freqshift ==INT_MIN )) { +if (unlikely (sender->udh01_fb_quirk)) { +/* +* The TEAC UD-H01 firmware sometimes changes the feedback value +* by +/- 0x1.0000. +*/ +if (f < ep->freqn -0x8000 ) + f +=0x10000 ; +else if (f > ep->freqn +0x8000 ) + f -=0x10000 ; + }else if (unlikely (ep->freqshift ==INT_MIN )) {/* * The first time we see a feedback value, determine its format * by shifting it left or right until it matches the nominal
sound/usb/pcm.c +2 -3
@@ -1501,9 +1501,8 @@ static void retire_playback_urb(struct snd_usb_substream *subs,* The error should be lower than 2ms since the estimate relies * on two reads of a counter updated every ms. */ -if (printk_ratelimit () && -abs (est_delay - subs->last_delay) *1000 > runtime->rate *2 ) -dev_dbg (&subs->dev->dev, +if (abs (est_delay - subs->last_delay) *1000 > runtime->rate *2 ) +dev_dbg_ratelimited (&subs->dev->dev,"delay: estimated %d, actual %d\n" , est_delay, subs->last_delay);
sound/usb/usbaudio.h +1 -0
@@ -40,6 +40,7 @@ struct snd_usb_audio {struct rw_semaphore shutdown_rwsem; unsigned int shutdown:1; unsigned int probing:1; + unsigned int in_pm:1; unsigned int autosuspended:1; unsigned int txfr_quirk:1; /* Subframe boundaries on transfers */