summaryrefslogtreecommitdiffstats
path: root/sound/core
Commit message (Collapse)AuthorAgeFilesLines
* ALSA: timer - pass real event in snd_timer_notify1() to instance callbackJaroslav Kysela2010-03-031-1/+1
| | | | | | | Do not use hardcoded SNDRV_TIMER_EVENT_START value. Signed-off-by: Jaroslav Kysela <perex@perex.cz> Signed-off-by: Takashi Iwai <tiwai@suse.de>
* Merge branch 'fix/misc' into topic/miscTakashi Iwai2010-02-173-7/+7
|\ | | | | | | | | Conflicts: sound/pci/hda/patch_realtek.c
| * Merge remote branch 'alsa/fixes' into fix/miscTakashi Iwai2010-02-171-4/+4
| |\
| | * ALSA: pcm core - fix fifo_size channels interval checkJaroslav Kysela2010-02-161-4/+4
| | | | | | | | | | | | | | | Signed-off-by: Jaroslav Kysela <perex@perex.cz> Cc: <stable@kernel.org>
| * | ALSA: Remove warning message for invalid OSS minor rangesTakashi Iwai2010-01-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a card instance with a higher card number is registered, warning messages are spewed eventually with stack traces due to the invalid minor number for OSS device registration. For example, thinkpad-acpi registers the card number 29 as default, and you'll see always these messages. This is rather confusing (and worries users), thus better to return simply the error code. Signed-off-by: Takashi Iwai <tiwai@suse.de>
| * | ALSA: use subsys_initcall for sound core instead of module_initThadeu Lima de Souza Cascardo2010-01-141-2/+2
| |/ | | | | | | | | | | | | | | | | | | This is needed for built-in drivers which are built before the sound directory, like thinkpad_acpi. Otherwise, registering a card fails. Signed-off-by: Thadeu Lima de Souza Cascardo <cascardo@holoscopio.com> Signed-off-by: Takashi Iwai <tiwai@suse.de>
* | ALSA: trivial: sound seq ioctl dbg: print hexadecimal value padded with 0sThadeu Lima de Souza Cascardo2010-02-021-1/+1
| | | | | | | | | | | | | | | | Instead of padding with blanks and printing "number=0x a", print "number=0x0a". Signed-off-by: Thadeu Lima de Souza Cascardo <cascardo@holoscopio.com> Signed-off-by: Takashi Iwai <tiwai@suse.de>
* | Merge remote branch 'alsa/devel' into topic/miscTakashi Iwai2010-02-012-6/+40
|\ \
| * | sound: control: fix minimum TLV lengthClemens Ladisch2010-02-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Allow TLV blocks that do not have any values; the smallest possible TLV is an empty container or one where the information is only in the tag. Signed-off-by: Clemens Ladisch <clemens@ladisch.de> Signed-off-by: Jaroslav Kysela <perex@perex.cz>
| * | sound: control: actually allow TLV command accessClemens Ladisch2010-02-011-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | Creating a control with TLV_COMMAND access was not possible because snd_ctl_new1() forgot to include it in the mask of allowable access bits. Signed-off-by: Clemens Ladisch <clemens@ladisch.de> Signed-off-by: Jaroslav Kysela <perex@perex.cz>
| * | ALSA: pcm_native - fix runtime->boundary calculationJaroslav Kysela2010-01-271-3/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The code in pcm_lib updating runtime->hw_ptr_interrupt expects that runtime->boundary is divisible with runtime->period_size. Thanks are going to Clemens Ladisch for the notice. Fix the runtime->boundary calculation using buffer_size * period_size as base and find a least common multiple for 32bit platforms when the expression might overflow. Signed-off-by: Jaroslav Kysela <perex@perex.cz>
* | | Merge remote branch 'alsa/devel' into topic/miscTakashi Iwai2010-01-263-4/+8
|\ \ \ | |/ /
| * | ALSA: pcm_lib - return back hw_ptr_interruptJaroslav Kysela2010-01-263-4/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Clemens Ladisch noted for hw_ptr_removal in "cleanup & merge hw_ptr update functions" commit: "It is possible for the status/delay ioctls to be called when the sound card's pointer register alreay shows a position at the beginning of the new period, but immediately before the interrupt is actually executed. (This happens regularly on a SMP machine with mplayer.) When that happens, the code thinks that the position must be at least one period ahead of the current position and drops an entire buffer of data." Return back the hw_ptr_interrupt variable. The last interrupt pointer is always computed from the latest hw_ptr instead of tracking it separately (in this case all hw_ptr checks and modifications might influence also hw_ptr_interrupt and it is difficult to keep it consistent). Signed-off-by: Jaroslav Kysela <perex@perex.cz>
* | | Merge branch 'topic/noncached-mmap' into topic/miscTakashi Iwai2010-01-211-2/+9
|\ \ \
| * | | ALSA: pcm - Call pgprot_noncached() for vmalloc'ed buffersTakashi Iwai2010-01-181-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | pgprot_noncached() can be set for vmalloc'ed buffers safely, and we'd need non-cached behavior more or less, even for the intermediate ring- buffers. Now snd_pcm_lib_mmap_vmalloc() is added as the common PCM mmap callback that is coupled with snd_pcm_lib_alloc_vmalloc_buffer() & co. Signed-off-by: Takashi Iwai <tiwai@suse.de>
| * | | ALSA: pcm - Remove unneeded ifdef pgprot_noncachedTakashi Iwai2010-01-181-2/+0
| | | | | | | | | | | | | | | | Signed-off-by: Takashi Iwai <tiwai@suse.de>
* | | | Merge remote branch 'alsa/devel' into topic/miscTakashi Iwai2010-01-213-10/+14
|\ \ \ \ | | |/ / | |/| |
| * | | ALSA: pcm_core: Fix wake_up() optimizationJaroslav Kysela2010-01-213-10/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change fixes the "ALSA: pcm_lib - optimize wake_up() calls for PCM I/O" commit. New sleeping queue is introduced to separate user space and kernel space wake_ups. runtime->nowake is renamed to twake (transfer wake). Signed-off-by: Jaroslav Kysela <perex@perex.cz>
* | | | Merge remote branch 'alsa/devel' into topic/miscTakashi Iwai2010-01-181-14/+13
|\ \ \ \ | |/ / / | | / / | |/ / |/| |
| * | sound: seq_timer: simplify snd_seq_timer_set_tick_resolution() parametersClemens Ladisch2010-01-181-14/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | As snd_seq_timer_set_tick_resolution() is always called with the same three fields of struct snd_seq_timer, it suffices to give that as the only parameter. Signed-off-by: Clemens Ladisch <clemens@ladisch.de> Signed-off-by: Jaroslav Kysela <perex@perex.cz>
* | | ALSA: Add snd_pci_quirk_lookup_id()Takashi Iwai2010-01-141-5/+27
| | | | | | | | | | | | | | | | | | | | | | | | Added a new function to look up a quirk entry with the given PCI SSID instead of a pci device pointer. This can be used when the searched ID is overridden for debugging or such a purpose. Signed-off-by: Takashi Iwai <tiwai@suse.de>
* | | Merge branch 'devel' of git.alsa-project.org:alsa-kernel into topic/miscTakashi Iwai2010-01-131-3/+5
|\ \ \ | |/ /
| * | ALSA: pcm_lib - fix wrong delta print for jiffies checkJaroslav Kysela2010-01-131-3/+5
| | | | | | | | | | | | | | | | | | | | | The previous jiffies delta was 0 in all cases. Use hw_ptr variable to store and print original value. Signed-off-by: Jaroslav Kysela <perex@perex.cz>
| * | Merge branch 'topic/hda' of ↵Jaroslav Kysela2010-01-083-18/+4
| |\ \ | | | | | | | | | | | | git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6 into devel
* | \ \ Merge commit alsa/devel into topic/miscTakashi Iwai2010-01-124-209/+253
|\ \ \ \ | |/ / / | | | | | | | | | | | | Conflicts: include/sound/version.h
| * | | ALSA: pcm_lib: fix "something must be really wrong" conditionJaroslav Kysela2010-01-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | When runtime->periods == 1 or when pointer crosses end of ring buffer, the delta might be greater than buffer_size. Signed-off-by: Jaroslav Kysela <perex@perex.cz>
| * | | ALSA: pcm_lib - optimize wake_up() calls for PCM I/OJaroslav Kysela2010-01-072-12/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As noted by pl bossart <bossart.nospam@gmail.com>, the PCM I/O routines (snd_pcm_lib_write1, snd_pcm_lib_read1) should block wake_up() calls until all samples are not processed. Signed-off-by: Jaroslav Kysela <perex@perex.cz>
| * | | ALSA: pcm_lib - cleanup & merge hw_ptr update functionsJaroslav Kysela2010-01-073-193/+120
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Do general cleanup in snd_pcm_update_hw_ptr*() routines and merge them. The main change is hw_ptr_interrupt variable removal to simplify code logic. This variable can be computed directly from hw_ptr. Ensure that updated hw_ptr is not lower than previous one (it was possible with old code in some obscure situations when interrupt was delayed or the lowlevel driver returns wrong ring buffer position value). Signed-off-by: Jaroslav Kysela <perex@perex.cz>
| * | | ALSA: pcm_lib - add possibility to log last 10 DMA ring buffer positionsJaroslav Kysela2010-01-072-23/+121
| | | | | | | | | | | | | | | | | | | | | | | | | | | | In some debug cases, it might be usefull to see previous ring buffer positions to determine position problems from the lowlevel drivers. Signed-off-by: Jaroslav Kysela <perex@perex.cz>
| * | | ALSA: pcm_lib.c - convert second xrun_debug() parameter to use definesJaroslav Kysela2010-01-071-10/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | To increase code readability, convert send xrun_debug() argument to use defines. Signed-off-by: Jaroslav Kysela <perex@perex.cz>
* | | | Merge branch 'fix/misc' into topic/miscTakashi Iwai2009-12-253-20/+6
|\ \ \ \ | | |_|/ | |/| |
| * | | ALSA: Fix indentation in pcm_native.cGuennadi Liakhovetski2009-12-251-4/+4
| | |/ | |/| | | | | | | | | | Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de> Signed-off-by: Takashi Iwai <tiwai@suse.de>
| * | ALSA: sound/core/pcm_timer.c: use lib/gcd.cFlorian Fainelli2009-12-222-16/+2
| | | | | | | | | | | | | | | | | | | | | | | | Make sound/core/pcm_timer.c use lib/gcd.c Signed-off-by: Florian Fainelli <florian@openwrt.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Takashi Iwai <tiwai@suse.de>
* | | ALSA: refine rate selection in snd_interval_ratnum()Krzysztof Helt2009-12-221-3/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refine the rate selection by choosing the rate closer to the requested one in case of selecting single frequency. Previously, the higher rate was always selected. Also, fix problem with the best_diff unsigned int value wrapping (turning negative). Signed-off-by: Krzysztof Helt <krzysztof.h1@wp.pl> Signed-off-by: Takashi Iwai <tiwai@suse.de>
* | | Merge branch 'fix/misc' into topic/miscTakashi Iwai2009-12-221-2/+2
|\ \ \ | |/ /
| * | ALSA: fix incorrect rounding direction in snd_interval_ratnum()Krzysztof Helt2009-12-211-2/+2
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The direction of rounding is incorrect in the snd_interval_ratnum() It was detected with following parameters (sb8 driver playing 8kHz stereo file): - num is always 1000000 - requested frequency rate is from 7999 to 7999 (single frequency) The first loop calculates div_down(num, freq->min) which is 125. Thus, a frequency range's minimum value is 1000000 / 125 = 8000 Hz. The second loop calculates div_up(num, freq->max) which is 126 The frequency range's maximum value is 1000000 / 126 = 7936 Hz. The range maximum is lower than the range minimum so the function fails due to empty result range. Signed-off-by: Krzysztof Helt <krzysztof.h1@wp.pl> Signed-off-by: Takashi Iwai <tiwai@suse.de>
* | ALSA: pcm - Add missing inclusion of linux/vmalloc.hTakashi Iwai2009-12-211-0/+1
| | | | | | | | Signed-off-by: Takashi Iwai <tiwai@suse.de>
* | sound: pcm: add vmalloc buffer helper functionsClemens Ladisch2009-12-181-0/+54
|/ | | | | | | | There are now five copies of the code to allocate a PCM buffer using vmalloc(). Add a sixth in the core so that the others can be removed. Signed-off-by: Clemens Ladisch <clemens@ladisch.de> Signed-off-by: Takashi Iwai <tiwai@suse.de>
* Merge branch 'for-linus' of ↵Linus Torvalds2009-12-121-2/+13
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 - Overwrite pin config on intel DG45ID board. intelhdmi - dont power off HDA link ALSA: hrtimer - Fix lock-up ALSA: intelhdmi - add channel mapping for typical configurations ALSA: intelhdmi - channel mapping applies to Pin ALSA: intelhdmi - accept DisplayPort pin ALSA: hda - show HBR(High Bit Rate) pin cap in procfs ALSA: hda - Fix LED GPIO setup for HP laptops with IDT codecs ASoC: Fix build of OMAP sound drivers ALSA: opti93x: fix irq releasing if the irq cannot be allocated
| * ALSA: hrtimer - Fix lock-upTakashi Iwai2009-12-111-2/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | The timer stop callback can be called from snd_timer_interrupt(), which is called from the hrtimer callback. Since hrtimer_cancel() waits for the callback completion, this eventually results in a lock-up. This patch fixes the problem by just toggling a flag at stop callback and call hrtimer_cancel() later. Reported-and-tested-by: Wojtek Zabolotny <W.Zabolotny@elka.pw.edu.pl> Cc: <stable@kernel.org> Signed-off-by: Takashi Iwai <tiwai@suse.de>
* | vfs: Implement proper O_SYNC semanticsChristoph Hellwig2009-12-101-1/+1
|/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | While Linux provided an O_SYNC flag basically since day 1, it took until Linux 2.4.0-test12pre2 to actually get it implemented for filesystems, since that day we had generic_osync_around with only minor changes and the great "For now, when the user asks for O_SYNC, we'll actually give O_DSYNC" comment. This patch intends to actually give us real O_SYNC semantics in addition to the O_DSYNC semantics. After Jan's O_SYNC patches which are required before this patch it's actually surprisingly simple, we just need to figure out when to set the datasync flag to vfs_fsync_range and when not. This patch renames the existing O_SYNC flag to O_DSYNC while keeping it's numerical value to keep binary compatibility, and adds a new real O_SYNC flag. To guarantee backwards compatiblity it is defined as expanding to both the O_DSYNC and the new additional binary flag (__O_SYNC) to make sure we are backwards-compatible when compiled against the new headers. This also means that all places that don't care about the differences can just check O_DSYNC and get the right behaviour for O_SYNC, too - only places that actuall care need to check __O_SYNC in addition. Drivers and network filesystems have been updated in a fail safe way to always do the full sync magic if O_DSYNC is set. The few places setting O_SYNC for lower layers are kept that way for now to stay failsafe. We enforce that O_DSYNC is set when __O_SYNC is set early in the open path to make sure we always get these sane options. Note that parisc really screwed up their headers as they already define a O_DSYNC that has always been a no-op. We try to repair it by using it for the new O_DSYNC and redefinining O_SYNC to send both the traditional O_SYNC numerical value _and_ the O_DSYNC one. Cc: Richard Henderson <rth@twiddle.net> Cc: Ivan Kokshaysky <ink@jurassic.park.msu.ru> Cc: Grant Grundler <grundler@parisc-linux.org> Cc: "David S. Miller" <davem@davemloft.net> Cc: Ingo Molnar <mingo@elte.hu> Cc: "H. Peter Anvin" <hpa@zytor.com> Cc: Thomas Gleixner <tglx@linutronix.de> Cc: Al Viro <viro@zeniv.linux.org.uk> Cc: Andreas Dilger <adilger@sun.com> Acked-by: Trond Myklebust <Trond.Myklebust@netapp.com> Acked-by: Kyle McMartin <kyle@mcmartin.ca> Acked-by: Ulrich Drepper <drepper@redhat.com> Signed-off-by: Christoph Hellwig <hch@lst.de> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Jan Kara <jack@suse.cz>
* Merge branch 'topic/misc' into for-linusTakashi Iwai2009-12-041-1/+1
|\
| * ALSA: remove unnecessary null checkDan Carpenter2009-11-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | This function is only called from snd_ctl_ioctl() and the file parameter can never be null so there is no need to check it here. We dereference file at the start of the function: struct snd_card *card = file->card; and it confuses static checkers to dereference a pointer before checking it. Signed-off-by: Dan Carpenter <error27@gmail.com> Signed-off-by: Takashi Iwai <tiwai@suse.de>
| * Merge branch 'fix/misc' into topic/miscTakashi Iwai2009-11-141-22/+20
| |\
* | \ Merge branch 'topic/pcm-dma-fix' into topic/core-changeTakashi Iwai2009-12-011-24/+59
|\ \ \
| * | | ALSA: pcm - fix page conversion on non-coherent PPC archTakashi Iwai2009-11-271-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The non-cohernet PPC arch doesn't give the correct address by a simple virt_to_page() for pages allocated via dma_alloc_coherent(). This patch adds a hack to fix the conversion similarly like MIPS. Note that this doesn't fix perfectly: the pages should be marked with proper pgprot value. This will be done in a future implementation like the conversion to dma_mmap_coherent(). Acked-by: Benjamin Herrenschmidt <benh@kernel.crashing.org> Signed-off-by: Takashi Iwai <tiwai@suse.de>
| * | | ALSA: pcm - fix page conversion on non-coherent MIPS archTakashi Iwai2009-11-271-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The non-coherent MIPS arch doesn't give the correct address by a simple virt_to_page() for pages allocated via dma_alloc_coherent(). Original patch by Wu Zhangjin <wuzj@lemote.com>. [Ralf mentioned: "The origins of this patch go back far further. The oldest patch I could find which is a superset of this was written by Atsushi Nemoto and various incarnations of it have been sumitted to and reject by me a number of times through the years."] A proper check of the buffer allocation type was added to avoid the wrong conversion. Note that this doesn't fix perfectly: the pages should be marked with proper pgprot value. This will be done in a future implementation like the conversion to dma_mmap_coherent(). Acked-by: Ralf Baechle <ralf@linux-mips.org> Signed-off-by: Takashi Iwai <tiwai@suse.de>
| * | | ALSA: pcm - define snd_pcm_default_page_ops()Takashi Iwai2009-11-261-8/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a helper (inline) function as the default page ops. Any hacks wrt the page address conversion will be applied in this function. Signed-off-by: Takashi Iwai <tiwai@suse.de>
| * | | ALSA: pcm - Use dma_mmap_coherent() if availableTakashi Iwai2009-11-261-16/+33
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | Use dma_mmap_coherent() for mmapping the buffers allocated via dma_alloc_coherent() if available. Currently, only ARM has this function, so we do temporarily have an ifdef pcm_native.c. This should be handled better globally in future. Signed-off-by: Takashi Iwai <tiwai@suse.de>
* | | Merge branch 'topic/beep-rename' into topic/core-changeTakashi Iwai2009-12-012-2/+12
|\ \ \
OpenPOWER on IntegriCloud