]> git.karo-electronics.de Git - karo-tx-linux.git/log
karo-tx-linux.git
14 years agoMerge branch 'topic/hda' into for-next
Takashi Iwai [Thu, 25 Feb 2010 07:50:15 +0000 (08:50 +0100)]
Merge branch 'topic/hda' into for-next

14 years agoALSA: hda - Add/fix ALC269 FSC and Quanta models
Kailang Yang [Thu, 25 Feb 2010 07:49:06 +0000 (08:49 +0100)]
ALSA: hda - Add/fix ALC269 FSC and Quanta models

Specify proper quirk models for FSC and Quanta machines with ALC269 codec.

Signed-off-by: Kailang Yang <kailang@realtek.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
14 years agoALSA: hda - Add ALC670 codec support
Kailang Yang [Thu, 25 Feb 2010 07:36:52 +0000 (08:36 +0100)]
ALSA: hda - Add ALC670 codec support

- Fixed alc_subsystem_id( ) typo and add new function.
   - !(ass & 0x100000)) ==> Delete this check. It is unnecessary check.
   - Add porti
- ALC670 support

Signed-off-by: Kailang Yang <kailang@realtek.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
14 years agoMerge branch 'topic/asoc' into for-next
Takashi Iwai [Thu, 25 Feb 2010 07:35:46 +0000 (08:35 +0100)]
Merge branch 'topic/asoc' into for-next

14 years agoOMAP4: PMIC: Add support for twl6030 codec
Misael Lopez Cruz [Wed, 24 Feb 2010 00:10:19 +0000 (18:10 -0600)]
OMAP4: PMIC: Add support for twl6030 codec

In order to have TWL6030 CODEC driver as a platform driver, codec data
should be passed through twl_platform_data structure.

For twl6030 audio codec, the following data may be passed:
    - audpwron_gpio: gpio line used to power-up/down the codec. A low-to-high
      transition powers codec up. Setting audpwron_gpio to a negative value
      means that codec will use manual power sequence instead of automatic
      sequence
    - naudint_irq: irq line for audio interrupt. twl6030 drives NAUDINT line
      to low when an interrupt (codec ready, plug insertion/removal, etc) is
      detected

However, codec driver can operate if any or none of them are passed.

Signed-off-by: Misael Lopez Cruz <x0052729@ti.com>
Signed-off-by: Margarita Olaya Cabrera <magi.olaya@ti.com>
Signed-off-by: Jorge Eduardo Candelaria <jorge.candelaria@ti.com>
Acked-by: Samuel Ortiz <sameo@linux.intel.com>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
14 years agoMerge branch 'topic/hda' into for-next
Takashi Iwai [Wed, 24 Feb 2010 08:13:29 +0000 (09:13 +0100)]
Merge branch 'topic/hda' into for-next

14 years agoALSA: hda - remove unnecessary msleep on power state transitions
Zhang, Rui [Wed, 24 Feb 2010 01:38:49 +0000 (09:38 +0800)]
ALSA: hda - remove unnecessary msleep on power state transitions

This will save ~15ms boot time.

The first 10ms sleep was introduced in commit d2595d86e5 for (buggy)
Cxt codecs, so better to limit the sleep to the problem hardware.

For the second 10ms sleep, the HDA spec says:

Power State[1:0]:
00: Node Power state (D0) is fully on.
01: Node Power state (D1) allows for (does not require) the lowest possible power consuming state from which it
can return to the "fully on" state (D0) within 10 ms, excepting analog pass through circuits (e.g., CD analog
playback) which must remain fully on.
10: Node Power state (D2) allows for (does not require) the lowest possible power consuming state from which it
can return to the "fully on" state (D0) within 10 ms. For modems, this is the "wake on ring" power state.
11: Node Power state (D3) allows for (does not require) lowest possible power consuming state under software
control. Note that any low power state set by software must retain sufficient operational capability to properly
respond to subsequent software Power State command.

So 10ms is actually the max wait time. It should be safe to
remove/reduce it and rely on the loop of 1ms-sleeps.

CC: Marc Boucher <marc@linuxant.com>
CC: Arjan van de Ven <arjan@linux.intel.com>
Signed-off-by: Zhang Rui <rui.zhang@intel.com>
Signed-off-by: Wu Fengguang <fengguang.wu@intel.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
14 years agoMerge branch 'topic/asoc' into for-next
Takashi Iwai [Tue, 23 Feb 2010 20:00:44 +0000 (21:00 +0100)]
Merge branch 'topic/asoc' into for-next

14 years agoMerge branch 'topic/usb-v2.0' into for-next
Takashi Iwai [Tue, 23 Feb 2010 20:00:38 +0000 (21:00 +0100)]
Merge branch 'topic/usb-v2.0' into for-next

14 years agousb/gadget/{f_audio,gmidi}.c: follow recent changes in audio.h
Daniel Mack [Tue, 23 Feb 2010 09:30:00 +0000 (10:30 +0100)]
usb/gadget/{f_audio,gmidi}.c: follow recent changes in audio.h

Some structs in linux/usb/audio.h have got new names to mark them as
part of version 1.0 of the USB audio standard. Follow these changes
in the gadget drivers.

Note that this header and the ALSA USB driver will undergo some
refactoring soon, so there might be another update to the gadgets as
well.

Signed-off-by: Daniel Mack <daniel@caiaq.de>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
14 years agoASoC: fsi: Modify over/under run error settlement
Kuninori Morimoto [Mon, 22 Feb 2010 07:41:57 +0000 (16:41 +0900)]
ASoC: fsi: Modify over/under run error settlement

In current FSI driver, playback function cares only overrun,
and capture function cares only underrun.

