07 Apr, 2010
5 commits
-
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6:
ALSA: mixart: range checking proc file
ALSA: hda - Fix a wrong array range check in patch_realtek.c
ALSA: ASoC: move dma_data from snd_soc_dai to snd_soc_pcm_stream
ALSA: hda - Enable amplifiers on Acer Inspire 6530G
ASoC: Only do WM8994 bias off transition from standby
ASoC: Don't use DCS_DATAPATH_BUSY for WM hubs devices
ASoC: Don't do runtime wm_hubs DC servo updates if using offset correction
ASoC: Support second DC servo readback method for wm_hubs
ASoC: Avoid wraparound in wm_hubs DC servo correction
ALSA: echoaudio - Eliminate use after free
ALSA: i2c: cleanup: change parameter to pointer
ALSA: hda - Add MSI blacklist for Aopen MZ915-M
ASoC: OMAP: Fix capture pointer handling for OMAP1510 to work correctly with recent ALSA PCM code
ALSA: hda - Update document about MSI and interrupts
ALSA: hda: Fix 0 dB offset for Lenovo Thinkpad models using AD1981
ALSA: hda - Add missing printk argument in previous patch
ASoC: Fix passing platform_data to ac97 bus users and fix a leak
ALSA: hda - Fix ADC/MUX assignment of ALC269 codec
ALSA: hda - Fix invalid bit values passed to snd_hda_codec_amp_stereo()
ASoC: wm8994: playback => capture -
The original code doesn't take into consideration that the value of
MIXART_BA0_SIZE - pos can be less than zero which would lead to a large
unsigned value for "count".Also I moved the check that read size is a multiple of 4 bytes below
the code that adjusts "count".Signed-off-by: Dan Carpenter
Cc:
Acked-by: Linus Torvalds
Signed-off-by: Takashi Iwai
06 Apr, 2010
3 commits
-
The commit 6a4f2ccb467e00281470cde2dee08fe5ecde62d1 introduced a wrong
comparision for the array range check, which effectively skips the whole
initialization of DAC connections. Fixed now.Reference: bko#15689
https://bugzilla.kernel.org/show_bug.cgi?id=15689Reported-by: Adrian Ulrich
Signed-off-by: Takashi Iwai -
This fixes a memory corruption when ASoC devices are used in
full-duplex mode. Specifically for pxa-ssp code, where this pointer
is dynamically allocated for each direction and destroyed upon each
stream start.All other platforms are fixed blindly, I couldn't even compile-test
them. Sorry for any breakage I may have caused.[Note that this is a backported version for 2.6.34.
Upstream commit is fd23b7dee]Signed-off-by: Daniel Mack
Reported-by: Sven Neumann
Reported-by: Michael Hirsch
Acked-by: Liam Girdwood
Signed-off-by: Mark Brown -
After more tests it appears that EAPD needs to be enabled
on both the 0x14 and 0x15 NIDs to enable the main speaker
and headphone amplifiers. The maximum volume setting is
now equal to what the machine achieves under other operating
systems.
Disabling Front or LFE playback triggers EAPD and disables
the amplifier. As such, these two playback switches have
been removed from the mixer.Signed-off-by: Tony Vroon
Signed-off-by: Takashi Iwai
05 Apr, 2010
5 commits
-
Otherwise we may try to power down multiple times when the using
idle bias off and the driver is removed.Signed-off-by: Mark Brown
Acked-by: Liam Girdwood -
The DCS_DATAPATH_BUSY bit used to monitor the completion of DC servo
operations has been deprecated and with some more recente revisions
may perform incorrectly, especially when only analogue bypass paths
are in use. Switch to using readback from the DC servo command
register instead, which is supported for all devices. Without this
unacceptably long timeouts may be observed in some circumstances.Signed-off-by: Mark Brown
Acked-by: Liam Girdwood -
If we need to offset correct the DC servo then don't use runtime
recalibration since that is likely to introduce further offsets
which will be evident on powerdown.Signed-off-by: Mark Brown
Acked-by: Liam Girdwood -
More recent Wolfson hubs devices add the ability to read back the DC
servo calibration information from the register used to write offsets,
and later still ones remove the old readback registers. Add support
for the new scheme, and use it for WM8994 device revisions that
support it.Signed-off-by: Mark Brown
Acked-by: Liam Girdwood -
If the correction wraps around then a substantial offset would be
introduced.Signed-off-by: Mark Brown
Acked-by: Liam Girdwood
04 Apr, 2010
3 commits
-
Use the call to snd_card_free in the error handling code at the end of the
function, as in the other error cases.A simplified version of the semantic patch that finds this problem is as
follows: (http://coccinelle.lip6.fr/)//
@@
expression E,E2;
@@snd_card_free(E)
...
(
E = E2
|
* E
)
//Signed-off-by: Julia Lawall
Signed-off-by: Takashi Iwai -
We actually pass an array of 7 chars not 5.
This silences a smatch warning.Signed-off-by: Dan Carpenter
Signed-off-by: Takashi Iwai -
The device needs MSI disablement. Added to the quirk list.
Reported-by: Harald Dunkel
Cc:
Signed-off-by: Takashi Iwai
03 Apr, 2010
1 commit
-
With recent (2.6.34) chnages in PCM handling, capture stopped working on my
OMAP1510 based Amstrad Delta videophone.Using 2.6.34-rc2, I was able to correct the problem in 3 different ways:
1. reverting commit 7b3a177b0d4f92b3431b8dca777313a07533a710,
2. enabling additional jiffies check with
echo 4 >/proc/asound/card0/pcm0c0/xrun_debug
3. applying the patch below.Since I wasn't able to reproduce the problem on my i686 PC, I guess the
problem is probably machine specific.The patch reuses the method for software emulation of missing hardware
pointer, already implemented for playback on OMAP1510. It's possible that
event if a hardware pointer is available for capture on this machine, its
behaviour may be not compatible with what upper layer expects.If you think the problem may be more general and should be solved differently,
on a higher level, I can try to work more on it if you give me a hint.If the patch gets accepted, I suggest it goes as a fix in the current release
cycle.Created and tested against linux-2.6.34-rc2.
Signed-off-by: Janusz Krzysztofik
Acked-by: Jarkko Nikula
Acked-by: Liam Girdwood
Signed-off-by: Mark Brown
31 Mar, 2010
1 commit
-
BugLink: https://launchpad.net/bugs/551606
The OR's hardware distorts at PCM 100% because it does not correspond to
0 dB. Fix this in patch_ad1981() for all models using the Thinkpad
quirk.Reported-by: Jane Silber
Cc:
Signed-off-by: Daniel T Chen
Signed-off-by: Takashi Iwai
30 Mar, 2010
3 commits
-
…it slab.h inclusion from percpu.h
percpu.h is included by sched.h and module.h and thus ends up being
included when building most .c files. percpu.h includes slab.h which
in turn includes gfp.h making everything defined by the two files
universally available and complicating inclusion dependencies.percpu.h -> slab.h dependency is about to be removed. Prepare for
this change by updating users of gfp and slab facilities include those
headers directly instead of assuming availability. As this conversion
needs to touch large number of source files, the following script is
used as the basis of conversion.http://userweb.kernel.org/~tj/misc/slabh-sweep.py
The script does the followings.
* Scan files for gfp and slab usages and update includes such that
only the necessary includes are there. ie. if only gfp is used,
gfp.h, if slab is used, slab.h.* When the script inserts a new include, it looks at the include
blocks and try to put the new include such that its order conforms
to its surrounding. It's put in the include block which contains
core kernel includes, in the same order that the rest are ordered -
alphabetical, Christmas tree, rev-Xmas-tree or at the end if there
doesn't seem to be any matching order.* If the script can't find a place to put a new include (mostly
because the file doesn't have fitting include block), it prints out
an error message indicating which .h file needs to be added to the
file.The conversion was done in the following steps.
1. The initial automatic conversion of all .c files updated slightly
over 4000 files, deleting around 700 includes and adding ~480 gfp.h
and ~3000 slab.h inclusions. The script emitted errors for ~400
files.2. Each error was manually checked. Some didn't need the inclusion,
some needed manual addition while adding it to implementation .h or
embedding .c file was more appropriate for others. This step added
inclusions to around 150 files.3. The script was run again and the output was compared to the edits
from #2 to make sure no file was left behind.4. Several build tests were done and a couple of problems were fixed.
e.g. lib/decompress_*.c used malloc/free() wrappers around slab
APIs requiring slab.h to be added manually.5. The script was run on all .h files but without automatically
editing them as sprinkling gfp.h and slab.h inclusions around .h
files could easily lead to inclusion dependency hell. Most gfp.h
inclusion directives were ignored as stuff from gfp.h was usually
wildly available and often used in preprocessor macros. Each
slab.h inclusion directive was examined and added manually as
necessary.6. percpu.h was updated not to include slab.h.
7. Build test were done on the following configurations and failures
were fixed. CONFIG_GCOV_KERNEL was turned off for all tests (as my
distributed build env didn't work with gcov compiles) and a few
more options had to be turned off depending on archs to make things
build (like ipr on powerpc/64 which failed due to missing writeq).* x86 and x86_64 UP and SMP allmodconfig and a custom test config.
* powerpc and powerpc64 SMP allmodconfig
* sparc and sparc64 SMP allmodconfig
* ia64 SMP allmodconfig
* s390 SMP allmodconfig
* alpha SMP allmodconfig
* um on x86_64 SMP allmodconfig8. percpu.h modifications were reverted so that it could be applied as
a separate patch and serve as bisection point.Given the fact that I had only a couple of failures from tests on step
6, I'm fairly confident about the coverage of this conversion patch.
If there is a breakage, it's likely to be something in one of the arch
headers which should be easily discoverable easily on most builds of
the specific arch.Signed-off-by: Tejun Heo <tj@kernel.org>
Guess-its-ok-by: Christoph Lameter <cl@linux-foundation.org>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Lee Schermerhorn <Lee.Schermerhorn@hp.com> -
Signed-off-by: Takashi Iwai
-
[The issue is an attempt to write the pdata without the AC97 device
allocated when using ac97.c - also added a comment in soc-core.c for the
special case for ac97. -- broonie]Signed-off-by: Graham Gower
Acked-by: Liam Girdwood
Signed-off-by: Mark Brown
29 Mar, 2010
6 commits
-
ALC269 codec has a few different variants, and each of them may have
different ADC and MUX widgets. For example, one model has ADC 0x08
with MUX 0x23 while others has ADC 0x09 or ADC 0x07 with MUX 022 or
0x24. The difference of ADC appears usually as the capability of
the digital mic pin (0x12), and the current driver sometimes misses
the internal mic pin due to the mismatching ADC.This patch adds a bit more clever way to find the matching ADC instead
of the static list. Now the driver checks all active input pins and
fills only the ADC/MUX's that contain all of them.Signed-off-by: Takashi Iwai
-
The mask and value parameters passed to snd_hda_codec_amp_stereo()
should be 8-bit values for mute and volume. Passing AMP_IN_MUTE() is
wrong, which is found in many places in patch_realtek.c as a left-over
from the conversion to snd_hda_codec_amp_stereo().Reported-by: Dan Carpenter
Signed-off-by: Takashi Iwai -
BugLink: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=575669
The OR states that position_fix=1 is necessary to work around glitching
during volume adjustments using PulseAudio.Reported-by: Carlos Laviola
Tested-by: Carlos Laviola
Cc:
Signed-off-by: Daniel T Chen
Signed-off-by: Takashi Iwai -
BugLink: https://launchpad.net/bugs/481058
The OR has verified that both 'Headphone Jack Sense' and 'Line Jack Sense'
need to be muted for sound to be audible, so just add the machine's SSID
to the ac97 jack sense blacklist.Reported-by: Richard Gagne
Tested-by: Richard Gagne
Cc:
Signed-off-by: Daniel T Chen
Signed-off-by: Takashi Iwai
26 Mar, 2010
2 commits
-
The commit 4d96eb255c53ab5e39b37fd4d484ea3dc39ab456 broke the interrupt
time xrun functionality (stream stop etc.) if the CONFIG_SND_PCM_XRUN_DEBUG
is not set. This is because the xrun() is null defined without it.Fix this by letting the function xrun() to be always defined as it was
before.Signed-off-by: Jarkko Nikula
Cc: Jaroslav Kysela
Signed-off-by: Takashi Iwai -
BugLink: https://launchpad.net/bugs/303789
This model needs both 'Headphone Jack Sense' and 'Line Jack Sense'
muted for audible audio, so just add its SSID to the blacklist and
don't enumerate the controls.Signed-off-by: Daniel T Chen
Cc:
Signed-off-by: Takashi Iwai
25 Mar, 2010
1 commit
-
Skip initialization of connections of DAC widgets that aren't used,
which resulted in invalid verb parameters.Signed-off-by: Takashi Iwai
24 Mar, 2010
4 commits
-
Sparse caught that initialize "playback" two times instead of
initializing "capture".Signed-off-by: Dan Carpenter
Acked-by: Liam Girdwood
Signed-off-by: Mark Brown -
When the CMI8738 FRAME2 register is read, the chip sometimes (probably
when wrapping around) returns an invalid value that would be outside the
programmed DMA buffer. This leads to an inconsistent PCM pointer that is
likely to result in an underrun.To work around this, read the register multiple times until we get a
valid value; the error state seems to be very short-lived.Signed-off-by: Clemens Ladisch
Reported-and-tested-by: Matija Nalis
Cc:
Signed-off-by: Takashi Iwai
22 Mar, 2010
6 commits
-
Signed-off-by: Mark Brown
Acked-by: Liam Girdwood -
alc_free_kctls() has to be called after all jobs done in alc_build_controls().
Signed-off-by: Takashi Iwai
-
Signed-off-by: Takashi Iwai
-
This patch adds the device id for Nvidia GT220 cards to the nvhdmi
driver. I have tested it and confirmed it to be working.Original patch download link:
https://gist.github.com/324070/Signed-off-by: Derek Kelly
Signed-off-by: Takashi Iwai -
BugLink: https://launchpad.net/bugs/420578
The OR has verified that his hardware distorts because of the 0 dB
offset not corresponding to the highest PCM level. Fix this by capping
said PCM level to 0 dB similarly to what we do for CX20549 (Venice).Reported-by: Mike Pontillo
Tested-by: Mike Pontillo
Cc:
Signed-off-by: Daniel T Chen
Signed-off-by: Takashi Iwai
