Commit 2dbb0e6c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull sound fixes from Takashi Iwai:
 "Some cleaning after the first batch; mostly about HD-audio quirks but
  also some NULL dereference fixes in corner cases and a random build
  error fix, too"

* tag 'sound-fix-5.1-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:
  ALSA: hda/realtek - Add support headset mode for New DELL WYSE NB
  ALSA: hda/realtek - Add support headset mode for DELL WYSE AIO
  ALSA: hda/realtek: merge alc_fixup_headset_jack to alc295_fixup_chromebook
  ALSA: pcm: Fix function name in kernel-doc comment
  ALSA: hda: hdmi - add Icelake support
  ALSA: hda - add more quirks for HP Z2 G4 and HP Z240
  ALSA: hda/realtek - Fixed Headset Mic JD not stable
  ALSA: hda/realtek: Enable headset MIC of Acer TravelMate X514-51T with ALC255
  ALSA: hda/tegra: avoid build error without CONFIG_PM
  ALSA: usx2y: Fix potential NULL pointer dereference
  ALSA: hda: Avoid NULL pointer dereference at snd_hdac_stream_start()
parents 8264fd04 da484d00

include/sound/pcm.h

+1 −1
Original line number Diff line number Diff line
@@ -750,7 +750,7 @@ static inline snd_pcm_uframes_t snd_pcm_playback_avail(struct snd_pcm_runtime *r 
}



/**

 * snd_pcm_playback_avail - Get the available (readable) space for capture

 * snd_pcm_capture_avail - Get the available (readable) space for capture

 * @runtime: PCM runtime instance

 *

 * Result is between 0 ... (boundary - 1)

sound/hda/hdac_stream.c

+4 −1
Original line number Diff line number Diff line
@@ -95,7 +95,10 @@ void snd_hdac_stream_start(struct hdac_stream *azx_dev, bool fresh_start) 
			      1 << azx_dev->index,

			      1 << azx_dev->index);

	/* set stripe control */

	if (azx_dev->substream)

		stripe_ctl = snd_hdac_get_stream_stripe_ctl(bus, azx_dev->substream);

	else

		stripe_ctl = 0;

	snd_hdac_stream_updateb(azx_dev, SD_CTL_3B, SD_CTL_STRIPE_MASK,

				stripe_ctl);

	/* set DMA start and interrupt mask */

sound/pci/hda/hda_tegra.c

+4 −8
Original line number Diff line number Diff line
@@ -219,7 +219,6 @@ disable_hda: 
	return rc;

}



#ifdef CONFIG_PM_SLEEP

static void hda_tegra_disable_clocks(struct hda_tegra *data)

