30 May, 2010
9 commits
-
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6: (26 commits)
ALSA: snd-usb-caiaq: Bump version number to 1.3.21
ALSA: Revert "ALSA: snd-usb-caiaq: Set default input mode of A4DJ"
ALSA: snd-usb-caiaq: Simplify single case to an 'if'
ALSA: snd-usb-caiaq: Restore 'Control vinyl' input mode on A4DJ
ALSA: hda: Use LPIB for a Shuttle device
ALSA: hda: Add support for another Lenovo ThinkPad Edge in conexant codec
ALSA: hda: Use LPIB for Sony VPCS11V9E
ALSA: usb-audio: fix feature unit parser for UAC2
ALSA: asihpi - Minor code cleanup
ALSA: asihpi - Add support for new ASI8800 family
ALSA: asihpi - Fix bug preventing outstream_write preload from happening
ALSA: asihpi - Fix imbalanced lock path in hw_message
ALSA: asihpi - Remove support for old ASI8800 family
ALSA: asihpi - Add hd radio blend functions
ALSA: asihpi - Remove unused io map functions
ALSA: usb-audio: add support for UAC2 pitch control
ALSA: usb-audio: parse UAC2 endpoint descriptors correctly
ALSA: usb-audio: fix return values
ALSA: usb-audio: parse more format descriptors with structs
sound: Add missing spin_unlock
... -
Acked-by: Daniel Mack
Signed-off-by: Mark Hills
Signed-off-by: Takashi Iwai -
Do not explicity set the default input mode. Use the hardware default
of mode 0 ('Control vinyl'), which is now available.This reverts commit e3ca4c9.
Acked-by: Daniel Mack
Signed-off-by: Mark Hills
Signed-off-by: Takashi Iwai -
After removing code, only one case remains. So use an 'if' instead.
Acked-by: Daniel Mack
Signed-off-by: Mark Hills
Signed-off-by: Takashi Iwai -
This feature was undocumented on early A4DJ units. It is indicated
by lighting both the 'line' and 'phono' lamps at the same time.
Newer units document this and the newer Windows drivers enable this
for all units, so restore the functionality.This patch simplifies the code and changes the mode mapping to match
the A8DJ, favouring simpler code and consistency over keeping the
existing mapping.Both 'Control vinyl' and 'Phono' input modes enable the hardware
preamp. The difference is the input impedance.This reverts commit 9a9527e.
Acked-by: Daniel Mack
Signed-off-by: Mark Hills
Signed-off-by: Takashi Iwai -
BugLink: https://launchpad.net/bugs/551949
Symptom: On the reporter's Shuttle device, using PulseAudio in Ubuntu
10.04 LTS results in "popping clicking" audio with the PA crashing
shortly thereafter.Test case: Using Ubuntu 10.04 LTS (Linux 2.6.32.12), Linux 2.6.33, or
Linux 2.6.34, adjust the HDA device's volume with PulseAudio.Resolution: add SSID for this machine to the position_fix quirk table,
explicitly specifying the LPIB method.Reported-and-Tested-By: Christian Mehlis
Cc:
Signed-off-by: Daniel T Chen
Signed-off-by: Takashi Iwai
28 May, 2010
3 commits
-
On a Thinkpad Edge 13 "01972NG" I had the problem that speakers played
sound although headphones were plugged in. Using model=ideapad with
latest alsa-git kernel fixed this. So adding this quirk to use ideapad
for another Thinkpad Edge variant seems sensible.Cc: Jerone Young
Signed-off-by: Andreas Herrmann
Signed-off-by: Takashi Iwai -
BugLink: https://launchpad.net/bugs/586347
Symptom: On the Sony VPCS11V9E, using GStreamer-based applications with
PulseAudio in Ubuntu 10.04 LTS results in stuttering audio. It appears
to worsen with increased I/O.Test case: use Rhythmbox under increased I/O pressure. This symptom is
reproducible in the current daily stable alsa-driver snapshots (at least
up until 21 May 2010; later snapshots fail to build from source due to
missing preprocessor directives when compiled against 2.6.32).Resolution: add SSID for this machine to the position_fix quirk table,
explicitly specifying the LPIB method.Reported-and-Tested-By: Lauri Kainulainen
Cc:
Signed-off-by: Daniel T Chen
Signed-off-by: Takashi Iwai -
Fix a small off-by-one bug which causes the feature unit to announce a
wrong number of channels. This leads to illegal requests sent to the
firmware eventually.Signed-off-by: Daniel Mack
Signed-off-by: Takashi Iwai
27 May, 2010
14 commits
-
Signed-off-by: Eliot Blennerhassett
Signed-off-by: Takashi Iwai -
Signed-off-by: Eliot Blennerhassett
Signed-off-by: Takashi Iwai -
Signed-off-by: Eliot Blennerhassett
Signed-off-by: Takashi Iwai -
Signed-off-by: Eliot Blennerhassett
Signed-off-by: Takashi Iwai -
Signed-off-by: Eliot Blennerhassett
Signed-off-by: Takashi Iwai -
Add hd radio blend functions. HPI version inc to 4.03.25.
Signed-off-by: Eliot Blennerhassett
Signed-off-by: Takashi Iwai -
Signed-off-by: Eliot Blennerhassett
Signed-off-by: Takashi Iwai -
This request is again handled differently in comparison to UAC1.
Signed-off-by: Daniel Mack
Signed-off-by: Takashi Iwai -
UAC2 devices have their information about pitch control stored in a
different field. Parse it, and emulate the bits for a v1 device.A new struct uac2_iso_endpoint_descriptor is added.
Signed-off-by: Daniel Mack
Acked-by: Greg Kroah-Hartman
Signed-off-by: Takashi Iwai -
-1 is not a good return value as it means -EPERM, "not permitted".
Choose -ENOTSUPP instead, which is what the code really wants to tell
its callers.Signed-off-by: Daniel Mack
Signed-off-by: Takashi Iwai -
Signed-off-by: Daniel Mack
Signed-off-by: Takashi Iwai -
Add a spin_unlock missing on the error path.
The semantic match that finds this problem is as follows:
(http://coccinelle.lip6.fr/)//
@@
expression E1;
@@* spin_lock(E1,...);
* spin_unlock(E1,...);
//Signed-off-by: Julia Lawall
Signed-off-by: Takashi Iwai -
…ie/sound-2.6 into fix/asoc
-
This quirks in support for the Thinkpad Edge.
Signed-off-by: Jerone Young
Signed-off-by: Takashi Iwai
26 May, 2010
11 commits
-
These should be regular, not linear.
Signed-off-by: Mark Brown
Acked-by: Liam Girdwood
Cc: stable@kernel.org -
These scales should be regular, not linear.
Signed-off-by: Mark Brown
Acked-by: Liam Girdwood
Cc: stable@kernel.org -
These should be regular rather than linear scales.
Signed-off-by: Mark Brown
Acked-by: Liam Girdwood
Cc: stable@kernel.org -
This updates the i.MX SSI driver to make it compatible with the ASoC tree
following the move of DMA parameters from the DAI to the audio substream
object.Signed-off-by: Stuart Longland
Acked-by: Liam Girdwood
Signed-off-by: Mark Brown
Cc: stable@kernel.org -
Signed-off-by: Guennadi Liakhovetski
Signed-off-by: Mark Brown -
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6:
ALSA: emu10k1: allow high-resolution mixer controls
ALSA: pcm: fix delta calculation at boundary wraparound
ALSA: hda_intel: fix handling of non-completion stream interrupts
ALSA: usb/caiaq: fix Traktor Kontrol X1 ABS_HAT2X axis
ALSA: hda: Fix model quirk for Dell M1730
ALSA: hda - iMac9,1 sound fixes
ALSA: hda: Use LPIB for Toshiba A100-259
ALSA: hda: Use LPIB for Acer Aspire 5110
ALSA: aw2-alsa.c: use pci_ids.h defines and fix checkpatch.pl noise
ALSA: usb-audio: add support for Akai MPD16
ALSA: pcm: fix the fix of the runtime->boundary calculation -
Add a module option to allow the GPR mixer controls to have the full
resolution of the hardware, i.e., 0...2^31-1 instead of 0...100.Because of bugs in userspace tools like alsactl and alsamixer, this is
not yet enabled by default.Signed-off-by: Clemens Ladisch
Signed-off-by: Takashi Iwai -
In the cleanup of the hw_ptr update functions in 2.6.33, the calculation
of the delta value was changed to use the modulo operator to protect
against a negative difference due to the pointer wrapping around at the
boundary.However, the ptr variables are unsigned, so a negative difference would
result in the two complement's value which has no relation to the actual
difference relative to the boundary; the result is typically some value
near LONG_MAX-boundary. Furthermore, even if the modulo operation would
be done with signed types, the result of a negative dividend could be
negative.The invalid delta value is then caught by the following checks, but this
means that the pointer update is ignored.To fix this, use a range check as in the other pointer calculations.
Signed-off-by: Clemens Ladisch
Cc:
Signed-off-by: Takashi Iwai -
Check that the interrupt raised for a stream is actually a buffer
completion interrupt before handling it as one. Otherwise, memory
errors or FIFO xruns would be interpreted as a pointer update and could
break the stream timing.Signed-off-by: Clemens Ladisch
Signed-off-by: Takashi Iwai -
Signed-off-by: Daniel Mack
Signed-off-by: Takashi Iwai
25 May, 2010
3 commits
-
BugLink: https://launchpad.net/bugs/576160
Symptom: Currently (2.6.32.12) the Dell M1730 uses the 3stack model
quirk. Unfortunately this means that capture is not functional out-
of-the-box despite ensuring that capture settings are unmuted and
raised fully.Test case: boot from Ubuntu 10.04 LTS live cd; capture does not
work.Resolution: Correct the model quirk for Dell M1730 to rely on the
BIOS configuration.This patch also trivially sorts the quirk into the correct section
based on the comments.Reported-and-Tested-By:
Tested-By: Daren Hayward
Tested-By: Tobias Krais
Cc:
Signed-off-by: Daniel T Chen
Signed-off-by: Takashi Iwai -
First issue:
With the original patch, I've noticed by unmuting the mic
(and even having it muted), there is a distorted("Noise")
coming from the internal speakers, even when the headphones are plugged in.
What my finding's revealed is:/* Mic (rear) pin: input vref at 80% */
{0x18, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80},
{0x18, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},From the original patch. Looking at codec#0 0x18/0x1a is listed as:
Node 0x18 [Pin Complex] wcaps 0x40018f: Stereo Amp-In Amp-Out
Amp-In caps: ofs=0x00, nsteps=0x03, stepsize=0x27, mute=0
Amp-In vals: [0x00 0x00]
Amp-Out caps: ofs=0x00, nsteps=0x00, stepsize=0x00, mute=1
Amp-Out vals: [0x00 0x00]
Pincap 0x0000373c: IN OUT HP Detect
Vref caps: HIZ 50 GRD 80 100
Pin Default 0x90100141: [Fixed] Speaker at Int N/A
Conn = Unknown, Color = Unknown
DefAssociation = 0x4, Sequence = 0x1
Misc = NO_PRESENCE
Pin-ctls: 0x41: OUT VREF_50
Unsolicited: tag=00, enabled=0
Connection: 5
0x0c* 0x0d 0x0e 0x0f 0x26seems this Node is listed as: [Fixed] Speaker while 0x15
Node 0x15 [Pin Complex] wcaps 0x40018f: Stereo Amp-In Amp-Out
Amp-In caps: ofs=0x00, nsteps=0x03, stepsize=0x27, mute=0
Amp-In vals: [0x00 0x00]
Amp-Out caps: ofs=0x00, nsteps=0x00, stepsize=0x00, mute=1
Amp-Out vals: [0x80 0x80]
Pincap 0x0000373c: IN OUT HP Detect
Vref caps: HIZ 50 GRD 80 100
Pin Default 0x018b3020: [Jack] Line In at Ext Rear
Conn = Comb, Color = Blue
DefAssociation = 0x2, Sequence = 0x0
Pin-ctls: 0x01: VREF_50
Unsolicited: tag=00, enabled=0
Connection: 5
0x0c 0x0d* 0x0e 0x0f 0x26is [Jack] Line In at Ext Rear.
(looking at the other apple products as examples
I came up with the fix below).Second issue:
alc885_mbp_4ch_modes
The original patch does a good job with the
HP pin automute function, but from what I noticed is I would have to manually
change the channel form 2 to 4 after plugging the headphones in.
And not to mention having odd moments to where I was jamming out
with the headphones on, then later realized I had sound blasting out
of the speakers as well. My findings revealed that changing
alc885_mbp_4ch_modes to alc885_mba21_ch_modes and setting
- spec->autocfg.speaker_pins[0] = 0x15;
+ spec->autocfg.speaker_pins[0] = 0x18;
gets the automute function when the headphones plugged in working
flawlessly(and the no need to manually change the channel number
afterwards).Third issue:
alc885_imac91_mixer
There probably doesnt need to be anything changed with this
(esspecially if your one to like lots of sliders),but my findings
revealed that mac osx only has a master on the top right,
another switch on itunes, and then a slider for the mic.So the changes I did below try and mimic osx as much as possible
(only thing I had an issue with is just having one mute switch
on the master, instead of having two(still investigating)).fourth issue:
alc882_capture_source
I endeded up creating alc889A_imac91_capture_source()
only because looking at alc882_capture_source I see
that the mic is set to 0x1 while this works, I also noticed
that adding 0x1 and 0x01 and testing that 0x1 somehow
stops working, and 0x01 works(so I figured 0x01 was more
of the alpha of the numbers(still need to figure out
where that valuse is)). In any case the microphone
does work with the original, and with the below patch, but both
still record not as clean(lots of "Noise", which I would like to
look into too).
Note: using alsamixer -Va reveals the capture switches.Signed-off-by: Justin P. Mattock
Signed-off-by: Takashi Iwai -
BugLink: https://launchpad.net/bugs/549560
Symptom: on a significant number of hardware, booting from a live cd
results in capture working correctly, but once the distribution is
installed, booting from the install results in capture not working.Test case: boot from Ubuntu 10.04 LTS live cd; capture works correctly.
Install to HD and reboot; capture does not work. Reproduced with 2.6.32
mainline build (vanilla kernel.org compile)Resolution: add SSID for Toshiba A100-259 to the position_fix quirk
table, explicitly specifying the LPIB method.I'll be sending additional patches for these SSIDs as bug reports are
confirmed.This patch also trivially sorts the quirk table in ascending order by
subsystem vendor.Reported-and-Tested-by:
Cc:
Signed-off-by: Daniel T Chen
Signed-off-by: Takashi Iwai
