Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 44ada1a1 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6 

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6:
  ALSA: hda - Compaq Presario CQ60 patching for Conexant
  sound: usb-audio: make the MotU Fastlane work again
  ALSA: Enable PCM hw_ptr_jiffies check only in xrun_debug mode
  ALSA: Fix invalid jiffies check after pause
parents b8e7e40a 817682c1

Documentation/sound/alsa/Procfile.txt

+5 −0
Original line number Diff line number Diff line
@@ -104,6 +104,11 @@ card*/pcm*/xrun_debug 
	When this value is greater than 1, the driver will show the

	stack trace additionally.  This may help the debugging.



	Since 2.6.30, this option also enables the hwptr check using

	jiffies.  This detects spontaneous invalid pointer callback

	values, but can be lead to too much corrections for a (mostly

	buggy) hardware that doesn't give smooth pointer updates.



card*/pcm*/sub*/info

	The general information of this PCM sub-stream.

sound/core/pcm_lib.c

+8 −2
Original line number Diff line number Diff line
@@ -249,6 +249,11 @@ static int snd_pcm_update_hw_ptr_interrupt(struct snd_pcm_substream *substream) 
			new_hw_ptr = hw_base + pos;

		}

	}



	/* Do jiffies check only in xrun_debug mode */

	if (!xrun_debug(substream))

		goto no_jiffies_check;



	/* Skip the jiffies check for hardwares with BATCH flag.

	 * Such hardware usually just increases the position at each IRQ,

	 * thus it can't give any strange position.
@@ -336,7 +341,9 @@ int snd_pcm_update_hw_ptr(struct snd_pcm_substream *substream) 
			hw_base = 0;

		new_hw_ptr = hw_base + pos;

	}

	if (((delta * HZ) / runtime->rate) > jdelta + HZ/100) {

	/* Do jiffies check only in xrun_debug mode */

	if (xrun_debug(substream) &&

	    ((delta * HZ) / runtime->rate) > jdelta + HZ/100) {

		hw_ptr_error(substream,

			     "hw_ptr skipping! "

			     "(pos=%ld, delta=%ld, period=%ld, jdelta=%lu/%lu)\n",
@@ -1478,7 +1485,6 @@ static int snd_pcm_lib_ioctl_reset(struct snd_pcm_substream *substream, 
		runtime->status->hw_ptr %= runtime->buffer_size;

	else

		runtime->status->hw_ptr = 0;

	runtime->hw_ptr_jiffies = jiffies;

	snd_pcm_stream_unlock_irqrestore(substream, flags);

	return 0;

}

sound/core/pcm_native.c

+6 −0
Original line number Diff line number Diff line
@@ -848,6 +848,7 @@ static void snd_pcm_post_start(struct snd_pcm_substream *substream, int state) 
{

	struct snd_pcm_runtime *runtime = substream->runtime;

	snd_pcm_trigger_tstamp(substream);

	runtime->hw_ptr_jiffies = jiffies;

	runtime->status->state = state;

	if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK &&

	    runtime->silence_size > 0)
@@ -961,6 +962,11 @@ static int snd_pcm_do_pause(struct snd_pcm_substream *substream, int push) 
{

	if (substream->runtime->trigger_master != substream)

		return 0;

	/* The jiffies check in snd_pcm_update_hw_ptr*() is done by

	 * a delta betwen the current jiffies, this gives a large enough

	 * delta, effectively to skip the check once.

	 */

	substream->runtime->hw_ptr_jiffies = jiffies - HZ * 1000;

	return substream->ops->trigger(substream,

				       push ? SNDRV_PCM_TRIGGER_PAUSE_PUSH :

					      SNDRV_PCM_TRIGGER_PAUSE_RELEASE);

sound/pci/hda/patch_conexant.c

+1 −0
Original line number Diff line number Diff line
@@ -1848,6 +1848,7 @@ static const char *cxt5051_models[CXT5051_MODELS] = { 


static struct snd_pci_quirk cxt5051_cfg_tbl[] = {

	SND_PCI_QUIRK(0x103c, 0x30cf, "HP DV6736", CXT5051_HP_DV6736),

	SND_PCI_QUIRK(0x103c, 0x360b, "Compaq Presario CQ60", CXT5051_HP),

	SND_PCI_QUIRK(0x14f1, 0x0101, "Conexant Reference board",

		      CXT5051_LAPTOP),

	SND_PCI_QUIRK(0x14f1, 0x5051, "HP Spartan 1.1", CXT5051_HP),

sound/usb/usbaudio.c

+1 −1
Original line number Diff line number Diff line
@@ -3347,7 +3347,7 @@ static int snd_usb_create_quirk(struct snd_usb_audio *chip, 
		[QUIRK_MIDI_YAMAHA] = snd_usb_create_midi_interface,

		[QUIRK_MIDI_MIDIMAN] = snd_usb_create_midi_interface,

		[QUIRK_MIDI_NOVATION] = snd_usb_create_midi_interface,

		[QUIRK_MIDI_RAW] = snd_usb_create_midi_interface,

		[QUIRK_MIDI_FASTLANE] = snd_usb_create_midi_interface,

		[QUIRK_MIDI_EMAGIC] = snd_usb_create_midi_interface,

		[QUIRK_MIDI_CME] = snd_usb_create_midi_interface,

		[QUIRK_AUDIO_STANDARD_INTERFACE] = create_standard_audio_quirk,