Commit 2208f651 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'sound-3.13-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound 

Pull sound fixes from Takashi Iwai:
 "Still a slightly high amount of changes than wished, but they are all
  good regression and/or device-specific fixes.  Majority of commits are
  for HD-audio, an HDMI ctl index fix that hits old graphics boards,
  regression fixes for AD codecs and a few quirks.

  Other than that, two major fixes are included: a 64bit ABI fix for
  compress offload, and 64bit dma_addr_t truncation fix, which had hit
  on PAE kernels"

* tag 'sound-3.13-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:
  ALSA: hda - Add static DAC/pin mapping for AD1986A codec
  ALSA: hda - One more Dell headset detection quirk
  ALSA: hda - hdmi: Fix IEC958 ctl indexes for some simple HDMI devices
  ALSA: hda - Mute all aamix inputs as default
  ALSA: compress: Fix 64bit ABI incompatibility
  ALSA: memalloc.h - fix wrong truncation of dma_addr_t
  ALSA: hda - Another Dell headset detection quirk
  ALSA: hda - A Dell headset detection quirk
  ALSA: hda - Remove quirk for Dell Vostro 131
  ALSA: usb-audio: fix uninitialized variable compile warning
  ALSA: hda - fix mic issues on Acer Aspire E-572
parents ea4ebd1c 3690739b

include/sound/memalloc.h

+1 −1
Original line number Diff line number Diff line
@@ -108,7 +108,7 @@ static inline dma_addr_t snd_sgbuf_get_addr(struct snd_dma_buffer *dmab, 
{

	struct snd_sg_buf *sgbuf = dmab->private_data;

	dma_addr_t addr = sgbuf->table[offset >> PAGE_SHIFT].addr;

	addr &= PAGE_MASK;

	addr &= ~((dma_addr_t)PAGE_SIZE - 1);

	return addr + offset % PAGE_SIZE;

}

include/uapi/sound/compress_offload.h

+3 −3
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ 
#include <sound/compress_params.h>





#define SNDRV_COMPRESS_VERSION SNDRV_PROTOCOL_VERSION(0, 1, 1)

#define SNDRV_COMPRESS_VERSION SNDRV_PROTOCOL_VERSION(0, 1, 2)

/**

 * struct snd_compressed_buffer: compressed buffer

 * @fragment_size: size of buffer fragment in bytes
@@ -67,8 +67,8 @@ struct snd_compr_params { 
struct snd_compr_tstamp {

	__u32 byte_offset;

	__u32 copied_total;

	snd_pcm_uframes_t pcm_frames;

	snd_pcm_uframes_t pcm_io_frames;

	__u32 pcm_frames;

	__u32 pcm_io_frames;

	__u32 sampling_rate;

};

sound/pci/hda/hda_generic.c

+46 −1
Original line number Diff line number Diff line
@@ -474,6 +474,20 @@ static void invalidate_nid_path(struct hda_codec *codec, int idx) 
	memset(path, 0, sizeof(*path));

}



/* return a DAC if paired to the given pin by codec driver */

static hda_nid_t get_preferred_dac(struct hda_codec *codec, hda_nid_t pin)

{

	struct hda_gen_spec *spec = codec->spec;

	const hda_nid_t *list = spec->preferred_dacs;



	if (!list)

		return 0;

	for (; *list; list += 2)

		if (*list == pin)

			return list[1];

	return 0;

}



/* look for an empty DAC slot */

static hda_nid_t look_for_dac(struct hda_codec *codec, hda_nid_t pin,

			      bool is_digital)
@@ -1192,6 +1206,13 @@ static int try_assign_dacs(struct hda_codec *codec, int num_outs, 
			continue;

		}



		dacs[i] = get_preferred_dac(codec, pin);

		if (dacs[i]) {

			if (is_dac_already_used(codec, dacs[i]))

				badness += bad->shared_primary;

		}



		if (!dacs[i])

			dacs[i] = look_for_dac(codec, pin, false);

		if (!dacs[i] && !i) {

			/* try to steal the DAC of surrounds for the front */
@@ -4297,6 +4318,26 @@ static unsigned int snd_hda_gen_path_power_filter(struct hda_codec *codec, 
	return AC_PWRST_D3;

}



/* mute all aamix inputs initially; parse up to the first leaves */

static void mute_all_mixer_nid(struct hda_codec *codec, hda_nid_t mix)

{

	int i, nums;

	const hda_nid_t *conn;

	bool has_amp;



	nums = snd_hda_get_conn_list(codec, mix, &conn);

	has_amp = nid_has_mute(codec, mix, HDA_INPUT);

	for (i = 0; i < nums; i++) {

		if (has_amp)

			snd_hda_codec_amp_stereo(codec, mix,

						 HDA_INPUT, i,

						 0xff, HDA_AMP_MUTE);

		else if (nid_has_volume(codec, conn[i], HDA_OUTPUT))

			snd_hda_codec_amp_stereo(codec, conn[i],

						 HDA_OUTPUT, 0,

						 0xff, HDA_AMP_MUTE);

	}

}



/*

 * Parse the given BIOS configuration and set up the hda_gen_spec
@@ -4435,6 +4476,10 @@ int snd_hda_gen_parse_auto_config(struct hda_codec *codec, 
		}

	}



	/* mute all aamix input initially */

	if (spec->mixer_nid)

		mute_all_mixer_nid(codec, spec->mixer_nid);



 dig_only:

	parse_digital(codec);

sound/pci/hda/hda_generic.h

+3 −0
Original line number Diff line number Diff line
@@ -249,6 +249,9 @@ struct hda_gen_spec { 
	const struct badness_table *main_out_badness;

	const struct badness_table *extra_out_badness;



	/* preferred pin/DAC pairs; an array of paired NIDs */

	const hda_nid_t *preferred_dacs;



	/* loopback mixing mode */

	bool aamix_mode;

sound/pci/hda/patch_analog.c

+10 −0
Original line number Diff line number Diff line
@@ -340,6 +340,14 @@ static int patch_ad1986a(struct hda_codec *codec) 
{

	int err;

	struct ad198x_spec *spec;

	static hda_nid_t preferred_pairs[] = {

		0x1a, 0x03,

		0x1b, 0x03,

		0x1c, 0x04,

		0x1d, 0x05,

		0x1e, 0x03,

		0

	};



	err = alloc_ad_spec(codec);

	if (err < 0)
@@ -360,6 +368,8 @@ static int patch_ad1986a(struct hda_codec *codec) 
	 * So, let's disable the shared stream.

	 */

	spec->gen.multiout.no_share_stream = 1;

	/* give fixed DAC/pin pairs */

	spec->gen.preferred_dacs = preferred_pairs;



	/* AD1986A can't manage the dynamic pin on/off smoothly */

	spec->gen.auto_mute_via_amp = 1;

CRA Git | Maintained and supported by SUSTech CRA and CCSE