But playback function should had cared about underrun,
and capture function should had cared about overrun too.

Signed-off-by: Kuninori Morimoto <morimoto.kuninori@renesas.com>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
14 years agoASoC: OMAP4: Add McPDM platform driver
Misael Lopez Cruz [Mon, 22 Feb 2010 21:09:22 +0000 (15:09 -0600)]
ASoC: OMAP4: Add McPDM platform driver

McPDM platform driver is configured to use sDMA in order to transfer
to/from memory. Support for interfacing with ABE will be added later.

McPDM dai currently supports up to 4 downlink channels and 2 uplink
channels simultaneously, as well as 88.2 and 96 KHz, and a sample
size of 32 bits.

Signed-off-by: Misael Lopez Cruz <x0052729@ti.com>
Signed-off-by: Margarita Olaya <x0080101@ti.com>
Signed-off-by: Jorge Eduardo Candelaria <jorge.candelaria@ti.com>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
14 years agoASoC: OMAP4: Add support for McPDM
Candelaria Villareal, Jorge [Mon, 22 Feb 2010 23:17:21 +0000 (17:17 -0600)]
ASoC: OMAP4: Add support for McPDM

McPDM is the interface between Phoenix audio codec
and the OMAP4430 processor. It enables data to be transfered
to/from Phoenix at sample rates of 88.4 or 96 KHz.

Signed-off-by: Jorge Eduardo Candelaria <jorge.candelaria@ti.com>
Signed-off-by: Margarita Olaya <x0080101@ti.com>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
14 years agoASoC: OMAP: data_type and sync_mode configurable in audio dma
Misael Lopez Cruz [Mon, 22 Feb 2010 21:09:19 +0000 (15:09 -0600)]
ASoC: OMAP: data_type and sync_mode configurable in audio dma

Allow client drivers to set the data_type (16, 32) and the
sync_mode (element, packet, etc) of the audio dma transferences.

McBSP dai driver configures it for a data type of 16 bits and
element sync mode.

Signed-off-by: Misael Lopez Cruz <x0052729@ti.com>
Signed-off-by: Jorge Eduardo Candelaria <jorge.candelaria@ti.com>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
14 years agoMerge branch 'topic/hda' into for-next
Takashi Iwai [Tue, 23 Feb 2010 10:11:46 +0000 (11:11 +0100)]
Merge branch 'topic/hda' into for-next

14 years agoALSA: hda - Add missing description in HD-Audio-Models.txt
Takashi Iwai [Tue, 23 Feb 2010 09:55:46 +0000 (10:55 +0100)]
ALSA: hda - Add missing description in HD-Audio-Models.txt

Signed-off-by: Takashi Iwai <tiwai@suse.de>
14 years agoALSA: add support for Macbook Air 2,1 internal speaker
Reimundo Heluani [Tue, 23 Feb 2010 09:19:51 +0000 (01:19 -0800)]
ALSA: add support for Macbook Air 2,1 internal speaker

Add support for Macbook Air 2,1 (late 2008) internal speaker and
headphones. Create a "mba21" model for snd-hda-intel.

Signed-off-by: Reimundo Heluani <rheluani@gmail.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
14 years agoALSA: usbaudio: consolidate header files
Daniel Mack [Mon, 22 Feb 2010 22:49:13 +0000 (23:49 +0100)]
ALSA: usbaudio: consolidate header files

Use the definitions from linux/usb/audio.h all over the ALSA USB audio
driver and add some missing definitions there as well.

Use the endpoint attribute macros from linux/usb/ch9 and remove the own
things from sound/usb/usbaudio.h.

Now things are also nicely prefixed which makes understanding the code
easier.

Signed-off-by: Daniel Mack <daniel@caiaq.de>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
14 years agoALSA: usbmixer: bail out early when parsing audio class v2 descriptors
Daniel Mack [Mon, 22 Feb 2010 22:49:12 +0000 (23:49 +0100)]
ALSA: usbmixer: bail out early when parsing audio class v2 descriptors

This is just a quick hack that needs to be removed once the new units
defined by the audio class v2.0 standard are supported.

However, it allows using these devices for now, without mixer support.

Signed-off-by: Daniel Mack <daniel@caiaq.de>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
14 years agoALSA: usbaudio: implement basic set of class v2.0 parser
Daniel Mack [Mon, 22 Feb 2010 22:49:11 +0000 (23:49 +0100)]
ALSA: usbaudio: implement basic set of class v2.0 parser

This adds a number of parsers for audio class v2.0. In particular, the
following internals are different and now handled by the code:

* the number of streaming interfaces is now reported by an interface
  association descriptor. The old approach using a proprietary
  descriptor is deprecated.

* The number of channels per interface is now stored in the AS_GENERAL
  descriptor (used to be part of the FORMAT_TYPE descriptor).

* The list of supported sample rates is no longer stored in a variable
  length appendix of the format_type descriptor but is retrieved from
  the device using a class specific GET_RANGE command.

* Supported sample formats are now reported as 32bit bitmap rather than
  a fixed value. For now, this is worked around by choosing just one of
  them.

* A devices needs to have at least one CLOCK_SOURCE descriptor which
  denotes a clockID that is needed im the class request command.

* Many descriptors (format_type, ...) have changed their layout. Handle
  this by casting the descriptors to the appropriate structs.

Signed-off-by: Daniel Mack <daniel@caiaq.de>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
14 years agoALSA: usbaudio: introduce new types for audio class v2
Daniel Mack [Mon, 22 Feb 2010 22:49:10 +0000 (23:49 +0100)]
ALSA: usbaudio: introduce new types for audio class v2

