Merge branch 'fix/hda' into topic/hda (8e28e3b2) · Commits · e / devices / android_kernel_fairphone_FP5

sound/core/pcm_lib.c

+3 −1

Original line number	Diff line number	Diff line
		@@ -375,6 +375,7 @@ static int snd_pcm_update_hw_ptr0(struct snd_pcm_substream *substream,
		}

		if (runtime->no_period_wakeup) {
		snd_pcm_sframes_t xrun_threshold;
		/*
		* Without regular period interrupts, we have to check
		* the elapsed time to detect xruns.
		@@ -383,7 +384,8 @@ static int snd_pcm_update_hw_ptr0(struct snd_pcm_substream *substream,
		if (jdelta < runtime->hw_ptr_buffer_jiffies / 2)
		goto no_delta_check;
		hdelta = jdelta - delta * HZ / runtime->rate;
		while (hdelta > runtime->hw_ptr_buffer_jiffies / 2 + 1) {
		xrun_threshold = runtime->hw_ptr_buffer_jiffies / 2 + 1;
		while (hdelta > xrun_threshold) {
		delta += runtime->buffer_size;
		hw_base += runtime->buffer_size;
		if (hw_base >= runtime->boundary)

sound/firewire/speakers.c

+1 −2

Original line number	Diff line number	Diff line
		@@ -778,10 +778,9 @@ static int __devexit fwspk_remove(struct device *dev)
		{
		struct fwspk *fwspk = dev_get_drvdata(dev);

		snd_card_disconnect(fwspk->card);

		mutex_lock(&fwspk->mutex);
		amdtp_out_stream_pcm_abort(&fwspk->stream);
		snd_card_disconnect(fwspk->card);
		fwspk_stop_stream(fwspk);
		mutex_unlock(&fwspk->mutex);

sound/pci/ens1370.c

+19 −4

Original line number	Diff line number	Diff line
		@@ -229,6 +229,7 @@ MODULE_PARM_DESC(lineio, "Line In to Rear Out (0 = auto, 1 = force).");
		#define ES_REG_1371_CODEC 0x14 /* W/R: Codec Read/Write register address */
		#define ES_1371_CODEC_RDY (1<<31) /* codec ready */
		#define ES_1371_CODEC_WIP (1<<30) /* codec register access in progress */
		#define EV_1938_CODEC_MAGIC (1<<26)
		#define ES_1371_CODEC_PIRD (1<<23) /* codec read/write select register */
		#define ES_1371_CODEC_WRITE(a,d) ((((a)&0x7f)<<16)\|(((d)&0xffff)<<0))
		#define ES_1371_CODEC_READS(a) ((((a)&0x7f)<<16)\|ES_1371_CODEC_PIRD)
		@@ -603,12 +604,18 @@ static void snd_es1370_codec_write(struct snd_ak4531 *ak4531,

		#ifdef CHIP1371

		static inline bool is_ev1938(struct ensoniq *ensoniq)
		{
		return ensoniq->pci->device == 0x8938;
		}

		static void snd_es1371_codec_write(struct snd_ac97 *ac97,
		unsigned short reg, unsigned short val)
		{
		struct ensoniq *ensoniq = ac97->private_data;
		unsigned int t, x;
		unsigned int t, x, flag;

		flag = is_ev1938(ensoniq) ? EV_1938_CODEC_MAGIC : 0;
		mutex_lock(&ensoniq->src_mutex);
		for (t = 0; t < POLL_COUNT; t++) {
		if (!(inl(ES_REG(ensoniq, 1371_CODEC)) & ES_1371_CODEC_WIP)) {
		@@ -630,7 +637,8 @@ static void snd_es1371_codec_write(struct snd_ac97 *ac97,
		0x00010000)
		break;
		}
		outl(ES_1371_CODEC_WRITE(reg, val), ES_REG(ensoniq, 1371_CODEC));
		outl(ES_1371_CODEC_WRITE(reg, val) \| flag,
		ES_REG(ensoniq, 1371_CODEC));
		/* restore SRC reg */
		snd_es1371_wait_src_ready(ensoniq);
		outl(x, ES_REG(ensoniq, 1371_SMPRATE));
		@@ -647,8 +655,9 @@ static unsigned short snd_es1371_codec_read(struct snd_ac97 *ac97,
		unsigned short reg)
		{
		struct ensoniq *ensoniq = ac97->private_data;
		unsigned int t, x, fail = 0;
		unsigned int t, x, flag, fail = 0;

		flag = is_ev1938(ensoniq) ? EV_1938_CODEC_MAGIC : 0;
		__again:
		mutex_lock(&ensoniq->src_mutex);
		for (t = 0; t < POLL_COUNT; t++) {
		@@ -671,7 +680,8 @@ static unsigned short snd_es1371_codec_read(struct snd_ac97 *ac97,
		0x00010000)
		break;
		}
		outl(ES_1371_CODEC_READS(reg), ES_REG(ensoniq, 1371_CODEC));
		outl(ES_1371_CODEC_READS(reg) \| flag,
		ES_REG(ensoniq, 1371_CODEC));
		/* restore SRC reg */
		snd_es1371_wait_src_ready(ensoniq);
		outl(x, ES_REG(ensoniq, 1371_SMPRATE));
		@@ -683,6 +693,11 @@ static unsigned short snd_es1371_codec_read(struct snd_ac97 *ac97,
		/* now wait for the stinkin' data (RDY) */
		for (t = 0; t < POLL_COUNT; t++) {
		if ((x = inl(ES_REG(ensoniq, 1371_CODEC))) & ES_1371_CODEC_RDY) {
		if (is_ev1938(ensoniq)) {
		for (t = 0; t < 100; t++)
		inl(ES_REG(ensoniq, CONTROL));
		x = inl(ES_REG(ensoniq, 1371_CODEC));
		}
		mutex_unlock(&ensoniq->src_mutex);
		return ES_1371_CODEC_READ(x);
		}

sound/pci/hda/patch_conexant.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -3034,6 +3034,8 @@ static struct snd_pci_quirk cxt5066_cfg_tbl[] = {
		SND_PCI_QUIRK(0x17aa, 0x21c5, "Thinkpad Edge 13", CXT5066_THINKPAD),
		SND_PCI_QUIRK(0x17aa, 0x21c6, "Thinkpad Edge 13", CXT5066_ASUS),
		SND_PCI_QUIRK(0x17aa, 0x215e, "Lenovo Thinkpad", CXT5066_THINKPAD),
		SND_PCI_QUIRK(0x17aa, 0x21da, "Lenovo X220", CXT5066_THINKPAD),
		SND_PCI_QUIRK(0x17aa, 0x21db, "Lenovo X220-tablet", CXT5066_THINKPAD),
		SND_PCI_QUIRK(0x17aa, 0x38af, "Lenovo G560", CXT5066_ASUS),
		SND_PCI_QUIRK_VENDOR(0x17aa, "Lenovo", CXT5066_IDEAPAD), /* Fallback for Lenovos without dock mic */
		{}

sound/pci/hda/patch_hdmi.c

+44 −26

Original line number	Diff line number	Diff line
		@@ -1280,6 +1280,39 @@ static int simple_playback_pcm_prepare(struct hda_pcm_stream *hinfo,
		stream_tag, format, substream);
		}

		static void nvhdmi_8ch_7x_set_info_frame_parameters(struct hda_codec *codec,
		int channels)
		{
		unsigned int chanmask;
		int chan = channels ? (channels - 1) : 1;

		switch (channels) {
		default:
		case 0:
		case 2:
		chanmask = 0x00;
		break;
		case 4:
		chanmask = 0x08;
		break;
		case 6:
		chanmask = 0x0b;
		break;
		case 8:
		chanmask = 0x13;
		break;
		}

		/* Set the audio infoframe channel allocation and checksum fields. The
		* channel count is computed implicitly by the hardware. */
		snd_hda_codec_write(codec, 0x1, 0,
		Nv_VERB_SET_Channel_Allocation, chanmask);

		snd_hda_codec_write(codec, 0x1, 0,
		Nv_VERB_SET_Info_Frame_Checksum,
		(0x71 - chan - chanmask));
		}

		static int nvhdmi_8ch_7x_pcm_close(struct hda_pcm_stream *hinfo,
		struct hda_codec *codec,
		struct snd_pcm_substream *substream)
		@@ -1298,6 +1331,10 @@ static int nvhdmi_8ch_7x_pcm_close(struct hda_pcm_stream *hinfo,
		AC_VERB_SET_STREAM_FORMAT, 0);
		}

		/* The audio hardware sends a channel count of 0x7 (8ch) when all the
		* streams are disabled. */
		nvhdmi_8ch_7x_set_info_frame_parameters(codec, 8);

		return snd_hda_multi_out_dig_close(codec, &spec->multiout);
		}

		@@ -1308,37 +1345,16 @@ static int nvhdmi_8ch_7x_pcm_prepare(struct hda_pcm_stream *hinfo,
		struct snd_pcm_substream *substream)
		{
		int chs;
		unsigned int dataDCC1, dataDCC2, chan, chanmask, channel_id;
		unsigned int dataDCC1, dataDCC2, channel_id;
		int i;

		mutex_lock(&codec->spdif_mutex);

		chs = substream->runtime->channels;
		chan = chs ? (chs - 1) : 1;

		switch (chs) {
		default:
		case 0:
		case 2:
		chanmask = 0x00;
		break;
		case 4:
		chanmask = 0x08;
		break;
		case 6:
		chanmask = 0x0b;
		break;
		case 8:
		chanmask = 0x13;
		break;
		}
		dataDCC1 = AC_DIG1_ENABLE \| AC_DIG1_COPYRIGHT;
		dataDCC2 = 0x2;

		/* set the Audio InforFrame Channel Allocation */
		snd_hda_codec_write(codec, 0x1, 0,
		Nv_VERB_SET_Channel_Allocation, chanmask);

		/* turn off SPDIF once; otherwise the IEC958 bits won't be updated */
		if (codec->spdif_status_reset && (codec->spdif_ctls & AC_DIG1_ENABLE))
		snd_hda_codec_write(codec,
		@@ -1413,10 +1429,7 @@ static int nvhdmi_8ch_7x_pcm_prepare(struct hda_pcm_stream *hinfo,
		}
		}

		/* set the Audio Info Frame Checksum */
		snd_hda_codec_write(codec, 0x1, 0,
		Nv_VERB_SET_Info_Frame_Checksum,
		(0x71 - chan - chanmask));
		nvhdmi_8ch_7x_set_info_frame_parameters(codec, chs);

		mutex_unlock(&codec->spdif_mutex);
		return 0;
		@@ -1512,6 +1525,11 @@ static int patch_nvhdmi_8ch_7x(struct hda_codec *codec)
		spec->multiout.max_channels = 8;
		spec->pcm_playback = &nvhdmi_pcm_playback_8ch_7x;
		codec->patch_ops = nvhdmi_patch_ops_8ch_7x;

		/* Initialize the audio infoframe channel mask and checksum to something
		* valid */
		nvhdmi_8ch_7x_set_info_frame_parameters(codec, 8);

		return 0;
		}