Commit 0a264b6d authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'sound-fix-4.13-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound 

Pull sound fixes from Takashi Iwai:
 "Small last-minute fixes for 4.13-rc1: a couple of PCM fixes for m68k,
  a cleanup work for legacy ISA msnd driver, and a few HD-audio new IDs
  and quirks"

* tag 'sound-fix-4.13-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:
  ALSA: hda - Add hdmi id for a Geminilake variant
  ALSA: hda/realtek - New codec device ID for ALC1220
  ALSA: pcm: Simplify check for dma_mmap_coherent() availability
  ALSA: pcm: Protect call to dma_mmap_coherent() by check for HAS_DMA
  ALSA: msnd: Optimize / harden DSP and MIDI loops
  ALSA: hda/realtek - change the location for one of two front microphones
  ALSA: opl4: Move inline before return type
parents 1e5a2b1f b9091b1c

sound/core/pcm_native.c

+3 −5
Original line number Diff line number Diff line
@@ -238,10 +238,8 @@ static bool hw_support_mmap(struct snd_pcm_substream *substream) 
{

	if (!(substream->runtime->hw.info & SNDRV_PCM_INFO_MMAP))

		return false;

	/* check architectures that return -EINVAL from dma_mmap_coherent() */

	/* FIXME: this should be some global flag */

#if defined(CONFIG_C6X) || defined(CONFIG_FRV) || defined(CONFIG_MN10300) ||\

	defined(CONFIG_PARISC) || defined(CONFIG_XTENSA)

	/* architecture supports dma_mmap_coherent()? */

#if defined(CONFIG_ARCH_NO_COHERENT_DMA_MMAP) || !defined(CONFIG_HAS_DMA)

	if (!substream->ops->mmap &&

	    substream->dma_buffer.dev.type == SNDRV_DMA_TYPE_DEV)

		return false;
@@ -3502,7 +3500,7 @@ int snd_pcm_lib_default_mmap(struct snd_pcm_substream *substream, 
	}

#endif /* CONFIG_GENERIC_ALLOCATOR */

#ifndef CONFIG_X86 /* for avoiding warnings arch/x86/mm/pat.c */

	if (!substream->ops->page &&

	if (IS_ENABLED(CONFIG_HAS_DMA) && !substream->ops->page &&

	    substream->dma_buffer.dev.type == SNDRV_DMA_TYPE_DEV)

		return dma_mmap_coherent(substream->dma_buffer.dev.dev,

					 area,

sound/drivers/opl4/opl4_lib.c

+1 −1
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ MODULE_AUTHOR("Clemens Ladisch <clemens@ladisch.de>"); 
MODULE_DESCRIPTION("OPL4 driver");

MODULE_LICENSE("GPL");



static void inline snd_opl4_wait(struct snd_opl4 *opl4)

static inline void snd_opl4_wait(struct snd_opl4 *opl4)

{

	int timeout = 10;

	while ((inb(opl4->fm_port) & OPL4_STATUS_BUSY) && --timeout > 0)

sound/isa/msnd/msnd_midi.c

+15 −15
Original line number Diff line number Diff line
@@ -120,24 +120,24 @@ void snd_msndmidi_input_read(void *mpuv) 
	unsigned long flags;

	struct snd_msndmidi *mpu = mpuv;

	void *pwMIDQData = mpu->dev->mappedbase + MIDQ_DATA_BUFF;

	u16 head, tail, size;



	spin_lock_irqsave(&mpu->input_lock, flags);

	while (readw(mpu->dev->MIDQ + JQS_wTail) !=

	       readw(mpu->dev->MIDQ + JQS_wHead)) {

		u16 wTmp, val;

		val = readw(pwMIDQData + 2 * readw(mpu->dev->MIDQ + JQS_wHead));



			if (test_bit(MSNDMIDI_MODE_BIT_INPUT_TRIGGER,

				     &mpu->mode))

				snd_rawmidi_receive(mpu->substream_input,

						    (unsigned char *)&val, 1);



		wTmp = readw(mpu->dev->MIDQ + JQS_wHead) + 1;

		if (wTmp > readw(mpu->dev->MIDQ + JQS_wSize))

			writew(0,  mpu->dev->MIDQ + JQS_wHead);

		else

			writew(wTmp,  mpu->dev->MIDQ + JQS_wHead);

	head = readw(mpu->dev->MIDQ + JQS_wHead);

	tail = readw(mpu->dev->MIDQ + JQS_wTail);

	size = readw(mpu->dev->MIDQ + JQS_wSize);

	if (head > size || tail > size)

		goto out;

	while (head != tail) {

		unsigned char val = readw(pwMIDQData + 2 * head);



		if (test_bit(MSNDMIDI_MODE_BIT_INPUT_TRIGGER, &mpu->mode))

			snd_rawmidi_receive(mpu->substream_input, &val, 1);

		if (++head > size)

			head = 0;

		writew(head, mpu->dev->MIDQ + JQS_wHead);

	}

 out:

	spin_unlock_irqrestore(&mpu->input_lock, flags);

}

EXPORT_SYMBOL(snd_msndmidi_input_read);

sound/isa/msnd/msnd_pinnacle.c

+12 −11
Original line number Diff line number Diff line
@@ -170,23 +170,24 @@ static irqreturn_t snd_msnd_interrupt(int irq, void *dev_id) 
{

	struct snd_msnd *chip = dev_id;

	void *pwDSPQData = chip->mappedbase + DSPQ_DATA_BUFF;

	u16 head, tail, size;



	/* Send ack to DSP */

	/* inb(chip->io + HP_RXL); */



	/* Evaluate queued DSP messages */

	while (readw(chip->DSPQ + JQS_wTail) != readw(chip->DSPQ + JQS_wHead)) {

		u16 wTmp;



		snd_msnd_eval_dsp_msg(chip,

			readw(pwDSPQData + 2 * readw(chip->DSPQ + JQS_wHead)));



		wTmp = readw(chip->DSPQ + JQS_wHead) + 1;

		if (wTmp > readw(chip->DSPQ + JQS_wSize))

			writew(0, chip->DSPQ + JQS_wHead);

		else

			writew(wTmp, chip->DSPQ + JQS_wHead);

	}

	head = readw(chip->DSPQ + JQS_wHead);

	tail = readw(chip->DSPQ + JQS_wTail);

	size = readw(chip->DSPQ + JQS_wSize);

	if (head > size || tail > size)

		goto out;

	while (head != tail) {

		snd_msnd_eval_dsp_msg(chip, readw(pwDSPQData + 2 * head));

		if (++head > size)

			head = 0;

		writew(head, chip->DSPQ + JQS_wHead);

	}

 out:

	/* Send ack to DSP */

	inb(chip->io + HP_RXL);

	return IRQ_HANDLED;

sound/pci/hda/patch_hdmi.c

+4 −1
Original line number Diff line number Diff line
@@ -53,9 +53,11 @@ MODULE_PARM_DESC(static_hdmi_pcm, "Don't restrict PCM parameters per ELD info"); 
#define is_skylake(codec) ((codec)->core.vendor_id == 0x80862809)

#define is_broxton(codec) ((codec)->core.vendor_id == 0x8086280a)

#define is_kabylake(codec) ((codec)->core.vendor_id == 0x8086280b)

#define is_geminilake(codec) (((codec)->core.vendor_id == 0x8086280d) || \

				((codec)->core.vendor_id == 0x80862800))

#define is_haswell_plus(codec) (is_haswell(codec) || is_broadwell(codec) \

				|| is_skylake(codec) || is_broxton(codec) \

				|| is_kabylake(codec))

				|| is_kabylake(codec)) || is_geminilake(codec)



#define is_valleyview(codec) ((codec)->core.vendor_id == 0x80862882)

#define is_cherryview(codec) ((codec)->core.vendor_id == 0x80862883)
@@ -3790,6 +3792,7 @@ HDA_CODEC_ENTRY(0x80862809, "Skylake HDMI", patch_i915_hsw_hdmi), 
HDA_CODEC_ENTRY(0x8086280a, "Broxton HDMI",	patch_i915_hsw_hdmi),

HDA_CODEC_ENTRY(0x8086280b, "Kabylake HDMI",	patch_i915_hsw_hdmi),

HDA_CODEC_ENTRY(0x8086280d, "Geminilake HDMI",	patch_i915_glk_hdmi),

HDA_CODEC_ENTRY(0x80862800, "Geminilake HDMI",	patch_i915_glk_hdmi),

HDA_CODEC_ENTRY(0x80862880, "CedarTrail HDMI",	patch_generic_hdmi),

HDA_CODEC_ENTRY(0x80862882, "Valleyview2 HDMI",	patch_i915_byt_hdmi),

HDA_CODEC_ENTRY(0x80862883, "Braswell HDMI",	patch_i915_byt_hdmi),

CRA Git | Maintained and supported by SUSTech CRA and CCSE