This patch adds some definitions for audio class v2.

Unfortunately, the UNIT types PROCESSING_UNIT and EXTENSION_UNIT have
different numerical representations in both standards, so there is need
for a _V1 add-on now. usbmixer.c is changed accordingly.

Signed-off-by: Daniel Mack <daniel@caiaq.de>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
14 years agoALSA: usbaudio: parse USB descriptors with structs
Daniel Mack [Mon, 22 Feb 2010 22:49:09 +0000 (23:49 +0100)]
ALSA: usbaudio: parse USB descriptors with structs

In preparation of support for v2.0 audio class, use the structs from
linux/usb/audio.h and add some new ones to describe the fields that are
actually parsed by the descriptor decoders.

Also, factor out code from usb_create_streams(). This makes it easier to
adopt the new iteration logic needed for v2.0.

Signed-off-by: Daniel Mack <daniel@caiaq.de>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
14 years agoMerge branch 'topic/hda' into for-next
Takashi Iwai [Tue, 23 Feb 2010 07:18:57 +0000 (08:18 +0100)]
Merge branch 'topic/hda' into for-next

14 years agoALSA: hda - enable snoop for Intel Cougar Point
Seth Heasley [Tue, 23 Feb 2010 01:31:09 +0000 (17:31 -0800)]
ALSA: hda - enable snoop for Intel Cougar Point

This patch enables snoop, eliminating static during playback.
This patch supersedes the previous Cougar Point audio patch.

Signed-off-by: Seth Heasley <seth.heasley@intel.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
14 years agoMerge branch 'topic/hda' into for-next
Takashi Iwai [Tue, 23 Feb 2010 07:08:35 +0000 (08:08 +0100)]
Merge branch 'topic/hda' into for-next

14 years agoALSA: hda - Remove identical definitions for macmini3 model
Takashi Iwai [Tue, 23 Feb 2010 07:07:15 +0000 (08:07 +0100)]
ALSA: hda - Remove identical definitions for macmini3 model

The channel mode definitions for macmini3 model are identical with mb5.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
14 years agoMerge branch 'fix/misc' into for-next
Takashi Iwai [Mon, 22 Feb 2010 17:46:03 +0000 (18:46 +0100)]
Merge branch 'fix/misc' into for-next

14 years agoMerge remote branch 'alsa/fixes' into fix/misc
Takashi Iwai [Mon, 22 Feb 2010 17:45:34 +0000 (18:45 +0100)]
Merge remote branch 'alsa/fixes' into fix/misc

14 years agoASoC: core: On resume also check the soc device state
Peter Ujfalusi [Mon, 22 Feb 2010 11:27:13 +0000 (13:27 +0200)]
ASoC: core: On resume also check the soc device state

Check the card->codec on soc_resume to detect if the soc
device is properly initialized.
If the card->codec is NULL, than do not continue the resume
operation, since the device is not initialized properly.

Signed-off-by: Peter Ujfalusi <peter.ujfalusi@nokia.com>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
14 years agoALSA: via82xx: add quirk for D1289 motherboard
Clemens Ladisch [Mon, 22 Feb 2010 09:33:13 +0000 (10:33 +0100)]
ALSA: via82xx: add quirk for D1289 motherboard

Add a headphones-only quirk for the Fujitsu Siemens D1289.

Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
Reported-and-tested-by: Marc Haber <mh+alsa201002@zugschlus.de>
Cc: <stable@kernel.org>
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
14 years agoMerge branch 'topic/misc' into for-next
Takashi Iwai [Mon, 22 Feb 2010 08:56:53 +0000 (09:56 +0100)]
Merge branch 'topic/misc' into for-next

14 years agoALSA: usbaudio Mbox support, output only
Chris J Arges [Wed, 17 Feb 2010 18:12:52 +0000 (12:12 -0600)]
ALSA: usbaudio Mbox support, output only

Signed-off-by: Chris J Arges <christopherarges@gmail.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
14 years agoMerge branch 'topic/hda' into for-next
Takashi Iwai [Mon, 22 Feb 2010 07:38:07 +0000 (08:38 +0100)]
Merge branch 'topic/hda' into for-next

14 years agoALSA: hda-intel: Add position_fix quirk for ASUS M2V-MX SE.
Paul Menzel [Mon, 8 Feb 2010 19:42:46 +0000 (20:42 +0100)]
ALSA: hda-intel: Add position_fix quirk for ASUS M2V-MX SE.

With PulseAudio and an application accessing an input device like `gnome-volume-manager` both have high CPU load as reported in [1].

Loading `snd-hda-intel` with `position_fix=1` fixes this issue. Therefore add a quirk for ASUS M2V-MX SE.

The only downside is, when now exiting for example MPlayer when it is playing an audio file a high pitched sound is outputted by the speaker.

$ lspci -vvnn | grep -A10 Audio
20:01.0 Audio device [0403]: VIA Technologies, Inc. VT1708/A [Azalia HDAC] (VIA High Definition Audio Controller) [1106:3288] (rev 10)
Subsystem: ASUSTeK Computer Inc. Device [1043:8290]
Control: I/O- Mem+ BusMaster+ SpecCycle- MemWINV- VGASnoop- ParErr- Stepping- SERR- FastB2B- DisINTx-
Status: Cap+ 66MHz- UDF- FastB2B- ParErr- DEVSEL=fast >TAbort- <TAbort- <MAbort- >SERR- <PERR- INTx-
Latency: 0, Cache Line Size: 64 bytes
Interrupt: pin A routed to IRQ 17
Region 0: Memory at fbffc000 (64-bit, non-prefetchable) [size=16K]
Capabilities: <access denied>
Kernel driver in use: HDA Intel

