Merge branch 'for-linus' into for-next (3b8bd500) · Commits · e / devices / android_kernel_oneplus_sm7250

sound/core/control.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -889,7 +889,7 @@ static int snd_ctl_elem_read(struct snd_card *card,

		index_offset = snd_ctl_get_ioff(kctl, &control->id);
		vd = &kctl->vd[index_offset];
		if (!(vd->access & SNDRV_CTL_ELEM_ACCESS_READ) && kctl->get == NULL)
		if (!(vd->access & SNDRV_CTL_ELEM_ACCESS_READ) \|\| kctl->get == NULL)
		return -EPERM;

		snd_ctl_build_ioff(&control->id, kctl, index_offset);

sound/core/seq/seq_clientmgr.c

+6 −2

Original line number	Diff line number	Diff line
		@@ -1003,7 +1003,7 @@ static ssize_t snd_seq_write(struct file file, const char __user buf,
		{
		struct snd_seq_client *client = file->private_data;
		int written = 0, len;
		int err = -EINVAL;
		int err;
		struct snd_seq_event event;

		if (!(snd_seq_file_flags(file) & SNDRV_SEQ_LFLG_OUTPUT))
		@@ -1018,11 +1018,15 @@ static ssize_t snd_seq_write(struct file file, const char __user buf,

		/* allocate the pool now if the pool is not allocated yet */
		if (client->pool->size > 0 && !snd_seq_write_pool_allocated(client)) {
		if (snd_seq_pool_init(client->pool) < 0)
		mutex_lock(&client->ioctl_mutex);
		err = snd_seq_pool_init(client->pool);
		mutex_unlock(&client->ioctl_mutex);
		if (err < 0)
		return -ENOMEM;
		}

		/* only process whole events */
		err = -EINVAL;
		while (count >= sizeof(struct snd_seq_event)) {
		/* Read in the event header from the user */
		len = sizeof(event);

sound/pci/hda/hda_intel.c

+36 −2

Original line number	Diff line number	Diff line
		@@ -181,7 +181,7 @@ static const struct kernel_param_ops param_ops_xint = {
		};
		#define param_check_xint param_check_int

		static int power_save = CONFIG_SND_HDA_POWER_SAVE_DEFAULT;
		static int power_save = -1;
		module_param(power_save, xint, 0644);
		MODULE_PARM_DESC(power_save, "Automatic power-saving timeout "
		"(in second, 0 = disable).");
		@@ -2186,6 +2186,24 @@ static int azx_probe(struct pci_dev *pci,
		return err;
		}

		#ifdef CONFIG_PM
		/* On some boards setting power_save to a non 0 value leads to clicking /
		* popping sounds when ever we enter/leave powersaving mode. Ideally we would
		* figure out how to avoid these sounds, but that is not always feasible.
		* So we keep a list of devices where we disable powersaving as its known
		* to causes problems on these devices.
		*/
		static struct snd_pci_quirk power_save_blacklist[] = {
		/* https://bugzilla.redhat.com/show_bug.cgi?id=1525104 */
		SND_PCI_QUIRK(0x1849, 0x0c0c, "Asrock B85M-ITX", 0),
		/* https://bugzilla.redhat.com/show_bug.cgi?id=1525104 */
		SND_PCI_QUIRK(0x1043, 0x8733, "Asus Prime X370-Pro", 0),
		/* https://bugzilla.kernel.org/show_bug.cgi?id=198611 */
		SND_PCI_QUIRK(0x17aa, 0x2227, "Lenovo X1 Carbon 3rd Gen", 0),
		{}
		};
		#endif /* CONFIG_PM */

		/* number of codec slots for each chipset: 0 = default slots (i.e. 4) */
		static unsigned int azx_max_codecs[AZX_NUM_DRIVERS] = {
		[AZX_DRIVER_NVIDIA] = 8,
		@@ -2198,6 +2216,7 @@ static int azx_probe_continue(struct azx *chip)
		struct hdac_bus *bus = azx_bus(chip);
		struct pci_dev *pci = chip->pci;
		int dev = chip->dev_index;
		int val;
		int err;

		hda->probe_continued = 1;
		@@ -2278,7 +2297,22 @@ static int azx_probe_continue(struct azx *chip)

		chip->running = 1;
		azx_add_card_list(chip);
		snd_hda_set_power_save(&chip->bus, power_save * 1000);

		val = power_save;
		#ifdef CONFIG_PM
		if (val == -1) {
		const struct snd_pci_quirk *q;

		val = CONFIG_SND_HDA_POWER_SAVE_DEFAULT;
		q = snd_pci_quirk_lookup(chip->pci, power_save_blacklist);
		if (q && val) {
		dev_info(chip->card->dev, "device %04x:%04x is on the power_save blacklist, forcing power_save to 0\n",
		q->subvendor, q->subdevice);
		val = 0;
		}
		}
		#endif /* CONFIG_PM */
		snd_hda_set_power_save(&chip->bus, val * 1000);
		if (azx_has_pm_runtime(chip) \|\| hda->use_vga_switcheroo)
		pm_runtime_put_autosuspend(&pci->dev);

sound/pci/hda/patch_realtek.c

+21 −1

Original line number	Diff line number	Diff line
		@@ -3465,6 +3465,19 @@ static void alc269_fixup_pincfg_no_hp_to_lineout(struct hda_codec *codec,
		spec->parse_flags = HDA_PINCFG_NO_HP_FIXUP;
		}

		static void alc269_fixup_pincfg_U7x7_headset_mic(struct hda_codec *codec,
		const struct hda_fixup *fix,
		int action)
		{
		unsigned int cfg_headphone = snd_hda_codec_get_pincfg(codec, 0x21);
		unsigned int cfg_headset_mic = snd_hda_codec_get_pincfg(codec, 0x19);

		if (cfg_headphone && cfg_headset_mic == 0x411111f0)
		snd_hda_codec_set_pincfg(codec, 0x19,
		(cfg_headphone & ~AC_DEFCFG_DEVICE) \|
		(AC_JACK_MIC_IN << AC_DEFCFG_DEVICE_SHIFT));
		}

		static void alc269_fixup_hweq(struct hda_codec *codec,
		const struct hda_fixup *fix, int action)
		{
		@@ -4984,13 +4997,14 @@ static void alc_fixup_tpt470_dock(struct hda_codec *codec,

		if (action == HDA_FIXUP_ACT_PRE_PROBE) {
		spec->parse_flags = HDA_PINCFG_NO_HP_FIXUP;
		snd_hda_apply_pincfgs(codec, pincfgs);
		} else if (action == HDA_FIXUP_ACT_INIT) {
		/* Enable DOCK device */
		snd_hda_codec_write(codec, 0x17, 0,
		AC_VERB_SET_CONFIG_DEFAULT_BYTES_3, 0);
		/* Enable DOCK device */
		snd_hda_codec_write(codec, 0x19, 0,
		AC_VERB_SET_CONFIG_DEFAULT_BYTES_3, 0);
		snd_hda_apply_pincfgs(codec, pincfgs);
		}
		}

		@@ -5373,6 +5387,7 @@ enum {
		ALC269_FIXUP_LIFEBOOK_EXTMIC,
		ALC269_FIXUP_LIFEBOOK_HP_PIN,
		ALC269_FIXUP_LIFEBOOK_NO_HP_TO_LINEOUT,
		ALC255_FIXUP_LIFEBOOK_U7x7_HEADSET_MIC,
		ALC269_FIXUP_AMIC,
		ALC269_FIXUP_DMIC,
		ALC269VB_FIXUP_AMIC,
		@@ -5579,6 +5594,10 @@ static const struct hda_fixup alc269_fixups[] = {
		.type = HDA_FIXUP_FUNC,
		.v.func = alc269_fixup_pincfg_no_hp_to_lineout,
		},
		[ALC255_FIXUP_LIFEBOOK_U7x7_HEADSET_MIC] = {
		.type = HDA_FIXUP_FUNC,
		.v.func = alc269_fixup_pincfg_U7x7_headset_mic,
		},
		[ALC269_FIXUP_AMIC] = {
		.type = HDA_FIXUP_PINS,
		.v.pins = (const struct hda_pintbl[]) {
		@@ -6453,6 +6472,7 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = {
		SND_PCI_QUIRK(0x10cf, 0x159f, "Lifebook E780", ALC269_FIXUP_LIFEBOOK_NO_HP_TO_LINEOUT),
		SND_PCI_QUIRK(0x10cf, 0x15dc, "Lifebook T731", ALC269_FIXUP_LIFEBOOK_HP_PIN),
		SND_PCI_QUIRK(0x10cf, 0x1757, "Lifebook E752", ALC269_FIXUP_LIFEBOOK_HP_PIN),
		SND_PCI_QUIRK(0x10cf, 0x1629, "Lifebook U7x7", ALC255_FIXUP_LIFEBOOK_U7x7_HEADSET_MIC),
		SND_PCI_QUIRK(0x10cf, 0x1845, "Lifebook U904", ALC269_FIXUP_LIFEBOOK_EXTMIC),
		SND_PCI_QUIRK(0x10ec, 0x10f2, "Intel Reference board", ALC700_FIXUP_INTEL_REFERENCE),
		SND_PCI_QUIRK(0x144d, 0xc109, "Samsung Ativ book 9 (NP900X3G)", ALC269_FIXUP_INV_DMIC),

sound/usb/quirks-table.h

+47 −0

Original line number	Diff line number	Diff line
		@@ -3325,4 +3325,51 @@ AU0828_DEVICE(0x2040, 0x7270, "Hauppauge", "HVR-950Q"),
		}
		},

		{
		/*
		* Bower's & Wilkins PX headphones only support the 48 kHz sample rate
		* even though it advertises more. The capture interface doesn't work
		* even on windows.
		*/
		USB_DEVICE(0x19b5, 0x0021),
		.driver_info = (unsigned long) &(const struct snd_usb_audio_quirk) {
		.ifnum = QUIRK_ANY_INTERFACE,
		.type = QUIRK_COMPOSITE,
		.data = (const struct snd_usb_audio_quirk[]) {
		{
		.ifnum = 0,
		.type = QUIRK_AUDIO_STANDARD_MIXER,
		},
		/* Capture */
		{
		.ifnum = 1,
		.type = QUIRK_IGNORE_INTERFACE,
		},
		/* Playback */
		{
		.ifnum = 2,
		.type = QUIRK_AUDIO_FIXED_ENDPOINT,
		.data = &(const struct audioformat) {
		.formats = SNDRV_PCM_FMTBIT_S16_LE,
		.channels = 2,
		.iface = 2,
		.altsetting = 1,
		.altset_idx = 1,
		.attributes = UAC_EP_CS_ATTR_FILL_MAX \|
		UAC_EP_CS_ATTR_SAMPLE_RATE,
		.endpoint = 0x03,
		.ep_attr = USB_ENDPOINT_XFER_ISOC,
		.rates = SNDRV_PCM_RATE_48000,
		.rate_min = 48000,
		.rate_max = 48000,
		.nr_rates = 1,
		.rate_table = (unsigned int[]) {
		48000
		}
		}
		},
		}
		}
		},

		#undef USB_DEVICE_VENDOR_SPEC