Merge branch 'devel' of git.alsa-project.org:alsa-kernel into topic/misc (47e91348) · Commits · e / devices / android_kernel_fairphone_FP4

sound/core/pcm_lib.c

+5 −3

Original line number	Diff line number	Diff line
		@@ -394,6 +394,7 @@ static int snd_pcm_update_hw_ptr0(struct snd_pcm_substream *substream,
		+ HZ/100);
		/* move new_hw_ptr according jiffies not pos variable */
		new_hw_ptr = old_hw_ptr;
		hw_base = delta;
		/* use loop to avoid checks for delta overflows */
		/* the delta value is small or zero in most cases */
		while (delta > 0) {
		@@ -403,8 +404,6 @@ static int snd_pcm_update_hw_ptr0(struct snd_pcm_substream *substream,
		delta--;
		}
		/* align hw_base to buffer_size */
		hw_base = new_hw_ptr - (new_hw_ptr % runtime->buffer_size);
		delta = 0;
		hw_ptr_error(substream,
		"hw_ptr skipping! %s"
		"(pos=%ld, delta=%ld, period=%ld, "
		@@ -412,9 +411,12 @@ static int snd_pcm_update_hw_ptr0(struct snd_pcm_substream *substream,
		in_interrupt ? "[Q] " : "",
		(long)pos, (long)hdelta,
		(long)runtime->period_size, jdelta,
		((hdelta * HZ) / runtime->rate), delta,
		((hdelta * HZ) / runtime->rate), hw_base,
		(unsigned long)old_hw_ptr,
		(unsigned long)new_hw_ptr);
		/* reset values to proper state */
		delta = 0;
		hw_base = new_hw_ptr - (new_hw_ptr % runtime->buffer_size);
		}
		no_jiffies_check:
		if (delta > runtime->period_size + runtime->period_size / 2) {

sound/pci/hda/hda_codec.c

+22 −26

Original line number	Diff line number	Diff line
		@@ -824,6 +824,9 @@ int snd_hda_add_pincfg(struct hda_codec codec, struct snd_array list,
		struct hda_pincfg *pin;
		unsigned int oldcfg;

		if (get_wcaps_type(get_wcaps(codec, nid)) != AC_WID_PIN)
		return -EINVAL;

		oldcfg = snd_hda_codec_get_pincfg(codec, nid);
		pin = look_up_pincfg(codec, list, nid);
		if (!pin) {
		@@ -899,6 +902,25 @@ static void restore_pincfgs(struct hda_codec *codec)
		}
		}

		/**
		* snd_hda_shutup_pins - Shut up all pins
		* @codec: the HDA codec
		*
		* Clear all pin controls to shup up before suspend for avoiding click noise.
		* The controls aren't cached so that they can be resumed properly.
		*/
		void snd_hda_shutup_pins(struct hda_codec *codec)
		{
		int i;
		for (i = 0; i < codec->init_pins.used; i++) {
		struct hda_pincfg *pin = snd_array_elem(&codec->init_pins, i);
		/* use read here for syncing after issuing each verb */
		snd_hda_codec_read(codec, pin->nid, 0,
		AC_VERB_SET_PIN_WIDGET_CONTROL, 0);
		}
		}
		EXPORT_SYMBOL_HDA(snd_hda_shutup_pins);

		static void init_hda_cache(struct hda_cache_rec *cache,
		unsigned int record_size);
		static void free_hda_cache(struct hda_cache_rec *cache);
		@@ -3537,32 +3559,6 @@ int snd_hda_add_new_ctls(struct hda_codec codec, struct snd_kcontrol_new knew)
		}
		EXPORT_SYMBOL_HDA(snd_hda_add_new_ctls);

		/**
		* snd_hda_add_nids - assign nids to controls from the array
		* @codec: the HDA codec
		* @kctl: struct snd_kcontrol
		* @index: index to kctl
		* @nids: the array of hda_nid_t
		* @size: count of hda_nid_t items
		*
		* This helper function assigns NIDs in the given array to a control element.
		*
		* Returns 0 if successful, or a negative error code.
		*/
		int snd_hda_add_nids(struct hda_codec codec, struct snd_kcontrol kctl,
		unsigned int index, hda_nid_t *nids, unsigned int size)
		{
		int err;

		for ( ; size > 0; size--, nids++) {
		err = snd_hda_add_nid(codec, kctl, index, *nids);
		if (err < 0)
		return err;
		}
		return 0;
		}
		EXPORT_SYMBOL_HDA(snd_hda_add_nids);

		#ifdef CONFIG_SND_HDA_POWER_SAVE
		static void hda_set_power_state(struct hda_codec *codec, hda_nid_t fg,
		unsigned int power_state);

sound/pci/hda/hda_codec.h

+1 −0

Original line number	Diff line number	Diff line
		@@ -898,6 +898,7 @@ int snd_hda_codec_set_pincfg(struct hda_codec *codec, hda_nid_t nid,
		unsigned int cfg);
		int snd_hda_add_pincfg(struct hda_codec codec, struct snd_array list,
		hda_nid_t nid, unsigned int cfg); /* for hwdep */
		void snd_hda_shutup_pins(struct hda_codec *codec);

		/*
		* Mixer

sound/pci/hda/hda_hwdep.c

+5 −2

Original line number	Diff line number	Diff line
		@@ -293,8 +293,11 @@ static ssize_t type##_store(struct device *dev, \
		{ \
		struct snd_hwdep *hwdep = dev_get_drvdata(dev); \
		struct hda_codec *codec = hwdep->private_data; \
		char *after; \
		codec->type = simple_strtoul(buf, &after, 0); \
		unsigned long val; \
		int err = strict_strtoul(buf, 0, &val); \
		if (err < 0) \
		return err; \
		codec->type = val; \
		return count; \
		}

sound/pci/hda/hda_intel.c

+19 −32

Original line number	Diff line number	Diff line
		@@ -356,6 +356,7 @@ struct azx_dev {
		*/
		unsigned char stream_tag; /* assigned stream */
		unsigned char index; /* stream index */
		int device; /* last device number assigned to */

		unsigned int opened :1;
		unsigned int running :1;
		@@ -1441,10 +1442,13 @@ static int __devinit azx_codec_configure(struct azx *chip)
		*/

		/* assign a stream for the PCM */
		static inline struct azx_dev azx_assign_device(struct azx chip, int stream)
		static inline struct azx_dev *
		azx_assign_device(struct azx chip, struct snd_pcm_substream substream)
		{
		int dev, i, nums;
		if (stream == SNDRV_PCM_STREAM_PLAYBACK) {
		struct azx_dev *res = NULL;

		if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) {
		dev = chip->playback_index_offset;
		nums = chip->playback_streams;
		} else {
		@@ -1453,10 +1457,15 @@ static inline struct azx_dev azx_assign_device(struct azx chip, int stream)
		}
		for (i = 0; i < nums; i++, dev++)
		if (!chip->azx_dev[dev].opened) {
		chip->azx_dev[dev].opened = 1;
		return &chip->azx_dev[dev];
		res = &chip->azx_dev[dev];
		if (res->device == substream->pcm->device)
		break;
		}
		if (res) {
		res->opened = 1;
		res->device = substream->pcm->device;
		}
		return NULL;
		return res;
		}

		/* release the assigned stream */
		@@ -1505,7 +1514,7 @@ static int azx_pcm_open(struct snd_pcm_substream *substream)
		int err;

		mutex_lock(&chip->open_mutex);
		azx_dev = azx_assign_device(chip, substream->stream);
		azx_dev = azx_assign_device(chip, substream);
		if (azx_dev == NULL) {
		mutex_unlock(&chip->open_mutex);
		return -EBUSY;
		@@ -2695,32 +2704,10 @@ static struct pci_device_id azx_ids[] = {
		/* ULI M5461 */
		{ PCI_DEVICE(0x10b9, 0x5461), .driver_data = AZX_DRIVER_ULI },
		/* NVIDIA MCP */
		{ PCI_DEVICE(0x10de, 0x026c), .driver_data = AZX_DRIVER_NVIDIA },
		{ PCI_DEVICE(0x10de, 0x0371), .driver_data = AZX_DRIVER_NVIDIA },
		{ PCI_DEVICE(0x10de, 0x03e4), .driver_data = AZX_DRIVER_NVIDIA },
		{ PCI_DEVICE(0x10de, 0x03f0), .driver_data = AZX_DRIVER_NVIDIA },
		{ PCI_DEVICE(0x10de, 0x044a), .driver_data = AZX_DRIVER_NVIDIA },
		{ PCI_DEVICE(0x10de, 0x044b), .driver_data = AZX_DRIVER_NVIDIA },
		{ PCI_DEVICE(0x10de, 0x055c), .driver_data = AZX_DRIVER_NVIDIA },
		{ PCI_DEVICE(0x10de, 0x055d), .driver_data = AZX_DRIVER_NVIDIA },
		{ PCI_DEVICE(0x10de, 0x0590), .driver_data = AZX_DRIVER_NVIDIA },
		{ PCI_DEVICE(0x10de, 0x0774), .driver_data = AZX_DRIVER_NVIDIA },
		{ PCI_DEVICE(0x10de, 0x0775), .driver_data = AZX_DRIVER_NVIDIA },
		{ PCI_DEVICE(0x10de, 0x0776), .driver_data = AZX_DRIVER_NVIDIA },
		{ PCI_DEVICE(0x10de, 0x0777), .driver_data = AZX_DRIVER_NVIDIA },
		{ PCI_DEVICE(0x10de, 0x07fc), .driver_data = AZX_DRIVER_NVIDIA },
		{ PCI_DEVICE(0x10de, 0x07fd), .driver_data = AZX_DRIVER_NVIDIA },
		{ PCI_DEVICE(0x10de, 0x0ac0), .driver_data = AZX_DRIVER_NVIDIA },
		{ PCI_DEVICE(0x10de, 0x0ac1), .driver_data = AZX_DRIVER_NVIDIA },
		{ PCI_DEVICE(0x10de, 0x0ac2), .driver_data = AZX_DRIVER_NVIDIA },
		{ PCI_DEVICE(0x10de, 0x0ac3), .driver_data = AZX_DRIVER_NVIDIA },
		{ PCI_DEVICE(0x10de, 0x0be2), .driver_data = AZX_DRIVER_NVIDIA },
		{ PCI_DEVICE(0x10de, 0x0be3), .driver_data = AZX_DRIVER_NVIDIA },
		{ PCI_DEVICE(0x10de, 0x0be4), .driver_data = AZX_DRIVER_NVIDIA },
		{ PCI_DEVICE(0x10de, 0x0d94), .driver_data = AZX_DRIVER_NVIDIA },
		{ PCI_DEVICE(0x10de, 0x0d95), .driver_data = AZX_DRIVER_NVIDIA },
		{ PCI_DEVICE(0x10de, 0x0d96), .driver_data = AZX_DRIVER_NVIDIA },
		{ PCI_DEVICE(0x10de, 0x0d97), .driver_data = AZX_DRIVER_NVIDIA },
		{ PCI_DEVICE(PCI_VENDOR_ID_NVIDIA, PCI_ANY_ID),
		.class = PCI_CLASS_MULTIMEDIA_HD_AUDIO << 8,
		.class_mask = 0xffffff,
		.driver_data = AZX_DRIVER_NVIDIA },
		/* Teradici */
		{ PCI_DEVICE(0x6549, 0x1200), .driver_data = AZX_DRIVER_TERA },
		/* Creative X-Fi (CA0110-IBG) */