[1] http://sourceforge.net/mailarchive/forum.php?thread_name=1265550675.4642.24.camel%40mattotaupa&forum_name=alsa-user

Signed-off-by: Paul Menzel <paulepanter@users.sourceforge.net>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
14 years agoALSA: Typo. s/distrubs/disturbs/
Paul Menzel [Mon, 8 Feb 2010 19:37:26 +0000 (20:37 +0100)]
ALSA: Typo. s/distrubs/disturbs/

Signed-off-by: Paul Menzel <paulepanter@users.sourceforge.net>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
14 years agoMerge branch 'topic/hda' into for-next
Takashi Iwai [Mon, 22 Feb 2010 07:35:55 +0000 (08:35 +0100)]
Merge branch 'topic/hda' into for-next

14 years agoALSA: hda - Clean up Intel Mac unsol codes
Takashi Iwai [Mon, 22 Feb 2010 07:34:40 +0000 (08:34 +0100)]
ALSA: hda - Clean up Intel Mac unsol codes

Use the standard unsol_event callback with each setup callback for
IntelMac models with Realtek ALC885 codecs.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
14 years agoALSA: hda - Add Macmini 3,1 support
Luke Yelavich [Fri, 12 Feb 2010 05:28:29 +0000 (16:28 +1100)]
ALSA: hda - Add Macmini 3,1 support

BugLink: https://bugs.edge.launchpad.net/ubuntu/+source/linux/+bug/343989
Add a model quirk for the NVIDIA based Macmini hardware, aka Macmini 3,1. The
pinout is almost identical to the mb5 quirk, except for no microphone and
the line-in mixer controls being on a different index. Everything works in
2ch mode, but as I am not sure what needs to be changed for 6ch mode, or
whether the Mac Mini's chip supports 6ch mode, I have simply duplicated
the code from the mb5 quirk for the mac mini chmode management. The new
model parameter for this quirk is "macmini3".

Signed-off-by: Luke Yelavich <luke.yelavich@canonical.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
14 years agoALSA: hda: Use 3stack quirk for Toshiba Satellite L40-10Q
Daniel T Chen [Sat, 20 Feb 2010 16:16:30 +0000 (11:16 -0500)]
ALSA: hda: Use 3stack quirk for Toshiba Satellite L40-10Q

BugLink: https://bugs.launchpad.net/bugs/524948
The OR has verified that the existing model=laptop-eapd quirk does not
function correctly but instead needs model=3stack.  Make this change
so that manual corrections to module-init-tools file(s) are not
required.

Reported-by: Lasse Havelund <lasse@havelund.org>
CC: <stable@kernel.org>
Signed-off-by: Daniel T Chen <crimsun@ubuntu.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
14 years agoMerge branch 'topic/misc' into for-next
Takashi Iwai [Thu, 18 Feb 2010 07:12:47 +0000 (08:12 +0100)]
Merge branch 'topic/misc' into for-next

14 years agoALSA: cs46xx - fix some typos
Florian Zumbiehl [Thu, 18 Feb 2010 06:03:55 +0000 (07:03 +0100)]
ALSA: cs46xx - fix some typos

Signed-off-by: Florian Zumbiehl <florz@florz.de>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
14 years agoALSA: cs46xx - Do test writes to register AC97_REC_GAIN in
Florian Zumbiehl [Thu, 18 Feb 2010 06:01:20 +0000 (07:01 +0100)]
ALSA: cs46xx - Do test writes to register AC97_REC_GAIN in

snd_cs46xx_codec_reset() bypassing the register cache, so as to not
clobber the cached register value during resume.

Signed-off-by: Florian Zumbiehl <florz@florz.de>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
14 years agoMerge branch 'topic/asoc' into for-next
Takashi Iwai [Wed, 17 Feb 2010 20:33:25 +0000 (21:33 +0100)]
Merge branch 'topic/asoc' into for-next

14 years agoASoC: Make pmdown_time a long
Mark Brown [Wed, 17 Feb 2010 14:30:44 +0000 (14:30 +0000)]
ASoC: Make pmdown_time a long

Fixes a warning.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
14 years agoASoC: TWL4030: Use codec defaults for Headset initial configuration
Peter Ujfalusi [Wed, 17 Feb 2010 07:49:54 +0000 (09:49 +0200)]
ASoC: TWL4030: Use codec defaults for Headset initial configuration

Disable the amplifiers for the headset outputs, and do not select
routings by default to the headset outputs.

Signed-off-by: Peter Ujfalusi <peter.ujfalusi@nokia.com>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
14 years agoMerge branch 'topic/misc' into for-next
Takashi Iwai [Wed, 17 Feb 2010 13:25:51 +0000 (14:25 +0100)]
Merge branch 'topic/misc' into for-next

14 years agoMerge branch 'fix/misc' into for-next
Takashi Iwai [Wed, 17 Feb 2010 13:25:44 +0000 (14:25 +0100)]
Merge branch 'fix/misc' into for-next

14 years agoMerge branch 'fix/misc' into topic/misc
Takashi Iwai [Wed, 17 Feb 2010 13:24:46 +0000 (14:24 +0100)]
Merge branch 'fix/misc' into topic/misc

Conflicts:
sound/pci/hda/patch_realtek.c

14 years agoMerge remote branch 'alsa/fixes' into fix/misc
Takashi Iwai [Wed, 17 Feb 2010 13:22:21 +0000 (14:22 +0100)]
Merge remote branch 'alsa/fixes' into fix/misc

14 years agoALSA: Echoaudio, fix Guru Meditation #00000005.48454C50
Giuliano Pochini [Tue, 16 Feb 2010 23:57:44 +0000 (00:57 +0100)]
ALSA: Echoaudio, fix Guru Meditation #00000005.48454C50

