sound fixes for 2.6.35-rc1
Linus,
please pull sound fixes for v2.6.35-rc1 from:
git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6.git for-linus
No dramatical changes: a few regression fixes regarding PCM core-code rewrite in 2.6.34 in addition to a few more h/w specific quirks.
Thanks!
Takashi
===
Clemens Ladisch (4):
ALSA: pcm: fix the fix of the runtime->boundary calculation
ALSA: hda_intel: fix handling of non-completion stream interrupts
ALSA: pcm: fix delta calculation at boundary wraparound
ALSA: emu10k1: allow high-resolution mixer controls
Daniel Mack (1):
ALSA: usb/caiaq: fix Traktor Kontrol X1 ABS_HAT2X axis
Daniel T Chen (3):
ALSA: hda: Use LPIB for Acer Aspire 5110
ALSA: hda: Use LPIB for Toshiba A100-259
ALSA: hda: Fix model quirk for Dell M1730
H Hartley Sweeten (1):
ALSA: aw2-alsa.c: use pci_ids.h defines and fix checkpatch.pl noise
Justin P. Mattock (1):
ALSA: hda - iMac9,1 sound fixes
Krzysztof Foltman (1):
ALSA: usb-audio: add support for Akai MPD16
--- sound/core/pcm_lib.c | 13 ++++- sound/core/pcm_native.c | 39 +------------- sound/pci/aw2/aw2-alsa.c | 11 ++--- sound/pci/emu10k1/emufx.c | 36 ++++++++++--- sound/pci/hda/hda_intel.c | 9 +++- sound/pci/hda/patch_realtek.c | 84 ++++++++++++++---------------- sound/pci/hda/patch_sigmatel.c | 2 +- sound/usb/caiaq/input.c | 2 +- sound/usb/midi.c | 110 ++++++++++++++++++++++++++++++++++++++++ sound/usb/midi.h | 2 + sound/usb/quirks-table.h | 11 ++++ sound/usb/quirks.c | 1 + sound/usb/usbaudio.h | 1 + 13 files changed, 219 insertions(+), 102 deletions(-)
sound/core/pcm_lib.c +10 -3
@@ -345,7 +345,9 @@ static int snd_pcm_update_hw_ptr0(struct snd_pcm_substream *substream, new_hw_ptr = hw_base + pos; } __delta: - delta = (new_hw_ptr - old_hw_ptr) % runtime->boundary; + delta = new_hw_ptr - old_hw_ptr; +if (delta <0 ) + delta += runtime->boundary;if (xrun_debug (substream, in_interrupt ?XRUN_DEBUG_PERIODUPDATE :XRUN_DEBUG_HWPTRUPDATE )) {char name[16 ];
@@ -439,8 +441,13 @@ static int snd_pcm_update_hw_ptr0(struct snd_pcm_substream *substream,snd_pcm_playback_silence (substream, new_hw_ptr);if (in_interrupt) { - runtime->hw_ptr_interrupt = new_hw_ptr - - (new_hw_ptr % runtime->period_size); + delta = new_hw_ptr - runtime->hw_ptr_interrupt; +if (delta <0 ) + delta += runtime->boundary; + delta -= (snd_pcm_uframes_t )delta % runtime->period_size; + runtime->hw_ptr_interrupt += delta; +if (runtime->hw_ptr_interrupt >= runtime->boundary) + runtime->hw_ptr_interrupt -= runtime->boundary; } runtime->hw_ptr_base = hw_base; runtime->status->hw_ptr = new_hw_ptr;
sound/core/pcm_native.c +3 -36
@@ -27,7 +27,6 @@#include <linux/pm_qos_params.h> #include <linux/uio.h> #include <linux/dma-mapping.h> -#include <linux/math64.h> #include <sound/core.h> #include <sound/control.h> #include <sound/info.h>
@@ -370,38 +369,6 @@ static int period_to_usecs(struct snd_pcm_runtime *runtime)return usecs; } -static int calc_boundary (struct snd_pcm_runtime *runtime) -{ -u_int64_t boundary; - - boundary = (u_int64_t )runtime->buffer_size * - (u_int64_t )runtime->period_size; -#if BITS_PER_LONG <64 -/* try to find lowest common multiple for buffer and period */ -if (boundary >LONG_MAX - runtime->buffer_size) { -u_int32_t remainder =-1 ; -u_int32_t divident = runtime->buffer_size; -u_int32_t divisor = runtime->period_size; -while (remainder) { - remainder = divident % divisor; -if (remainder) { - divident = divisor; - divisor = remainder; - } - } - boundary =div_u64 (boundary, divisor); -if (boundary >LONG_MAX - runtime->buffer_size) -return -ERANGE ; - } -#endif -if (boundary ==0 ) -return -ERANGE ; - runtime->boundary = boundary; -while (runtime->boundary *2 <=LONG_MAX - runtime->buffer_size) - runtime->boundary *=2 ; -return 0 ; -} -static int snd_pcm_hw_params (struct snd_pcm_substream *substream,struct snd_pcm_hw_params *params) {
@@ -477,9 +444,9 @@ static int snd_pcm_hw_params(struct snd_pcm_substream *substream, runtime->stop_threshold = runtime->buffer_size; runtime->silence_threshold =0 ; runtime->silence_size =0 ; - err =calc_boundary (runtime); -if (err <0 ) - goto _error; + runtime->boundary = runtime->buffer_size; +while (runtime->boundary *2 <=LONG_MAX - runtime->buffer_size) + runtime->boundary *=2 ;snd_pcm_timer_resolution_change (substream); runtime->status->state =SNDRV_PCM_STATE_SETUP ;
sound/pci/aw2/aw2-alsa.c +4 -7
@@ -26,7 +26,7 @@#include <linux/slab.h> #include <linux/interrupt.h> #include <linux/delay.h> -#include <asm/io.h> +#include <linux/io.h> #include <sound/core.h> #include <sound/initval.h> #include <sound/pcm.h>
@@ -44,9 +44,6 @@ MODULE_LICENSE("GPL");/********************************* * DEFINES ********************************/ -#define PCI_VENDOR_ID_SAA7146 0x1131 -#define PCI_DEVICE_ID_SAA7146 0x7146 -#define CTL_ROUTE_ANALOG 0#define CTL_ROUTE_DIGITAL 1
@@ -165,7 +162,7 @@ module_param_array(enable, bool, NULL, 0444);MODULE_PARM_DESC (enable,"Enable Audiowerk2 soundcard." );static DEFINE_PCI_DEVICE_TABLE (snd_aw2_ids) = { - {PCI_VENDOR_ID_SAA7146 ,PCI_DEVICE_ID_SAA7146 ,0 ,0 , + {PCI_VENDOR_ID_PHILIPS ,PCI_DEVICE_ID_PHILIPS_SAA7146 ,0 ,0 ,0 ,0 ,0 }, {0 } };
@@ -419,7 +416,7 @@ static int snd_aw2_pcm_playback_open(struct snd_pcm_substream *substream) {struct snd_pcm_runtime *runtime = substream->runtime; -snd_printdd (KERN_DEBUG "aw2: Playback_open \n" ); +snd_printdd (KERN_DEBUG "aw2: Playback_open\n" ); runtime->hw = snd_aw2_playback_hw;return 0 ; }
@@ -435,7 +432,7 @@ static int snd_aw2_pcm_capture_open(struct snd_pcm_substream *substream) {struct snd_pcm_runtime *runtime = substream->runtime; -snd_printdd (KERN_DEBUG "aw2: Capture_open \n" ); +snd_printdd (KERN_DEBUG "aw2: Capture_open\n" ); runtime->hw = snd_aw2_capture_hw;return 0 ; }
sound/pci/emu10k1/emufx.c +28 -8
@@ -35,6 +35,7 @@#include <linux/vmalloc.h> #include <linux/init.h> #include <linux/mutex.h> +#include <linux/moduleparam.h> #include <sound/core.h> #include <sound/tlv.h>
@@ -50,6 +51,10 @@#define EMU10K1_CENTER_LFE_FROM_FRONT #endif +static bool high_res_gpr_volume; +module_param (high_res_gpr_volume, bool,0444 ); +MODULE_PARM_DESC (high_res_gpr_volume,"GPR mixer controls use 31-bit range." ); +/* * Tables */
@@ -296,6 +301,7 @@ static const u32 db_table[101] = {/* EMU10k1/EMU10k2 DSP control db gain */ static const DECLARE_TLV_DB_SCALE(snd_emu10k1_db_scale1, -4000, 40, 1); +static const DECLARE_TLV_DB_LINEAR(snd_emu10k1_db_linear, TLV_DB_GAIN_MUTE, 0);static const u32 onoff_table[2 ] = {0x00000000 ,0x00000001
@@ -1072,10 +1078,17 @@ snd_emu10k1_init_mono_control(struct snd_emu10k1_fx8010_control_gpr *ctl,strcpy (ctl->id.name, name); ctl->vcount = ctl->count =1 ; ctl->gpr[0 ] = gpr +0 ; ctl->value[0 ] = defval; - ctl->min =0 ; - ctl->max =100 ; - ctl->tlv = snd_emu10k1_db_scale1; - ctl->translation =EMU10K1_GPR_TRANSLATION_TABLE100 ; +if (high_res_gpr_volume) { + ctl->min =0 ; + ctl->max =0x7fffffff ; + ctl->tlv = snd_emu10k1_db_linear; + ctl->translation =EMU10K1_GPR_TRANSLATION_NONE ; + }else { + ctl->min =0 ; + ctl->max =100 ; + ctl->tlv = snd_emu10k1_db_scale1; + ctl->translation =EMU10K1_GPR_TRANSLATION_TABLE100 ; + } } static void __devinit
@@ -1087,10 +1100,17 @@ snd_emu10k1_init_stereo_control(struct snd_emu10k1_fx8010_control_gpr *ctl, ctl->vcount = ctl->count =2 ; ctl->gpr[0 ] = gpr +0 ; ctl->value[0 ] = defval; ctl->gpr[1 ] = gpr +1 ; ctl->value[1 ] = defval; - ctl->min =0 ; - ctl->max =100 ; - ctl->tlv = snd_emu10k1_db_scale1; - ctl->translation =EMU10K1_GPR_TRANSLATION_TABLE100 ; +if (high_res_gpr_volume) { + ctl->min =0 ; + ctl->max =0x7fffffff ; + ctl->tlv = snd_emu10k1_db_linear; + ctl->translation =EMU10K1_GPR_TRANSLATION_NONE ; + }else { + ctl->min =0 ; + ctl->max =100 ; + ctl->tlv = snd_emu10k1_db_scale1; + ctl->translation =EMU10K1_GPR_TRANSLATION_TABLE100 ; + } } static void __devinit
sound/pci/hda/hda_intel.c +7 -2
@@ -1097,6 +1097,7 @@ static irqreturn_t azx_interrupt(int irq, void *dev_id)struct azx *chip = dev_id;struct azx_dev *azx_dev;u32 status; +u8 sd_status;int i, ok;spin_lock (&chip->reg_lock);
@@ -1110,8 +1111,10 @@ static irqreturn_t azx_interrupt(int irq, void *dev_id)for (i =0 ; i < chip->num_streams; i++) { azx_dev = &chip->azx_dev[i];if (status & azx_dev->sd_int_sta_mask) { + sd_status =azx_sd_readb (azx_dev,SD_STS );azx_sd_writeb (azx_dev,SD_STS ,SD_INT_MASK ); -if (!azx_dev->substream || !azx_dev->running) +if (!azx_dev->substream || !azx_dev->running || + !(sd_status &SD_INT_COMPLETE ))continue ;/* check whether this IRQ is really acceptable */ ok =azx_position_ok (chip, azx_dev);
@@ -2279,12 +2282,14 @@ static int azx_dev_free(struct snd_device *device)* white/black-listing for position_fix */ static struct snd_pci_quirk position_fix_list[]__devinitdata = { +SND_PCI_QUIRK (0x1025 ,0x009f ,"Acer Aspire 5110" ,POS_FIX_LPIB ),SND_PCI_QUIRK (0x1028 ,0x01cc ,"Dell D820" ,POS_FIX_LPIB ),SND_PCI_QUIRK (0x1028 ,0x01de ,"Dell Precision 390" ,POS_FIX_LPIB ),SND_PCI_QUIRK (0x1028 ,0x01f6 ,"Dell Latitude 131L" ,POS_FIX_LPIB ),SND_PCI_QUIRK (0x103c ,0x306d ,"HP dv3" ,POS_FIX_LPIB ), -SND_PCI_QUIRK (0x1106 ,0x3288 ,"ASUS M2V-MX SE" ,POS_FIX_LPIB ),SND_PCI_QUIRK (0x1043 ,0x813d ,"ASUS P5AD2" ,POS_FIX_LPIB ), +SND_PCI_QUIRK (0x1106 ,0x3288 ,"ASUS M2V-MX SE" ,POS_FIX_LPIB ), +SND_PCI_QUIRK (0x1179 ,0xff10 ,"Toshiba A100-259" ,POS_FIX_LPIB ),SND_PCI_QUIRK (0x1458 ,0xa022 ,"ga-ma770-ud3" ,POS_FIX_LPIB ),SND_PCI_QUIRK (0x1462 ,0x1002 ,"MSI Wind U115" ,POS_FIX_LPIB ),SND_PCI_QUIRK (0x1565 ,0x820f ,"Biostar Microtech" ,POS_FIX_LPIB ),
sound/pci/hda/patch_realtek.c +40 -44
143 lines not on this page · raw message
sound/pci/hda/patch_sigmatel.c +1 -1
@@ -2078,12 +2078,12 @@ static struct snd_pci_quirk stac927x_cfg_tbl[] = {SND_PCI_QUIRK_MASK (PCI_VENDOR_ID_INTEL ,0xff00 ,0x2000 ,"Intel D965" ,STAC_D965_3ST ),/* Dell 3 stack systems */ -SND_PCI_QUIRK (PCI_VENDOR_ID_DELL ,0x01f7 ,"Dell XPS M1730" ,STAC_DELL_3ST ),SND_PCI_QUIRK (PCI_VENDOR_ID_DELL ,0x01dd ,"Dell Dimension E520" ,STAC_DELL_3ST ),SND_PCI_QUIRK (PCI_VENDOR_ID_DELL ,0x01ed ,"Dell " ,STAC_DELL_3ST ),SND_PCI_QUIRK (PCI_VENDOR_ID_DELL ,0x01f4 ,"Dell " ,STAC_DELL_3ST ),/* Dell 3 stack systems with verb table in BIOS */ SND_PCI_QUIRK (PCI_VENDOR_ID_DELL ,0x01f3 ,"Dell Inspiron 1420" ,STAC_DELL_BIOS ), +SND_PCI_QUIRK (PCI_VENDOR_ID_DELL ,0x01f7 ,"Dell XPS M1730" ,STAC_DELL_BIOS ),SND_PCI_QUIRK (PCI_VENDOR_ID_DELL ,0x0227 ,"Dell Vostro 1400 " ,STAC_DELL_BIOS ),SND_PCI_QUIRK (PCI_VENDOR_ID_DELL ,0x022e ,"Dell " ,STAC_DELL_BIOS ), SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x022f, "Dell Inspiron 1525", STAC_DELL_BIOS),
sound/usb/caiaq/input.c +1 -1
@@ -171,7 +171,7 @@ static void snd_caiaq_input_read_analog(struct snd_usb_caiaqdev *dev,input_report_abs (input_dev,ABS_HAT0Y , (buf[4 ] <<8 ) | buf[5 ]);input_report_abs (input_dev,ABS_HAT1X , (buf[12 ] <<8 ) | buf[13 ]);input_report_abs (input_dev,ABS_HAT1Y , (buf[2 ] <<8 ) | buf[3 ]); -input_report_abs (input_dev,ABS_HAT2X , (buf[15 ] <<8 ) | buf[15 ]); +input_report_abs (input_dev,ABS_HAT2X , (buf[14 ] <<8 ) | buf[15 ]);input_report_abs (input_dev,ABS_HAT2Y , (buf[0 ] <<8 ) | buf[1 ]);input_report_abs (input_dev,ABS_HAT3X , (buf[10 ] <<8 ) | buf[11 ]);input_report_abs (input_dev,ABS_HAT3Y , (buf[6 ] <<8 ) | buf[7 ]);
sound/usb/midi.c +110 -0
128 lines not on this page · raw message
sound/usb/midi.h +2 -0
@@ -37,6 +37,8 @@ struct snd_usb_midi_endpoint_info {/* for QUIRK_MIDI_CME, data is NULL */ +/* for QUIRK_MIDI_AKAI, data is NULL */ + int snd_usbmidi_create(struct snd_card *card, struct usb_interface *iface, struct list_head *midi_list,
sound/usb/quirks-table.h +11 -0
@@ -1973,6 +1973,17 @@ YAMAHA_DEVICE(0x7010, "UB99"), } }, +/* AKAI devices */ +{ + USB_DEVICE(0x09e8, 0x0062), + .driver_info = (unsigned long ) & (const struct snd_usb_audio_quirk ) { + .vendor_name ="AKAI" , + .product_name ="MPD16" , + .ifnum =0 , + .type =QUIRK_MIDI_AKAI , + } +}, +/* TerraTec devices */ { USB_DEVICE_VENDOR_SPEC(0x0ccd, 0x0012),
sound/usb/quirks.c +1 -0
@@ -289,6 +289,7 @@ int snd_usb_create_quirk(struct snd_usb_audio *chip, [QUIRK_MIDI_FASTLANE] = create_any_midi_quirk, [QUIRK_MIDI_EMAGIC] = create_any_midi_quirk, [QUIRK_MIDI_CME] = create_any_midi_quirk, + [QUIRK_MIDI_AKAI] = create_any_midi_quirk, [QUIRK_AUDIO_STANDARD_INTERFACE] = create_standard_audio_quirk, [QUIRK_AUDIO_FIXED_ENDPOINT] = create_fixed_stream_quirk, [QUIRK_AUDIO_EDIROL_UAXX] = create_uaxx_quirk,
sound/usb/usbaudio.h +1 -0
@@ -74,6 +74,7 @@ enum quirk_type {QUIRK_MIDI_FASTLANE ,QUIRK_MIDI_EMAGIC ,QUIRK_MIDI_CME , +QUIRK_MIDI_AKAI ,QUIRK_MIDI_US122L ,QUIRK_AUDIO_STANDARD_INTERFACE , QUIRK_AUDIO_FIXED_ENDPOINT,