Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 84db18bb authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6 

* '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
parents 6948ec70 55b371d4

Documentation/sound/alsa/HD-Audio.txt

+12 −4
Original line number Diff line number Diff line
@@ -119,10 +119,18 @@ the codec slots 0 and 1 no matter what the hardware reports. 


Interrupt Handling

~~~~~~~~~~~~~~~~~~

In rare but some cases, the interrupt isn't properly handled as

default.  You would notice this by the DMA transfer error reported by

ALSA PCM core, for example.  Using MSI might help in such a case.

Pass `enable_msi=1` option for enabling MSI.

HD-audio driver uses MSI as default (if available) since 2.6.33

kernel as MSI works better on some machines, and in general, it's

better for performance.  However, Nvidia controllers showed bad

regressions with MSI (especially in a combination with AMD chipset),

thus we disabled MSI for them.



There seem also still other devices that don't work with MSI.  If you

see a regression wrt the sound quality (stuttering, etc) or a lock-up

in the recent kernel, try to pass `enable_msi=0` option to disable

MSI.  If it works, you can add the known bad device to the blacklist

defined in hda_intel.c.  In such a case, please report and give the

patch back to the upstream developer. 





HD-AUDIO CODEC

include/sound/ak4113.h

+1 −1
Original line number Diff line number Diff line
@@ -307,7 +307,7 @@ struct ak4113 { 


int snd_ak4113_create(struct snd_card *card, ak4113_read_t *read,

		ak4113_write_t *write,

		const unsigned char pgm[AK4113_WRITABLE_REGS],

		const unsigned char *pgm,

		void *private_data, struct ak4113 **r_ak4113);

void snd_ak4113_reg_write(struct ak4113 *ak4113, unsigned char reg,

		unsigned char mask, unsigned char val);

include/sound/soc-dai.h

+17 −1
Original line number Diff line number Diff line
@@ -219,7 +219,6 @@ struct snd_soc_dai { 
	struct snd_soc_codec *codec;

	unsigned int active;

	unsigned char pop_wait:1;

	void *dma_data;



	/* DAI private data */

	void *private_data;
@@ -230,4 +229,21 @@ struct snd_soc_dai { 
	struct list_head list;

};



static inline void *snd_soc_dai_get_dma_data(const struct snd_soc_dai *dai,

					     const struct snd_pcm_substream *ss)

{

	return (ss->stream == SNDRV_PCM_STREAM_PLAYBACK) ?

		dai->playback.dma_data : dai->capture.dma_data;

}



static inline void snd_soc_dai_set_dma_data(struct snd_soc_dai *dai,

					    const struct snd_pcm_substream *ss,

					    void *data)

{

	if (ss->stream == SNDRV_PCM_STREAM_PLAYBACK)

		dai->playback.dma_data = data;

	else

		dai->capture.dma_data = data;

}



#endif

include/sound/soc.h

+1 −0
Original line number Diff line number Diff line
@@ -375,6 +375,7 @@ struct snd_soc_pcm_stream { 
	unsigned int channels_min;	/* min channels */

	unsigned int channels_max;	/* max channels */

	unsigned int active:1;		/* stream is in use */

	void *dma_data;			/* used by platform code */

};



/* SoC audio ops */

sound/i2c/other/ak4113.c

+1 −1
Original line number Diff line number Diff line
@@ -70,7 +70,7 @@ static int snd_ak4113_dev_free(struct snd_device *device) 
}



int snd_ak4113_create(struct snd_card *card, ak4113_read_t *read,

		ak4113_write_t *write, const unsigned char pgm[5],

		ak4113_write_t *write, const unsigned char *pgm,

		void *private_data, struct ak4113 **r_ak4113)

{

	struct ak4113 *chip;