This patch fixes a division by zero error in the irq handler.

There is a small window between the hw_params() callback and when
runtime->frame_bits is set by ALSA middle layer. When another substream is
already running, if an interrupt is delivered during that window the irq
handler calls pcm_pointer() which does a division by zero. The patch below
makes the irq handler skip substreams that are initialized but not started
yet. Cc to Clemens Ladisch because he proposed an alternate fix.

For more information, please read the original thread in the linux-kernel
mailing list: http://lkml.org/lkml/2010/2/2/187

Signed-off-by: Giuliano Pochini <pochini@shiny.it>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
14 years agoMerge branch 'topic/asoc' into for-next
Takashi Iwai [Tue, 16 Feb 2010 19:56:21 +0000 (20:56 +0100)]
Merge branch 'topic/asoc' into for-next

14 years agoASoC: tlv320dac33: Correct the OSCSET calculation
Peter Ujfalusi [Tue, 16 Feb 2010 11:23:16 +0000 (13:23 +0200)]
ASoC: tlv320dac33: Correct the OSCSET calculation

OSCSET calculation was not correct in case of 44.1KHz
sampling rate.
With small adjustment both 48 and 44.1 KHz calculation
now gives the correct value.

Signed-off-by: Peter Ujfalusi <peter.ujfalusi@nokia.com>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
14 years agoASoC: tlv320dac33: Clearing FIFOFLUSH flag before playback
Peter Ujfalusi [Tue, 16 Feb 2010 11:23:15 +0000 (13:23 +0200)]
ASoC: tlv320dac33: Clearing FIFOFLUSH flag before playback

In repeated playback the FIFOFLUSH bit remained set, and
never has been cleared.
Clear it during the setup phase.

Signed-off-by: Peter Ujfalusi <peter.ujfalusi@nokia.com>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
14 years agoASoC: Make pmdown_time runtime configurable
Mark Brown [Fri, 12 Feb 2010 11:37:24 +0000 (11:37 +0000)]
ASoC: Make pmdown_time runtime configurable

Provide a sysfs file allowing userspace to inspect and change the
pmdown_time setting at runtime.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
14 years agoASoC: Make pmdown_time a per-card setting
Mark Brown [Fri, 12 Feb 2010 11:05:44 +0000 (11:05 +0000)]
ASoC: Make pmdown_time a per-card setting

Make the pmdown_time a per-card setting rather than a global one,
initialised before the card initialisation runs. This allows cards
to override the default setting if it makes sense to do so (for
example, due to an unavoidable pop).

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
14 years agoALSA: usbmixer - use MAX_ID_ELEMS where possible
Jaroslav Kysela [Tue, 16 Feb 2010 10:55:18 +0000 (11:55 +0100)]
ALSA: usbmixer - use MAX_ID_ELEMS where possible

Signed-off-by: Jaroslav Kysela <perex@perex.cz>
14 years agoALSA: usbmixer - add usb_id value to usbmixer proc file
Jaroslav Kysela [Tue, 16 Feb 2010 10:52:27 +0000 (11:52 +0100)]
ALSA: usbmixer - add usb_id value to usbmixer proc file

Signed-off-by: Jaroslav Kysela <perex@perex.cz>
14 years agoALSA: pcm core - fix fifo_size channels interval check
Jaroslav Kysela [Tue, 16 Feb 2010 10:55:43 +0000 (11:55 +0100)]
ALSA: pcm core - fix fifo_size channels interval check

Signed-off-by: Jaroslav Kysela <perex@perex.cz>
Cc: <stable@kernel.org>
14 years agoALSA: usbmixer - introduce /proc/asound/card#/usbmixer file
Jaroslav Kysela [Tue, 16 Feb 2010 10:17:09 +0000 (11:17 +0100)]
ALSA: usbmixer - introduce /proc/asound/card#/usbmixer file

The usbmixer proc file contains mapping between ALSA control API and
USB mixer control units. The purpose of this file is for debugging
and a problem diagnostics.

Signed-off-by: Jaroslav Kysela <perex@perex.cz>
14 years agoMerge branch 'topic/misc' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai...
Jaroslav Kysela [Tue, 16 Feb 2010 10:25:03 +0000 (11:25 +0100)]
Merge branch 'topic/misc' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6 into devel

14 years agoMerge branch 'fixes' into devel
Jaroslav Kysela [Tue, 16 Feb 2010 10:19:18 +0000 (11:19 +0100)]
Merge branch 'fixes' into devel

14 years agoALSA: USB MIDI support for Access Music VirusTI
Sebastien Alaiwan [Tue, 16 Feb 2010 07:55:08 +0000 (08:55 +0100)]
ALSA: USB MIDI support for Access Music VirusTI

Here's a patch that adds MIDI support through USB for one of the Access
Music synths, the VirusTI.

The synth uses standard USBMIDI protocol on its USB interface 3, although
it does signal "vendor specific" class. A magic string has to be sent on
interface 3 to enable the sending of MIDI from the synth (this string was
found by sniffing usb communication of the Windows driver). This is all
my patch does, and it works on my computer.

Please note that the synth can also do standard usb audio I/O on its
interfaces 2&3, which already works with the current snd-usb-audio driver,
except for the audio input from the synth. I'm going to work on it when I
have some time.

Signed-off-by: Sebastien Alaiwan <sebastien.alaiwan@gmail.com>
Signed-off-by: Clemens Ladisch <clemens@ladisch.de> (cosmetics, list terminator)
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
14 years agoALSA: usb-audio: reduce MIDI packet size to work around broken firmware
Clemens Ladisch [Mon, 15 Feb 2010 07:55:28 +0000 (08:55 +0100)]
ALSA: usb-audio: reduce MIDI packet size to work around broken firmware