{

	clk_disable_unprepare(data->hda2hdmi_clk);
@@ -230,7 +229,7 @@ static void hda_tegra_disable_clocks(struct hda_tegra *data) 
/*

 * power management

 */

static int hda_tegra_suspend(struct device *dev)

static int __maybe_unused hda_tegra_suspend(struct device *dev)

{

	struct snd_card *card = dev_get_drvdata(dev);

	int rc;
@@ -243,7 +242,7 @@ static int hda_tegra_suspend(struct device *dev) 
	return 0;

}



static int hda_tegra_resume(struct device *dev)

static int __maybe_unused hda_tegra_resume(struct device *dev)

{

	struct snd_card *card = dev_get_drvdata(dev);

	int rc;
@@ -255,10 +254,8 @@ static int hda_tegra_resume(struct device *dev) 


	return 0;

}

#endif /* CONFIG_PM_SLEEP */



#ifdef CONFIG_PM

static int hda_tegra_runtime_suspend(struct device *dev)

static int __maybe_unused hda_tegra_runtime_suspend(struct device *dev)

{

	struct snd_card *card = dev_get_drvdata(dev);

	struct azx *chip = card->private_data;
@@ -275,7 +272,7 @@ static int hda_tegra_runtime_suspend(struct device *dev) 
	return 0;

}



static int hda_tegra_runtime_resume(struct device *dev)

static int __maybe_unused hda_tegra_runtime_resume(struct device *dev)

{

	struct snd_card *card = dev_get_drvdata(dev);

	struct azx *chip = card->private_data;
@@ -292,7 +289,6 @@ static int hda_tegra_runtime_resume(struct device *dev) 


	return 0;

}

#endif /* CONFIG_PM */



static const struct dev_pm_ops hda_tegra_pm = {

	SET_SYSTEM_SLEEP_PM_OPS(hda_tegra_suspend, hda_tegra_resume)

sound/pci/hda/patch_conexant.c

+3 −0
Original line number Diff line number Diff line
@@ -936,6 +936,9 @@ static const struct snd_pci_quirk cxt5066_fixups[] = { 
	SND_PCI_QUIRK(0x103c, 0x8299, "HP 800 G3 SFF", CXT_FIXUP_HP_MIC_NO_PRESENCE),

	SND_PCI_QUIRK(0x103c, 0x829a, "HP 800 G3 DM", CXT_FIXUP_HP_MIC_NO_PRESENCE),

	SND_PCI_QUIRK(0x103c, 0x8455, "HP Z2 G4", CXT_FIXUP_HP_MIC_NO_PRESENCE),

	SND_PCI_QUIRK(0x103c, 0x8456, "HP Z2 G4 SFF", CXT_FIXUP_HP_MIC_NO_PRESENCE),

	SND_PCI_QUIRK(0x103c, 0x8457, "HP Z2 G4 mini", CXT_FIXUP_HP_MIC_NO_PRESENCE),

	SND_PCI_QUIRK(0x103c, 0x8458, "HP Z2 G4 mini premium", CXT_FIXUP_HP_MIC_NO_PRESENCE),

	SND_PCI_QUIRK(0x1043, 0x138d, "Asus", CXT_FIXUP_HEADPHONE_MIC_PIN),

	SND_PCI_QUIRK(0x152d, 0x0833, "OLPC XO-1.5", CXT_FIXUP_OLPC_XO),

	SND_PCI_QUIRK(0x17aa, 0x20f2, "Lenovo T400", CXT_PINCFG_LENOVO_TP410),

sound/pci/hda/patch_hdmi.c

+51 −16
Original line number Diff line number Diff line
@@ -57,10 +57,11 @@ MODULE_PARM_DESC(static_hdmi_pcm, "Don't restrict PCM parameters per ELD info"); 
#define is_geminilake(codec) (((codec)->core.vendor_id == 0x8086280d) || \

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

#define is_cannonlake(codec) ((codec)->core.vendor_id == 0x8086280c)

#define is_icelake(codec) ((codec)->core.vendor_id == 0x8086280f)

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

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

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

				|| is_cannonlake(codec)

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

				|| is_cannonlake(codec) || is_icelake(codec))

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

#define is_cherryview(codec) ((codec)->core.vendor_id == 0x80862883)

#define is_valleyview_plus(codec) (is_valleyview(codec) || is_cherryview(codec))
@@ -181,6 +182,8 @@ struct hdmi_spec { 


	struct hdac_chmap chmap;

	hda_nid_t vendor_nid;

	const int *port_map;

	int port_num;

};



#ifdef CONFIG_SND_HDA_COMPONENT
@@ -2418,8 +2421,7 @@ static void intel_haswell_fixup_connect_list(struct hda_codec *codec, 
	snd_hda_override_conn_list(codec, nid, spec->num_cvts, spec->cvt_nids);

}



#define INTEL_VENDOR_NID 0x08

#define INTEL_GLK_VENDOR_NID 0x0B

#define INTEL_GET_VENDOR_VERB	0xf81

#define INTEL_GET_VENDOR_VERB	0xf81

#define INTEL_SET_VENDOR_VERB	0x781

#define INTEL_EN_DP12		0x02	/* enable DP 1.2 features */
@@ -2503,13 +2505,31 @@ static int intel_base_nid(struct hda_codec *codec) 


static int intel_pin2port(void *audio_ptr, int pin_nid)

{

	int base_nid = intel_base_nid(audio_ptr);

	struct hda_codec *codec = audio_ptr;

	struct hdmi_spec *spec = codec->spec;

	int base_nid, i;



	if (!spec->port_num) {

		base_nid = intel_base_nid(codec);

		if (WARN_ON(pin_nid < base_nid || pin_nid >= base_nid + 3))

			return -1;

		return pin_nid - base_nid + 1; /* intel port is 1-based */

	}



	/*

	 * looking for the pin number in the mapping table and return

	 * the index which indicate the port number

	 */

	for (i = 0; i < spec->port_num; i++) {

		if (pin_nid == spec->port_map[i])

			return i + 1;

	}



	/* return -1 if pin number exceeds our expectation */

	codec_info(codec, "Can't find the HDMI/DP port for pin %d\n", pin_nid);

	return -1;

}



static void intel_pin_eld_notify(void *audio_ptr, int port, int pipe)

{

	struct hda_codec *codec = audio_ptr;
@@ -2608,7 +2628,8 @@ static int parse_intel_hdmi(struct hda_codec *codec) 
}



/* Intel Haswell and onwards; audio component with eld notifier */

static int intel_hsw_common_init(struct hda_codec *codec, hda_nid_t vendor_nid)

static int intel_hsw_common_init(struct hda_codec *codec, hda_nid_t vendor_nid,

				 const int *port_map, int port_num)

{

	struct hdmi_spec *spec;

	int err;
@@ -2620,6 +2641,8 @@ static int intel_hsw_common_init(struct hda_codec *codec, hda_nid_t vendor_nid) 
	codec->dp_mst = true;

	spec->dyn_pcm_assign = true;

	spec->vendor_nid = vendor_nid;

	spec->port_map = port_map;

	spec->port_num = port_num;



	intel_haswell_enable_all_pins(codec, true);

	intel_haswell_fixup_enable_dp12(codec);
@@ -2638,12 +2661,23 @@ static int intel_hsw_common_init(struct hda_codec *codec, hda_nid_t vendor_nid) 


static int patch_i915_hsw_hdmi(struct hda_codec *codec)

{

	return intel_hsw_common_init(codec, INTEL_VENDOR_NID);

	return intel_hsw_common_init(codec, 0x08, NULL, 0);

}



static int patch_i915_glk_hdmi(struct hda_codec *codec)

{

	return intel_hsw_common_init(codec, INTEL_GLK_VENDOR_NID);

	return intel_hsw_common_init(codec, 0x0b, NULL, 0);

}



static int patch_i915_icl_hdmi(struct hda_codec *codec)

{

	/*

	 * pin to port mapping table where the value indicate the pin number and

	 * the index indicate the port number with 1 base.

	 */

	static const int map[] = {0x4, 0x6, 0x8, 0xa, 0xb};



	return intel_hsw_common_init(codec, 0x02, map, ARRAY_SIZE(map));

}



/* Intel Baytrail and Braswell; with eld notifier */
@@ -3886,6 +3920,7 @@ HDA_CODEC_ENTRY(0x11069f81, "VX900 HDMI/DP", patch_via_hdmi), 
HDA_CODEC_ENTRY(0x11069f84, "VX11 HDMI/DP",	patch_generic_hdmi),

HDA_CODEC_ENTRY(0x11069f85, "VX11 HDMI/DP",	patch_generic_hdmi),

HDA_CODEC_ENTRY(0x80860054, "IbexPeak HDMI",	patch_i915_cpt_hdmi),

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

HDA_CODEC_ENTRY(0x80862801, "Bearlake HDMI",	patch_generic_hdmi),

HDA_CODEC_ENTRY(0x80862802, "Cantiga HDMI",	patch_generic_hdmi),

HDA_CODEC_ENTRY(0x80862803, "Eaglelake HDMI",	patch_generic_hdmi),
@@ -3899,7 +3934,7 @@ HDA_CODEC_ENTRY(0x8086280a, "Broxton HDMI", patch_i915_hsw_hdmi), 
HDA_CODEC_ENTRY(0x8086280b, "Kabylake HDMI",	patch_i915_hsw_hdmi),

HDA_CODEC_ENTRY(0x8086280c, "Cannonlake HDMI",	patch_i915_glk_hdmi),

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

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

HDA_CODEC_ENTRY(0x8086280f, "Icelake HDMI",	patch_i915_icl_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