Commit Graph

6577 Commits

Author SHA1 Message Date
Linus Torvalds
ae11be6f37 Merge refs/heads/for-linus from master.kernel.org:/pub/scm/linux/kernel/git/shaggy/jfs-2.6.git 2005-08-30 07:47:42 -07:00
Linus Torvalds
444bd6fc18 Merge HEAD from master.kernel.org:/pub/scm/linux/kernel/git/perex/alsa 2005-08-30 07:47:01 -07:00
Linus Torvalds
3cb904caa9 Merge refs/heads/drm-latest from master.kernel.org:/pub/scm/linux/kernel/git/airlied/drm-2.6 2005-08-30 07:45:15 -07:00
Clemens Ladisch
c88469704d [ALSA] usb-audio: throttle MIDI URB resubmits on USB errors
USB generic driver
When a USB error occurs that might indicate that the device has been
unplugged, don't resubmit the URB immediately to prevent flooding the
log with error messages before khubd has us disconnect()ed.

Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
2005-08-30 13:14:13 +02:00
Takashi Iwai
d568121ce3 [PATCH] Assign device pointer to OSS devices
Add register_sound_special_device() function to allow assignment of
device pointer to a specific OSS device for HAL.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
2005-08-30 08:58:37 +02:00
Jaroslav Kysela
68c339d906 [ALSA] version 1.0.10rc1 2005-08-30 08:48:35 +02:00
Lee Revell
c6c0b841dd [ALSA] Add identification for Live 5.1 [SB0220]
EMU10K1/EMU10K2 driver
Add identification for Live 5.1 [SB0220]

Signed-off-by: Lee Revell <rlrevell@joe-job.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
2005-08-30 08:47:48 +02:00
Takashi Iwai
6a293552ba [ALSA] emu10k1 - Add missing ac97 support on SBLive! Player 5.1
EMU10K1/EMU10K2 driver
Added the missing ac97 support on SBLive! Player 5.1.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
2005-08-30 08:47:46 +02:00
Takashi Iwai
9970dce566 [ALSA] intel8x0 - Add quirk for FSC 4010
Intel8x0 driver
Added ac97_quirk for FSC 4010.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
2005-08-30 08:47:43 +02:00
Takashi Iwai
7153a558ad [ALSA] pcm - Fix zero-division in 32bit compat layer
PCM Midlevel
Fixed zero-division bug in PCM 32bit compat layer.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
2005-08-30 08:47:40 +02:00
Daniel Horchner
e0c93cf311 [ALSA] intel8x0 - add AC97_TUNE_MUTE_LED quirk for HP nx8220 laptop 103c:0934
Intel8x0 driver

Signed-off-by: Jaroslav Kysela <perex@suse.cz>
2005-08-30 08:47:37 +02:00
Clemens Ladisch
c347e9fca7 [ALSA] usb-audio: fix Emagic MIDI protocol handling
USB generic driver
Emagic devices pad their packets not with 0xff bytes but with a 0xff
byte followed by garbage, so we have to stop at the first such byte.

Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
2005-08-30 08:47:34 +02:00
Takashi Iwai
a278655ff5 [ALSA] Fix missing spin_unlock
au88x0 driver,Common EMU synth
Fixed missing spin_unlock.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
2005-08-30 08:47:31 +02:00
Adrian Bunk
f442e8b0ea [ALSA] include/sound/gus.h: 'extern inline' -> 'static inline'
GUS Library
'extern inline' doesn't make much sense.

Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
2005-08-30 08:47:25 +02:00
Takashi Iwai
07e4ca50a5 [ALSA] hda-intel - Fix ULI M5461 support
HDA Intel driver
Fix and clean up for the support of ULI M5461
- set CORB/RIRB sizes explicitly
- add workarounds for ULI on ia32
- max number of streams depends on the chip type now
- increase the size of BDL