Extend the list of devices whose firmware does not expect more than one
USB MIDI packet in one USB packet.

bug report: https://bugtrack.alsa-project.org/alsa-bug/view.php?id=3752

Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
Cc: <stable@kernel.org>
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
14 years agoMerge branch 'fix/hda' into for-next
Takashi Iwai [Mon, 15 Feb 2010 16:07:19 +0000 (17:07 +0100)]
Merge branch 'fix/hda' into for-next

14 years agoALSA: hda - Correct ASUA blacklist for MSI brokenness
Takashi Iwai [Mon, 15 Feb 2010 16:05:28 +0000 (17:05 +0100)]
ALSA: hda - Correct ASUA blacklist for MSI brokenness

The MSI blacklist entry for ASUS mobo added in the commit
8ce28d6abff34886d3797b25324c940471b99164 was based on the alsa-info
output wrongly posted.  Fix the id to the right one now.

Reported-by: Sid Boyce <sboyce@blueyonder.co.uk>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
14 years agoMerge branch 'topic/misc' into for-next
Takashi Iwai [Mon, 15 Feb 2010 09:41:14 +0000 (10:41 +0100)]
Merge branch 'topic/misc' into for-next

14 years agoALSA: Echoaudio - Add suspend support #2
Giuliano Pochini [Sun, 14 Feb 2010 17:16:10 +0000 (18:16 +0100)]
ALSA: Echoaudio - Add suspend support #2

This patch adds rearranges parts of the initialization code and adds
suspend and resume callbacks.

This patch adds suspend and resume callbacks.
It also rearranges parts of the initialization code so it can be
used in both the first initialization (when the module is loaded we
also have to load default settings) and the resume callback (where
we have to restore the previous settings).

Signed-off-by: Giuliano Pochini <pochini@shiny.it>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
14 years agoALSA: Echoaudio - Add suspend support #1
Giuliano Pochini [Sun, 14 Feb 2010 17:15:59 +0000 (18:15 +0100)]
ALSA: Echoaudio - Add suspend support #1

Move the controls init code outside the init_hw() function because is must
not be called during resume.

This patch moves the code that initializes the card's controls with
default valued from the init_hw() function into a separated
set_mixer_defaults() function (one for each of the 16 supported
cards). This change is necessary because during resume we must
resurrect the hardware without losing the previous
settings. set_mixer_defaults() must be called only once when the
module is loaded.

Signed-off-by: Giuliano Pochini <pochini@shiny.it>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
14 years agoALSA: Echoaudio - Add firmware cache #2
Giuliano Pochini [Sun, 14 Feb 2010 17:15:51 +0000 (18:15 +0100)]
ALSA: Echoaudio - Add firmware cache #2

This patch implements a simple cache for the firmware files when CONFIG_PM is defined.

This patch changes get_firmware(), free_firmware() and adds
free_firmware_cache(). The first two functions implement a very
simple cache and the latter is used to actually release all the stored
firmwares when the module is unloaded.
When CONFIG_PM is not enabled those functions act as before, that is
free_firmware() releases the firmware immediately and
free_firmware_cache() does nothing.

Signed-off-by: Giuliano Pochini <pochini@shiny.it>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
14 years agoALSA: Echoaudio - Add firmware cache #1
Giuliano Pochini [Sun, 14 Feb 2010 17:15:34 +0000 (18:15 +0100)]
ALSA: Echoaudio - Add firmware cache #1

Changes the way the firmware is passed through functions.

When CONFIG_PM is enabled the firmware cannot be released because the
driver will need it again to resume the card.
With this patch the firmware is passed as an index of the struct
firmware card_fw[] in place of a pointer. That same index is then used
to locate the firmware in the firmware cache.

Signed-off-by: Giuliano Pochini <pochini@shiny.it>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
14 years agoMerge branch 'topic/hda' into for-next
Takashi Iwai [Sat, 13 Feb 2010 09:16:41 +0000 (10:16 +0100)]
Merge branch 'topic/hda' into for-next

14 years agoALSA: hda - Add support for Lenovo IdeaPad U150
Greg Alexander [Sat, 13 Feb 2010 07:02:25 +0000 (02:02 -0500)]
ALSA: hda - Add support for Lenovo IdeaPad U150

Add patch for the Conexant 5066 HDA codec to support the Lenovo IdeaPad U150

Signed-off-by: Greg Alexander <greigs@galexander.org>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
14 years agoLinux 2.6.33-rc8 v2.6.33-rc8
Linus Torvalds [Fri, 12 Feb 2010 19:07:45 +0000 (11:07 -0800)]
Linux 2.6.33-rc8

14 years agoMerge remote branch 'asoc/for-2.6.34' into for-next
Takashi Iwai [Fri, 12 Feb 2010 18:55:32 +0000 (19:55 +0100)]
Merge remote branch 'asoc/for-2.6.34' into for-next

14 years agoMerge branch 'fix/hda' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6
Linus Torvalds [Fri, 12 Feb 2010 18:12:28 +0000 (10:12 -0800)]
Merge branch 'fix/hda' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6

* 'fix/hda' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6:
  ALSA: hda - use WARN_ON_ONCE() for zero-division detection

