Merge branch 'fix/hda' into for-linus (7c56c29a) · Commits · e / devices / android_kernel_oneplus_sm7250

sound/pci/hda/hda_codec.c

+10 −0

Original line number	Diff line number	Diff line
		@@ -3088,6 +3088,16 @@ int snd_hda_multi_out_dig_prepare(struct hda_codec *codec,
		}
		EXPORT_SYMBOL_HDA(snd_hda_multi_out_dig_prepare);

		int snd_hda_multi_out_dig_cleanup(struct hda_codec *codec,
		struct hda_multi_out *mout)
		{
		mutex_lock(&codec->spdif_mutex);
		cleanup_dig_out_stream(codec, mout->dig_out_nid);
		mutex_unlock(&codec->spdif_mutex);
		return 0;
		}
		EXPORT_SYMBOL_HDA(snd_hda_multi_out_dig_cleanup);

		/*
		* release the digital out
		*/

sound/pci/hda/hda_hwdep.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -175,7 +175,7 @@ static int reconfig_codec(struct hda_codec *codec)
		err = snd_hda_codec_build_controls(codec);
		if (err < 0)
		return err;
		return 0;
		return snd_card_register(codec->bus->card);
		}

		/*

sound/pci/hda/hda_local.h

+2 −0

Original line number	Diff line number	Diff line
		@@ -251,6 +251,8 @@ int snd_hda_multi_out_dig_prepare(struct hda_codec *codec,
		unsigned int stream_tag,
		unsigned int format,
		struct snd_pcm_substream *substream);
		int snd_hda_multi_out_dig_cleanup(struct hda_codec *codec,
		struct hda_multi_out *mout);
		int snd_hda_multi_out_analog_open(struct hda_codec *codec,
		struct hda_multi_out *mout,
		struct snd_pcm_substream *substream,

sound/pci/hda/patch_analog.c

+12 −3

Original line number	Diff line number	Diff line
		@@ -275,6 +275,14 @@ static int ad198x_dig_playback_pcm_prepare(struct hda_pcm_stream *hinfo,
		format, substream);
		}

		static int ad198x_dig_playback_pcm_cleanup(struct hda_pcm_stream *hinfo,
		struct hda_codec *codec,
		struct snd_pcm_substream *substream)
		{
		struct ad198x_spec *spec = codec->spec;
		return snd_hda_multi_out_dig_cleanup(codec, &spec->multiout);
		}

		/*
		* Analog capture
		*/
		@@ -333,7 +341,8 @@ static struct hda_pcm_stream ad198x_pcm_digital_playback = {
		.ops = {
		.open = ad198x_dig_playback_pcm_open,
		.close = ad198x_dig_playback_pcm_close,
		.prepare = ad198x_dig_playback_pcm_prepare
		.prepare = ad198x_dig_playback_pcm_prepare,
		.cleanup = ad198x_dig_playback_pcm_cleanup
		},
		};

		@@ -1885,8 +1894,8 @@ static hda_nid_t ad1988_capsrc_nids[3] = {
		#define AD1988_SPDIF_OUT_HDMI 0x0b
		#define AD1988_SPDIF_IN 0x07

		static hda_nid_t ad1989b_slave_dig_outs[2] = {
		AD1988_SPDIF_OUT, AD1988_SPDIF_OUT_HDMI
		static hda_nid_t ad1989b_slave_dig_outs[] = {
		AD1988_SPDIF_OUT, AD1988_SPDIF_OUT_HDMI, 0
		};

		static struct hda_input_mux ad1988_6stack_capture_source = {

sound/pci/hda/patch_intelhdmi.c

+34 −27

Original line number	Diff line number	Diff line
		@@ -49,11 +49,6 @@ static struct hda_verb pinout_enable_verb[] = {
		{} /* terminator */
		};

		static struct hda_verb pinout_disable_verb[] = {
		{PIN_NID, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x00},
		{}
		};

		static struct hda_verb unsolicited_response_verb[] = {
		{PIN_NID, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN \|
		INTEL_HDMI_EVENT_TAG},
		@@ -248,10 +243,6 @@ static void hdmi_write_dip_byte(struct hda_codec *codec, hda_nid_t nid,

		static void hdmi_enable_output(struct hda_codec *codec)
		{
		/* Enable Audio InfoFrame Transmission */
		hdmi_set_dip_index(codec, PIN_NID, 0x0, 0x0);
		snd_hda_codec_write(codec, PIN_NID, 0, AC_VERB_SET_HDMI_DIP_XMIT,
		AC_DIPXMIT_BEST);
		/* Unmute */
		if (get_wcaps(codec, PIN_NID) & AC_WCAP_OUT_AMP)
		snd_hda_codec_write(codec, PIN_NID, 0,
		@@ -260,17 +251,24 @@ static void hdmi_enable_output(struct hda_codec *codec)
		snd_hda_sequence_write(codec, pinout_enable_verb);
		}

		static void hdmi_disable_output(struct hda_codec *codec)
		/*
		* Enable Audio InfoFrame Transmission
		*/
		static void hdmi_start_infoframe_trans(struct hda_codec *codec)
		{
		snd_hda_sequence_write(codec, pinout_disable_verb);
		if (get_wcaps(codec, PIN_NID) & AC_WCAP_OUT_AMP)
		snd_hda_codec_write(codec, PIN_NID, 0,
		AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE);
		hdmi_set_dip_index(codec, PIN_NID, 0x0, 0x0);
		snd_hda_codec_write(codec, PIN_NID, 0, AC_VERB_SET_HDMI_DIP_XMIT,
		AC_DIPXMIT_BEST);
		}

		/*
		* FIXME: noises may arise when playing music after reloading the
		* kernel module, until the next X restart or monitor repower.
		* Disable Audio InfoFrame Transmission
		*/
		static void hdmi_stop_infoframe_trans(struct hda_codec *codec)
		{
		hdmi_set_dip_index(codec, PIN_NID, 0x0, 0x0);
		snd_hda_codec_write(codec, PIN_NID, 0, AC_VERB_SET_HDMI_DIP_XMIT,
		AC_DIPXMIT_DISABLE);
		}

		static int hdmi_get_channel_count(struct hda_codec *codec)
		@@ -368,11 +366,16 @@ static void hdmi_fill_audio_infoframe(struct hda_codec *codec,
		struct hdmi_audio_infoframe *ai)
		{
		u8 params = (u8 )ai;
		u8 sum = 0;
		int i;

		hdmi_debug_dip_size(codec);
		hdmi_clear_dip_buffers(codec); /* be paranoid */

		for (i = 0; i < sizeof(ai); i++)
		sum += params[i];
		ai->checksum = - sum;

		hdmi_set_dip_index(codec, PIN_NID, 0x0, 0x0);
		for (i = 0; i < sizeof(ai); i++)
		hdmi_write_dip_byte(codec, PIN_NID, params[i]);
		@@ -419,13 +422,17 @@ static int hdmi_setup_channel_allocation(struct hda_codec *codec,
		/*
		* CA defaults to 0 for basic stereo audio
		*/
		if (!eld->eld_ver)
		return 0;
		if (!eld->spk_alloc)
		return 0;
		if (channels <= 2)
		return 0;

		/*
		* HDMI sink's ELD info cannot always be retrieved for now, e.g.
		* in console or for audio devices. Assume the highest speakers
		* configuration, to _not_ prohibit multi-channel audio playback.
		*/
		if (!eld->spk_alloc)
		eld->spk_alloc = 0xffff;

		/*
		* expand ELD's speaker allocation mask
		*
		@@ -485,6 +492,7 @@ static void hdmi_setup_audio_infoframe(struct hda_codec *codec,
		hdmi_setup_channel_mapping(codec, &ai);

		hdmi_fill_audio_infoframe(codec, &ai);
		hdmi_start_infoframe_trans(codec);
		}


		@@ -562,7 +570,7 @@ static int intel_hdmi_playback_pcm_close(struct hda_pcm_stream *hinfo,
		{
		struct intel_hdmi_spec *spec = codec->spec;

		hdmi_disable_output(codec);
		hdmi_stop_infoframe_trans(codec);

		return snd_hda_multi_out_dig_close(codec, &spec->multiout);
		}
		@@ -582,8 +590,6 @@ static int intel_hdmi_playback_pcm_prepare(struct hda_pcm_stream *hinfo,

		hdmi_setup_audio_infoframe(codec, substream);

		hdmi_enable_output(codec);

		return 0;
		}

		@@ -628,8 +634,7 @@ static int intel_hdmi_build_controls(struct hda_codec *codec)

		static int intel_hdmi_init(struct hda_codec *codec)
		{
		/* disable audio output as early as possible */
		hdmi_disable_output(codec);
		hdmi_enable_output(codec);

		snd_hda_sequence_write(codec, unsolicited_response_verb);

		@@ -679,6 +684,7 @@ static struct hda_codec_preset snd_hda_preset_intelhdmi[] = {
		{ .id = 0x80862801, .name = "G45 DEVBLC", .patch = patch_intel_hdmi },
		{ .id = 0x80862802, .name = "G45 DEVCTG", .patch = patch_intel_hdmi },
		{ .id = 0x80862803, .name = "G45 DEVELK", .patch = patch_intel_hdmi },
		{ .id = 0x80862804, .name = "G45 DEVIBX", .patch = patch_intel_hdmi },
		{ .id = 0x10951392, .name = "SiI1392 HDMI", .patch = patch_intel_hdmi },
		{} /* terminator */
		};
		@@ -687,6 +693,7 @@ MODULE_ALIAS("snd-hda-codec-id:808629fb");
		MODULE_ALIAS("snd-hda-codec-id:80862801");
		MODULE_ALIAS("snd-hda-codec-id:80862802");
		MODULE_ALIAS("snd-hda-codec-id:80862803");
		MODULE_ALIAS("snd-hda-codec-id:80862804");
		MODULE_ALIAS("snd-hda-codec-id:10951392");

		MODULE_LICENSE("GPL");