Merge branch 'fix/hda' into topic/hda (b37c0096) · Commits · e / devices / android_kernel_xiaomi_markw

sound/pci/cs5535audio/cs5535audio_pcm.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -148,7 +148,7 @@ static int cs5535audio_build_dma_packets(struct cs5535audio *cs5535au,
		struct cs5535audio_dma_desc *desc =
		&((struct cs5535audio_dma_desc *) dma->desc_buf.area)[i];
		desc->addr = cpu_to_le32(addr);
		desc->size = cpu_to_le32(period_bytes);
		desc->size = cpu_to_le16(period_bytes);
		desc->ctlreserved = cpu_to_le16(PRD_EOP);
		desc_addr += sizeof(struct cs5535audio_dma_desc);
		addr += period_bytes;

sound/pci/hda/hda_codec.c

+3 −3

Original line number	Diff line number	Diff line
		@@ -4046,9 +4046,9 @@ int snd_hda_check_board_codec_sid_config(struct hda_codec *codec,

		/* Search for codec ID */
		for (q = tbl; q->subvendor; q++) {
		unsigned long vendorid = (q->subdevice) \| (q->subvendor << 16);

		if (vendorid == codec->subsystem_id)
		unsigned int mask = 0xffff0000 \| q->subdevice_mask;
		unsigned int id = (q->subdevice \| (q->subvendor << 16)) & mask;
		if ((codec->subsystem_id & mask) == id)
		break;
		}

sound/pci/hda/hda_eld.c

+19 −9

Original line number	Diff line number	Diff line
		@@ -347,18 +347,28 @@ int snd_hdmi_get_eld(struct hdmi_eld *eld,

		for (i = 0; i < size; i++) {
		unsigned int val = hdmi_get_eld_data(codec, nid, i);
		/*
		* Graphics driver might be writing to ELD buffer right now.
		* Just abort. The caller will repoll after a while.
		*/
		if (!(val & AC_ELDD_ELD_VALID)) {
		if (!i) {
		snd_printd(KERN_INFO
		"HDMI: invalid ELD data\n");
		"HDMI: invalid ELD data byte %d\n", i);
		ret = -EINVAL;
		goto error;
		}
		snd_printd(KERN_INFO
		"HDMI: invalid ELD data byte %d\n", i);
		val = 0;
		} else
		val &= AC_ELDD_ELD_DATA;
		/*
		* The first byte cannot be zero. This can happen on some DVI
		* connections. Some Intel chips may also need some 250ms delay
		* to return non-zero ELD data, even when the graphics driver
		* correctly writes ELD content before setting ELD_valid bit.
		*/
		if (!val && !i) {
		snd_printdd(KERN_INFO "HDMI: 0 ELD data\n");
		ret = -EINVAL;
		goto error;
		}
		buf[i] = val;
		}

sound/pci/hda/patch_cirrus.c

+36 −19

Original line number	Diff line number	Diff line
		@@ -58,6 +58,8 @@ struct cs_spec {
		unsigned int gpio_mask;
		unsigned int gpio_dir;
		unsigned int gpio_data;
		unsigned int gpio_eapd_hp; /* EAPD GPIO bit for headphones */
		unsigned int gpio_eapd_speaker; /* EAPD GPIO bit for speakers */

		struct hda_pcm pcm_rec[2]; /* PCM information */

		@@ -76,6 +78,7 @@ enum {
		CS420X_MBP53,
		CS420X_MBP55,
		CS420X_IMAC27,
		CS420X_APPLE,
		CS420X_AUTO,
		CS420X_MODELS
		};
		@@ -237,6 +240,15 @@ static int cs_dig_playback_pcm_cleanup(struct hda_pcm_stream *hinfo,
		return snd_hda_multi_out_dig_cleanup(codec, &spec->multiout);
		}

		static void cs_update_input_select(struct hda_codec *codec)
		{
		struct cs_spec *spec = codec->spec;
		if (spec->cur_adc)
		snd_hda_codec_write(codec, spec->cur_adc, 0,
		AC_VERB_SET_CONNECT_SEL,
		spec->adc_idx[spec->cur_input]);
		}

		/*
		* Analog capture
		*/
		@@ -250,6 +262,7 @@ static int cs_capture_pcm_prepare(struct hda_pcm_stream *hinfo,
		spec->cur_adc = spec->adc_nid[spec->cur_input];
		spec->cur_adc_stream_tag = stream_tag;
		spec->cur_adc_format = format;
		cs_update_input_select(codec);
		snd_hda_codec_setup_stream(codec, spec->cur_adc, stream_tag, 0, format);
		return 0;
		}
		@@ -689,10 +702,8 @@ static int change_cur_input(struct hda_codec *codec, unsigned int idx,
		spec->cur_adc_stream_tag, 0,
		spec->cur_adc_format);
		}
		snd_hda_codec_write(codec, spec->cur_adc, 0,
		AC_VERB_SET_CONNECT_SEL,
		spec->adc_idx[idx]);
		spec->cur_input = idx;
		cs_update_input_select(codec);
		return 1;
		}

		@@ -920,10 +931,9 @@ static void cs_automute(struct hda_codec *codec)
		spdif_present ? 0 : PIN_OUT);
		}
		}
		if (spec->board_config == CS420X_MBP53 \|\|
		spec->board_config == CS420X_MBP55 \|\|
		spec->board_config == CS420X_IMAC27) {
		unsigned int gpio = hp_present ? 0x02 : 0x08;
		if (spec->gpio_eapd_hp) {
		unsigned int gpio = hp_present ?
		spec->gpio_eapd_hp : spec->gpio_eapd_speaker;
		snd_hda_codec_write(codec, 0x01, 0,
		AC_VERB_SET_GPIO_DATA, gpio);
		}
		@@ -973,10 +983,7 @@ static void cs_automic(struct hda_codec *codec)
		} else {
		spec->cur_input = spec->last_input;
		}

		snd_hda_codec_write_cache(codec, spec->cur_adc, 0,
		AC_VERB_SET_CONNECT_SEL,
		spec->adc_idx[spec->cur_input]);
		cs_update_input_select(codec);
		} else {
		if (present)
		change_cur_input(codec, spec->automic_idx, 0);
		@@ -1073,9 +1080,7 @@ static void init_input(struct hda_codec *codec)
		cs_automic(codec);
		else {
		spec->cur_adc = spec->adc_nid[spec->cur_input];
		snd_hda_codec_write(codec, spec->cur_adc, 0,
		AC_VERB_SET_CONNECT_SEL,
		spec->adc_idx[spec->cur_input]);
		cs_update_input_select(codec);
		}
		} else {
		change_cur_input(codec, spec->cur_input, 1);
		@@ -1273,6 +1278,7 @@ static const char * const cs420x_models[CS420X_MODELS] = {
		[CS420X_MBP53] = "mbp53",
		[CS420X_MBP55] = "mbp55",
		[CS420X_IMAC27] = "imac27",
		[CS420X_IMAC27] = "apple",
		[CS420X_AUTO] = "auto",
		};

		@@ -1282,7 +1288,13 @@ static const struct snd_pci_quirk cs420x_cfg_tbl[] = {
		SND_PCI_QUIRK(0x10de, 0x0d94, "MacBookAir 3,1(2)", CS420X_MBP55),
		SND_PCI_QUIRK(0x10de, 0xcb79, "MacBookPro 5,5", CS420X_MBP55),
		SND_PCI_QUIRK(0x10de, 0xcb89, "MacBookPro 7,1", CS420X_MBP55),
		SND_PCI_QUIRK(0x8086, 0x7270, "IMac 27 Inch", CS420X_IMAC27),
		/* this conflicts with too many other models */
		/SND_PCI_QUIRK(0x8086, 0x7270, "IMac 27 Inch", CS420X_IMAC27),/
		{} /* terminator */
		};

		static const struct snd_pci_quirk cs420x_codec_cfg_tbl[] = {
		SND_PCI_QUIRK_VENDOR(0x106b, "Apple", CS420X_APPLE),
		{} /* terminator */
		};

		@@ -1364,6 +1376,10 @@ static int patch_cs420x(struct hda_codec *codec)
		spec->board_config =
		snd_hda_check_board_config(codec, CS420X_MODELS,
		cs420x_models, cs420x_cfg_tbl);
		if (spec->board_config < 0)
		spec->board_config =
		snd_hda_check_board_codec_sid_config(codec,
		CS420X_MODELS, NULL, cs420x_codec_cfg_tbl);
		if (spec->board_config >= 0)
		fix_pincfg(codec, spec->board_config, cs_pincfgs);

		@@ -1371,10 +1387,11 @@ static int patch_cs420x(struct hda_codec *codec)
		case CS420X_IMAC27:
		case CS420X_MBP53:
		case CS420X_MBP55:
		/* GPIO1 = headphones */
		/* GPIO3 = speakers */
		spec->gpio_mask = 0x0a;
		spec->gpio_dir = 0x0a;
		case CS420X_APPLE:
		spec->gpio_eapd_hp = 2; /* GPIO1 = headphones */
		spec->gpio_eapd_speaker = 8; /* GPIO3 = speakers */
		spec->gpio_mask = spec->gpio_dir =
		spec->gpio_eapd_hp \| spec->gpio_eapd_speaker;
		break;
		}