14 years agoMerge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/anholt...
Linus Torvalds [Fri, 12 Feb 2010 17:32:10 +0000 (09:32 -0800)]
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/anholt/drm-intel

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/anholt/drm-intel:
  drm/i915: hold ref on flip object until it completes
  drm/i915: Fix crash while aborting hibernation
  drm/i915: Correctly return -ENOMEM on allocation failure in cmdbuf ioctls.
  drm/i915: fix pipe source image setting in flip command
  drm/i915: fix flip done interrupt on Ironlake
  drm/i915: untangle page flip completion
  drm/i915: handle FBC and self-refresh better
  drm/i915: Increase fb alignment to 64k
  drm/i915: Update write_domains on active list after flush.
  drm/i915: Rework DPLL calculation parameters for Ironlake

14 years agoMerge branch 'fix/hda' into for-next
Takashi Iwai [Fri, 12 Feb 2010 17:20:30 +0000 (18:20 +0100)]
Merge branch 'fix/hda' into for-next

14 years agoALSA: hda - use WARN_ON_ONCE() for zero-division detection
Takashi Iwai [Fri, 12 Feb 2010 17:17:06 +0000 (18:17 +0100)]
ALSA: hda - use WARN_ON_ONCE() for zero-division detection

Replace the zero-division warning message with WARN_ON_ONCE() per the
advice by Linus.  This shouldn't happen, but if it happens, it's
possible that the bug happens often due to buggy IRQs.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
14 years agoparisc: fix tracing of signals
Kyle McMartin [Fri, 12 Feb 2010 15:53:08 +0000 (10:53 -0500)]
parisc: fix tracing of signals

Mike Frysinger pointed out that calling tracehook_signal_handler with
stepping=0 missed testing the thread flags, resulting in not calling
ptrace_notify. Fix this by testing if we're single stepping or branch
stepping and setting the flag accordingly.

Tested, seems to work.

Reported-by: Mike Frysinger <vapier@gentoo.org>
Signed-off-by: Kyle McMartin <kyle@mcmartin.ca>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
14 years agoMerge branch 'fix/hda' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6
Linus Torvalds [Fri, 12 Feb 2010 16:48:47 +0000 (08:48 -0800)]
Merge branch 'fix/hda' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6

* 'fix/hda' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6:
  ALSA: hda-intel: Avoid divide by zero crash

14 years agoMerge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lrg/voltage-2.6
Linus Torvalds [Fri, 12 Feb 2010 16:48:35 +0000 (08:48 -0800)]
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lrg/voltage-2.6

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lrg/voltage-2.6:
  regulator/lp3971: vol_map out of bounds in lp3971_{ldo,dcdc}_set_voltage()
  regulator: Fix display of null constraints for regulators

14 years agoMerge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-fixes
Linus Torvalds [Fri, 12 Feb 2010 16:46:23 +0000 (08:46 -0800)]
Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-fixes

* git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-fixes:
  GFS2: Fix bmap allocation corner-case bug
  GFS2: Fix error code

14 years agoregulator/lp3971: vol_map out of bounds in lp3971_{ldo,dcdc}_set_voltage()
Roel Kluin [Fri, 12 Feb 2010 11:30:21 +0000 (12:30 +0100)]
regulator/lp3971: vol_map out of bounds in lp3971_{ldo,dcdc}_set_voltage()