Signed-off-by: Takashi Iwai <tiwai@suse.de>
2005-08-30 08:47:22 +02:00
Takashi Iwai
3c10a9d9f8 [ALSA] hda-codec - Add beep support for Uniwill
HDA Codec driver
Added the missing beep support for Uniwill laptop (ALSA bug#1358).

Signed-off-by: Takashi Iwai <tiwai@suse.de>
2005-08-30 08:47:19 +02:00
Takashi Iwai
5ba094dbf1 [ALSA] vxpocket - Register device pointer
Digigram VX Pocket driver
Add snd_card_set_dev() to register the device pointer.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
2005-08-30 08:47:16 +02:00
Takashi Iwai
adf111e6ff [ALSA] vxpocket - Fix wrong index assignment
Digigram VX Pocket driver
Fixed the wrong index number assignment.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
2005-08-30 08:47:13 +02:00
Takashi Iwai
328ac7da6f [ALSA] vxpocket - Add missing event callback
Digigram VX Pocket driver
Added the missing event callback.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
2005-08-30 08:47:10 +02:00
Takashi Iwai
e0be4d32bd [ALSA] Fix compilation without CONFIG_PROC_FS
Memalloc module
Fix an error when built without CONFIG_PROC_FS.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
2005-08-30 08:47:07 +02:00
Takashi Iwai
befdf316ea [ALSA] hda-codec - Code clean up
HDA Codec driver
Use struct instead of array to improve the readability of hda_codec.c.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
2005-08-30 08:47:02 +02:00
Nicolas Graziano
9d8f53f2bb [ALSA] hda-intel - correct a bug in detection of rate supported
HDA Codec driver
The insertion of the rate 9600 make a shift in detection of supported
rate, put this rate at the end of the list.

Signed-off-by: Nicolas Graziano <nicolas.graziano@wanadoo.fr>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
2005-08-30 08:46:59 +02:00
Sergey Vlasov
66d10647fe [ALSA] HP nx6110 quirks
Intel8x0 driver,AC97 Codec
The HP nx6110 laptop needs to have Headphone Jack Sense enabled so
that the internal speakers will be turned off when headphones are
plugged in.

Also ac97_quirk=hp_only is needed to make a single Master volume in
the mixer instead of separate volumes for internal speakers and
headphones, which just confuses the user.

Signed-off-by: Sergey Vlasov <vsu@altlinux.ru>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
2005-08-30 08:46:55 +02:00
Jaroslav Kysela
5049c35b13 [ALSA] ac97_bus - revert last change and do it only in the ALSA tree
AC97 Codec

Signed-off-by: Jaroslav Kysela <perex@suse.cz>
2005-08-30 08:46:52 +02:00
Jaroslav Kysela
34ad73b9c5 [ALSA] ac97_bus - replace <linux/module.h> with <sound/driver.h> for consistency
AC97 Codec

Signed-off-by: Jaroslav Kysela <perex@suse.cz>
2005-08-30 08:46:48 +02:00
Takashi Iwai
352dbfd0e6 [ALSA] via82xx - Add DXS entry for MSI 7142
VIA82xx driver
Added the DXS entry for MSI 7142 (K8MM-V).

Signed-off-by: Takashi Iwai <tiwai@suse.de>
2005-08-30 08:46:45 +02:00
Jaroslav Kysela
41e4845c42 [ALSA] PCM resume cleanups
Digigram VX core,CS4231 driver,ATIIXP driver,VIA82xx driver
VIA82xx-modem driver,au88x0 driver,CS46xx driver,Trident driver
This patch disables SNDRV_PCM_INFO_RESUME flag for drivers which does not
support the full resume.

Signed-off-by: Jaroslav Kysela <perex@suse.cz>
2005-08-30 08:46:40 +02:00
Bjorge Dijkstra
61be3ce0f2 [ALSA] ac97 - make ac97 codec device name unique
AC97 Codec
The patch fixes the bus_id conflict error when registering two codecs
of the same type (ALSA bug#1334).

Signed-off-by: Bjorge Dijkstra <bjorge@gmx.net>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
2005-08-30 08:46:34 +02:00
Takashi Iwai
e8da2fbc2d [ALSA] hdspm - Fix module parameter description
RME9652 driver
Fix the module parameter description after proofreading.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
2005-08-30 08:46:33 +02:00
Takashi Iwai
1204de32d0 [ALSA] nm256 - Fix PM and irq handling
NM256 driver
- Fixed the PCM resume - restoring the rate setting
- Fixed the handling of buggy irqs
- Dynamically acquire/release irq handler to make the driver more robust
  to unknown irq storms (as OSS driver does).

Signed-off-by: Takashi Iwai <tiwai@suse.de>
2005-08-30 08:46:29 +02:00
Takashi Iwai
1cfe43d21b [ALSA] intel8x0 - Fix PM
Intel8x0 driver
Fixed the PCM resume of intel8x0.
Restores the requested register setting.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
2005-08-30 08:46:26 +02:00
Jaroslav Kysela
65d11d9551 [ALSA] ALSA timer - fixed compilation
Timer Midlevel

Signed-off-by: Jaroslav Kysela <perex@suse.cz>
2005-08-30 08:46:23 +02:00
Jaroslav Kysela
5ca307b28d [ALSA] Timer API - SNDRV_TIMER_EVENT_RESUME - val is resolution in ns
ALSA Core

Signed-off-by: Jaroslav Kysela <perex@suse.cz>
2005-08-30 08:46:21 +02:00
Jaroslav Kysela
a501dfa3a7 [ALSA] Timer API - added SUSPEND/RESUME events
PCM Midlevel,Timer Midlevel,ALSA Core
- added SNDRV_TIMER_EVENT_SUSPEND / RESUME events
- changed timer events from PAUSE / CONTINUE in PCM midlevel to SUSPEND / RESUME

Signed-off-by: Jaroslav Kysela <perex@suse.cz>
2005-08-30 08:46:18 +02:00
Jaroslav Kysela
47123197c5 [ALSA] hda-intel: Suspend/resume fixes for PCM devices
HDA Intel driver
- removed SNDRV_PCM_INFO_RESUME (the driver cannot do PCM resume at the time)
- fixed chip->pcm_devs initialization

Signed-off-by: Jaroslav Kysela <perex@suse.cz>
2005-08-30 08:46:15 +02:00
Jaroslav Kysela
5a47fe3c5e [ALSA] hda-patch-realtek - added pci subdevice ID for Acer TravelMate 8100 (3 stack model + digital out)
HDA Codec driver

Signed-off-by: Jaroslav Kysela <perex@suse.cz>
2005-08-30 08:46:12 +02:00
Takashi Iwai
16d3f140fc [ALSA] via82xx - Fix SPDIF sample rates
VIA82xx driver
Fixed the sample rates set in the fourth DXS channel with Non-VRA mode.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
2005-08-30 08:46:09 +02:00
Takashi Iwai
b27113102f [ALSA] Fix PCM 32bit compat layer
PCM Midlevel
Fixed the handling of boundary in PCM 32bit compat layer.
Positions in hwsync are bound in the 32bit boundary size.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
2005-08-30 08:46:06 +02:00
Jaroslav Kysela
cff79742fc [ALSA] opl3sa2 - use different name for PnP BIOS driver
OPL3SA2 driver
- use different name (opl3sa2-pnpbios) for PnP BIOS driver
- don't print warning when manual config of resources fails (PnP BIOS)

Signed-off-by: Jaroslav Kysela <perex@suse.cz>
2005-08-30 08:46:03 +02:00
Clemens Ladisch
3e6c6139f0 [ALSA] ac97: make patch_wolfson_wm97??_specific() functions static
AC97 Codec
Make the patch_wolfson_wm97??_specific() functions static again.
This patch was accidentally reverted in rev. 1.92.

Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
2005-08-30 08:46:00 +02:00
Clemens Ladisch
6207e51b79 [ALSA] usb-audio: use vmalloc for the PCM buffer
USB generic driver
With the double buffering, we no longer need contiguous memory for the
PCM buffer, so we can use vmalloc() instead of the preallocation
functions, and increase the maximum size to 256 KB.

Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
2005-08-30 08:45:57 +02:00
Clemens Ladisch
55851f734d [ALSA] usb-audio: use usb_buffer_alloc/free
USB generic driver
Use the USB buffer allocation functions to avoid repeated DMA mappings
of our buffers, which are re-used quite a lot.

Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
2005-08-30 08:45:53 +02:00
Clemens Ladisch
daa150ef7d [ALSA] usb-audio: properly lock hwptr_done accesses
USB generic driver
Take the substream lock when reading hwptr_done to avoid a race
condition with the updates in the URB callbacks.

Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
2005-08-30 08:45:50 +02:00
Clemens Ladisch
9624ea812c [ALSA] usb-audio: actually schedule playback URBs at frame boundaries
USB generic driver
Change prepare_playback_urb() not to stop preparing packets before a
frame boundary has been reached.

Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
2005-08-30 08:45:47 +02:00
Clemens Ladisch
7efd8bc800 [ALSA] usb-audio: double-buffer all playback data
USB generic driver
We always had to use double buffering when capturing, and when playback
data for one URB crosses a buffer boundary.  The latter would make hwptr
updates less precise because the double-buffered data is read from the
buffer much earlier than the other data is read by the host controller.

Double-buffering all data allows to update hwptr immediately after the
data was copied to the USB buffer(s), which has the additional benefit
of avoiding the latency imposed by the host controller's delay of up to
one frame when interrupting.

Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
2005-08-30 08:45:43 +02:00
Clemens Ladisch
b263a9bdf9 [ALSA] usb-audio: optimize handling of capture URBs
USB generic driver
When preparing capture URBs, we don't need to stop when we cross a
period boundary because we now never handle more than one millisecond of
data per URB anyway.

When handling captured data, use an extra flag to call
snd_pcm_period_elapsed() no more than once.  This allows us to move the
period boundary checking code before the copying of the data which
avoids a second locking of the substream's lock.

Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
2005-08-30 08:45:41 +02:00
James Courtier-Dutton
99250872fc [ALSA] Add new card ID. Fixes ALSA bug #1297
EMU10K1/EMU10K2 driver

Signed-off-by: James Courtier-Dutton <James@superbug.co.uk>
2005-08-30 08:45:38 +02:00
James Courtier-Dutton
1b05962e8b [ALSA] Add new ID. Fixes ALSA bug #1298
CA0106 driver

Signed-off-by: James Courtier-Dutton <James@superbug.co.uk>
2005-08-30 08:45:35 +02:00
Jaroslav Kysela
53b266632b [ALSA] opl3sa2 - fixed typo in PnP BIOS IDs (YMF0021 -> YMH0021)
OPL3SA2 driver

Signed-off-by: Jaroslav Kysela <perex@suse.cz>
2005-08-30 08:45:32 +02:00
Jaroslav Kysela
1265509cb0 [ALSA] opl3sa2 driver - added support for PnP BIOS devices
OPL3SA2 driver
The driver has been extended to support also PnP BIOS devices.
The detection path is:

1) detect PnP BIOS devices
2) detect ISA PnP devices

Signed-off-by: Jaroslav Kysela <perex@suse.cz>
2005-08-30 08:45:28 +02:00