sound/pci/hda/patch_hdmi.c

+10 −6

Original line number	Diff line number	Diff line
		@@ -69,6 +69,7 @@ struct hdmi_spec_per_pin {
		struct hda_codec *codec;
		struct hdmi_eld sink_eld;
		struct delayed_work work;
		int repoll_count;
		};

		struct hdmi_spec {
		@@ -748,7 +749,7 @@ static void hdmi_setup_audio_infoframe(struct hda_codec *codec, int pin_idx,
		* Unsolicited events
		*/

		static void hdmi_present_sense(struct hdmi_spec_per_pin *per_pin, bool retry);
		static void hdmi_present_sense(struct hdmi_spec_per_pin *per_pin, int repoll);

		static void hdmi_intrinsic_event(struct hda_codec *codec, unsigned int res)
		{
		@@ -766,7 +767,7 @@ static void hdmi_intrinsic_event(struct hda_codec *codec, unsigned int res)
		if (pin_idx < 0)
		return;

		hdmi_present_sense(&spec->pins[pin_idx], true);
		hdmi_present_sense(&spec->pins[pin_idx], 1);
		}

		static void hdmi_non_intrinsic_event(struct hda_codec *codec, unsigned int res)
		@@ -960,7 +961,7 @@ static int hdmi_read_pin_conn(struct hda_codec *codec, int pin_idx)
		return 0;
		}

		static void hdmi_present_sense(struct hdmi_spec_per_pin *per_pin, bool retry)
		static void hdmi_present_sense(struct hdmi_spec_per_pin *per_pin, int repoll)
		{
		struct hda_codec *codec = per_pin->codec;
		struct hdmi_eld *eld = &per_pin->sink_eld;
		@@ -989,7 +990,7 @@ static void hdmi_present_sense(struct hdmi_spec_per_pin *per_pin, bool retry)
		if (eld_valid) {
		if (!snd_hdmi_get_eld(eld, codec, pin_nid))
		snd_hdmi_show_eld(eld);
		else if (retry) {
		else if (repoll) {
		queue_delayed_work(codec->bus->workq,
		&per_pin->work,
		msecs_to_jiffies(300));
		@@ -1004,7 +1005,10 @@ static void hdmi_repoll_eld(struct work_struct *work)
		struct hdmi_spec_per_pin *per_pin =
		container_of(to_delayed_work(work), struct hdmi_spec_per_pin, work);

		hdmi_present_sense(per_pin, false);
		if (per_pin->repoll_count++ > 6)
		per_pin->repoll_count = 0;

		hdmi_present_sense(per_pin, per_pin->repoll_count);
		}

		static int hdmi_add_pin(struct hda_codec *codec, hda_nid_t pin_nid)
		@@ -1235,7 +1239,7 @@ static int generic_hdmi_build_jack(struct hda_codec *codec, int pin_idx)
		if (err < 0)
		return err;

		hdmi_present_sense(per_pin, false);
		hdmi_present_sense(per_pin, 0);
		return 0;
		}