After `for (val = LDO_VOL_MIN_IDX; val <= LDO_VOL_MAX_IDX; val++)', if no break
occurs, val reaches LDO_VOL_MIN_IDX + 1, which is out of bounds for
ldo45_voltage_map[] and ldo123_voltage_map[].

Similarly BUCK_TARGET_VOL_MAX_IDX + 1 is out of bounds for buck_voltage_map[].

Signed-off-by: Roel Kluin <roel.kluin@gmail.com>
Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Liam Girdwood <lrg@slimlogic.co.uk>
14 years agoregulator: Fix display of null constraints for regulators
Mark Brown [Thu, 11 Feb 2010 19:20:48 +0000 (19:20 +0000)]
regulator: Fix display of null constraints for regulators

If the regulator constraints are empty and there is no voltage
reported then nothing will be added to the text displayed for the
constraints, leading to random stack data being printed. This is
unlikely to happen for practical regulators since most will at
least report a voltage but should still be fixed.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Cc: stable@kernel.org
Signed-off-by: Liam Girdwood <lrg@slimlogic.co.uk>
14 years agoASoC: Add WM2000 driver
Mark Brown [Thu, 11 Feb 2010 13:27:19 +0000 (13:27 +0000)]
ASoC: Add WM2000 driver

The WM2000 is a low power, high quality handset receiver speaker
driver with Wolfson myZone™ Ambient Noise Cancellation (ANC). It
provides enhanced voice communication quality in a noisy environment
if the handset acoustics are designed appropriately.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
14 years agoASoC: fix compile breakage if CONFIG_SH_DMA_API=y && CONFIG_SND_SIU_MIGOR!=n
Guennadi Liakhovetski [Thu, 11 Feb 2010 17:11:10 +0000 (18:11 +0100)]
ASoC: fix compile breakage if CONFIG_SH_DMA_API=y && CONFIG_SND_SIU_MIGOR!=n

Audio on Migo-R cannot work if CONFIG_SH_DMA_API=y, but compilation should not
break anyway.

Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
14 years agoGFS2: Fix bmap allocation corner-case bug
Steven Whitehouse [Fri, 12 Feb 2010 10:10:55 +0000 (10:10 +0000)]
GFS2: Fix bmap allocation corner-case bug

This patch solves a corner case during allocation which occurs if both
metadata (indirect) and data blocks are required but there is an
obstacle in the filesystem (e.g. a resource group header or another
allocated block) such that when the allocation is requested only
enough blocks for the metadata are returned.

By changing the exit condition of this loop, we ensure that a
minimum of one data block will always be returned.

Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
14 years agoGFS2: Fix error code
Abhijith Das [Fri, 5 Feb 2010 23:25:41 +0000 (18:25 -0500)]
GFS2: Fix error code

We need this one-liner to signal the mount helper of the 'insufficient journals' condition.

Signed-off-by: Abhijith Das <adas@redhat.com>
Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
14 years agoMerge branch 'topic/misc' into for-next
Takashi Iwai [Fri, 12 Feb 2010 09:43:09 +0000 (10:43 +0100)]
Merge branch 'topic/misc' into for-next

14 years agoMerge remote branch 'alsa/devel' into topic/misc
Takashi Iwai [Fri, 12 Feb 2010 09:42:38 +0000 (10:42 +0100)]
Merge remote branch 'alsa/devel' into topic/misc

14 years agoMerge branch 'omap-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
Linus Torvalds [Thu, 11 Feb 2010 22:28:03 +0000 (14:28 -0800)]
Merge branch 'omap-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6

* 'omap-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6:
  OMAP: hsmmc: fix memory leak

14 years agoMerge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp
Linus Torvalds [Thu, 11 Feb 2010 22:07:13 +0000 (14:07 -0800)]
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp:
  amd64_edac: Do not falsely trigger kerneloops

14 years agoMerge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block
Linus Torvalds [Thu, 11 Feb 2010 22:07:00 +0000 (14:07 -0800)]
Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block

* 'for-linus' of git://git.kernel.dk/linux-2.6-block:
  cciss: Make cciss_seq_show handle holes in the h->drv[] array
  cfq-iosched: split seeky coop queues after one slice

14 years agoMerge branch 'bugfixes' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6
Linus Torvalds [Thu, 11 Feb 2010 22:06:28 +0000 (14:06 -0800)]
Merge branch 'bugfixes' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6

* 'bugfixes' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6:
  NFS: Fix the mapping of the NFSERR_SERVERFAULT error
  NFS: Remove a redundant check for PageFsCache in nfs_migrate_page()
  NFS: Fix a bug in nfs_fscache_release_page()

14 years agoMerge git://git.infradead.org/users/cbou/battery-2.6.33
Linus Torvalds [Thu, 11 Feb 2010 22:06:15 +0000 (14:06 -0800)]
Merge git://git.infradead.org/users/cbou/battery-2.6.33

* git://git.infradead.org/users/cbou/battery-2.6.33:
  wm97xx_battery: Handle missing platform data gracefully

14 years agoMerge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6
Linus Torvalds [Thu, 11 Feb 2010 22:05:55 +0000 (14:05 -0800)]
Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6:
  [SCSI] qla2xxx: Obtain proper host structure during response-queue processing.
  [SCSI] compat_ioct: fix bsg SG_IO
  [SCSI] qla2xxx: make msix interrupt handler safe for irq
  [SCSI] zfcp: Report FC BSG errors in correct field
  [SCSI] mptfusion : mptscsih_abort return value should be SUCCESS instead of value 0.

14 years agoMerge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
Linus Torvalds [Thu, 11 Feb 2010 22:03:42 +0000 (14:03 -0800)]
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
  Input: psmouse - make sure we don't schedule reconnects after cleanup

14 years agoMerge branch 'drm-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied...
Linus Torvalds [Thu, 11 Feb 2010 22:03:28 +0000 (14:03 -0800)]
Merge branch 'drm-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6

* 'drm-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6: (30 commits)
  vgaarb: fix incorrect dereference of userspace pointer.
  drm/radeon/kms: retry auxch on 0x20 timeout value.
  drm/radeon: Skip dma copy test in benchmark if card doesn't have dma engine.
  drm/vmwgfx: Fix a circular locking dependency bug.
  drm/vmwgfx: Drop scanout flag compat and add execbuf ioctl parameter members. Bumps major.
  drm/vmwgfx: Report propper framebuffer_{max|min}_{width|height}
  drm/vmwgfx: Update the user-space interface.
  drm/radeon/kms: fix screen clearing before fbcon.
  nouveau: fix state detection with switchable graphics
  drm/nouveau: move dereferences after null checks
  drm/nv50: make the pgraph irq handler loop like the pre-nv50 version
  drm/nv50: delete ramfc object after disabling fifo, not before
  drm/nv50: avoid unloading pgraph context when ctxprog is running
  drm/nv50: align size of buffer object to the right boundaries.
  drm/nv50: disregard dac outputs in nv50_sor_dpms()
  drm/nv50: prevent multiple init tables being parsed at the same time
  drm/nouveau: make dp auxch xfer len check for reads only
  drm/nv40: make INIT_COMPUTE_MEM a NOP, just like nv50
  drm/nouveau: Add proper vgaarb support.
  drm/nouveau: Fix fbcon on mixed pre-NV50 + NV50 multicard.
  ...

14 years agoMerge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx
Linus Torvalds [Thu, 11 Feb 2010 22:02:27 +0000 (14:02 -0800)]
Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx

* 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx:
  drivers/dma: Correct NULL test
  async-tx: fix buffer submission error handling in ipu_idma.c
  dmaengine: correct onstack wait_queue_head declaration
  ioat: fix infinite timeout checking in ioat2_quiesce
  dmaengine: fix memleak in dma_async_device_unregister

14 years agoMerge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
Linus Torvalds [Thu, 11 Feb 2010 22:01:46 +0000 (14:01 -0800)]
Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus

* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus:
  MIPS: Don't probe reserved EntryHi bits.
  MIPS: SNI: Correct NULL test
  MIPS: Fix __devinit __cpuinit confusion in cpu_cache_init
  MIPS: IP27: Make defconfig useful again.
  MIPS: Fixup of the r4k timer