Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f1cf9a66 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

Merge branch 'topic/hda' into for-linus

parents 6679ee18 2abbf439

sound/pci/hda/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -157,7 +157,7 @@ config SND_HDA_CODEC_INTELHDMI 


config SND_HDA_ELD

	def_bool y

	depends on SND_HDA_CODEC_INTELHDMI

	depends on SND_HDA_CODEC_INTELHDMI || SND_HDA_CODEC_NVHDMI



config SND_HDA_CODEC_CIRRUS

	bool "Build Cirrus Logic codec support"

sound/pci/hda/Makefile

+2 −2
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ snd-hda-intel-objs := hda_intel.o 
snd-hda-codec-y := hda_codec.o

snd-hda-codec-$(CONFIG_SND_HDA_GENERIC) += hda_generic.o

snd-hda-codec-$(CONFIG_PROC_FS) += hda_proc.o

# snd-hda-codec-$(CONFIG_SND_HDA_ELD) += hda_eld.o

snd-hda-codec-$(CONFIG_SND_HDA_ELD) += hda_eld.o

snd-hda-codec-$(CONFIG_SND_HDA_HWDEP) += hda_hwdep.o

snd-hda-codec-$(CONFIG_SND_HDA_INPUT_BEEP) += hda_beep.o
@@ -18,7 +18,7 @@ snd-hda-codec-ca0110-objs := patch_ca0110.o 
snd-hda-codec-conexant-objs :=	patch_conexant.o

snd-hda-codec-via-objs :=	patch_via.o

snd-hda-codec-nvhdmi-objs :=	patch_nvhdmi.o

snd-hda-codec-intelhdmi-objs :=	patch_intelhdmi.o hda_eld.o

snd-hda-codec-intelhdmi-objs :=	patch_intelhdmi.o



# common driver

obj-$(CONFIG_SND_HDA_INTEL) := snd-hda-codec.o

sound/pci/hda/hda_codec.c

+38 −31
Original line number Diff line number Diff line
@@ -978,7 +978,8 @@ static void hda_set_power_state(struct hda_codec *codec, hda_nid_t fg, 
 *

 * Returns 0 if successful, or a negative error code.

 */

int /*__devinit*/ snd_hda_codec_new(struct hda_bus *bus, unsigned int codec_addr,

int /*__devinit*/ snd_hda_codec_new(struct hda_bus *bus,

				unsigned int codec_addr,

				struct hda_codec **codecp)

{

	struct hda_codec *codec;
@@ -1356,7 +1357,8 @@ u32 snd_hda_pin_sense(struct hda_codec *codec, hda_nid_t nid) 
	if (!codec->no_trigger_sense) {

		pincap = snd_hda_query_pin_caps(codec, nid);

		if (pincap & AC_PINCAP_TRIG_REQ) /* need trigger? */

			snd_hda_codec_read(codec, nid, 0, AC_VERB_SET_PIN_SENSE, 0);

			snd_hda_codec_read(codec, nid, 0,

					AC_VERB_SET_PIN_SENSE, 0);

	}

	return snd_hda_codec_read(codec, nid, 0,

				  AC_VERB_GET_PIN_SENSE, 0);
@@ -2979,8 +2981,12 @@ unsigned int snd_hda_calc_stream_format(unsigned int rate, 
	val |= channels - 1;



	switch (snd_pcm_format_width(format)) {

	case 8:  val |= 0x00; break;

	case 16: val |= 0x10; break;

	case 8:

		val |= 0x00;

		break;

	case 16:

		val |= 0x10;

		break;

	case 20:

	case 24:

	case 32:
@@ -3298,7 +3304,8 @@ static int get_empty_pcm_device(struct hda_bus *bus, int type) 
		if (!test_and_set_bit(audio_idx[type][i], bus->pcm_dev_bits))

			return audio_idx[type][i];



	snd_printk(KERN_WARNING "Too many %s devices\n", snd_hda_pcm_type_name[type]);

	snd_printk(KERN_WARNING "Too many %s devices\n",

		snd_hda_pcm_type_name[type]);

	return -EAGAIN;

}

sound/pci/hda/hda_eld.c

+6 −0
Original line number Diff line number Diff line
@@ -331,6 +331,7 @@ int snd_hdmi_get_eld_size(struct hda_codec *codec, hda_nid_t nid) 
	return snd_hda_codec_read(codec, nid, 0, AC_VERB_GET_HDMI_DIP_SIZE,

						 AC_DIPSIZE_ELD_BUF);

}

EXPORT_SYMBOL_HDA(snd_hdmi_get_eld_size);



int snd_hdmi_get_eld(struct hdmi_eld *eld,

		     struct hda_codec *codec, hda_nid_t nid)
@@ -366,6 +367,7 @@ int snd_hdmi_get_eld(struct hdmi_eld *eld, 
	kfree(buf);

	return ret;

}

EXPORT_SYMBOL_HDA(snd_hdmi_get_eld);



static void hdmi_show_short_audio_desc(struct cea_sad *a)

{
@@ -404,6 +406,7 @@ void snd_print_channel_allocation(int spk_alloc, char *buf, int buflen) 
	}

	buf[j] = '\0';	/* necessary when j == 0 */

}

EXPORT_SYMBOL_HDA(snd_print_channel_allocation);



void snd_hdmi_show_eld(struct hdmi_eld *e)

{
@@ -422,6 +425,7 @@ void snd_hdmi_show_eld(struct hdmi_eld *e) 
	for (i = 0; i < e->sad_count; i++)

		hdmi_show_short_audio_desc(e->sad + i);

}

EXPORT_SYMBOL_HDA(snd_hdmi_show_eld);



#ifdef CONFIG_PROC_FS
@@ -580,6 +584,7 @@ int snd_hda_eld_proc_new(struct hda_codec *codec, struct hdmi_eld *eld, 


	return 0;

}

EXPORT_SYMBOL_HDA(snd_hda_eld_proc_new);



void snd_hda_eld_proc_free(struct hda_codec *codec, struct hdmi_eld *eld)

{
@@ -588,5 +593,6 @@ void snd_hda_eld_proc_free(struct hda_codec *codec, struct hdmi_eld *eld) 
		eld->proc_entry = NULL;

	}

}

EXPORT_SYMBOL_HDA(snd_hda_eld_proc_free);



#endif /* CONFIG_PROC_FS */

sound/pci/hda/hda_intel.c

+7 −2
Original line number Diff line number Diff line
@@ -267,7 +267,8 @@ enum { SDI0, SDI1, SDI2, SDI3, SDO0, SDO1, SDO2, SDO3 }; 
#define RIRB_INT_MASK		0x05



/* STATESTS int mask: S3,SD2,SD1,SD0 */

#define AZX_MAX_CODECS		4

#define AZX_MAX_CODECS		8

#define AZX_DEFAULT_CODECS	4

#define STATESTS_INT_MASK	((1 << AZX_MAX_CODECS) - 1)



/* SD_CTL bits */
@@ -1367,6 +1368,7 @@ static void azx_bus_reset(struct hda_bus *bus) 


/* number of codec slots for each chipset: 0 = default slots (i.e. 4) */

static unsigned int azx_max_codecs[AZX_NUM_DRIVERS] __devinitdata = {

	[AZX_DRIVER_NVIDIA] = 8,

	[AZX_DRIVER_TERA] = 1,

};
@@ -1399,7 +1401,7 @@ static int __devinit azx_codec_create(struct azx *chip, const char *model) 
	codecs = 0;

	max_slots = azx_max_codecs[chip->driver_type];

	if (!max_slots)

		max_slots = AZX_MAX_CODECS;

		max_slots = AZX_DEFAULT_CODECS;



	/* First try to probe all given codec slots */

	for (c = 0; c < max_slots; c++) {
@@ -2263,10 +2265,12 @@ static int azx_dev_free(struct snd_device *device) 
static struct snd_pci_quirk position_fix_list[] __devinitdata = {

	SND_PCI_QUIRK(0x1028, 0x01cc, "Dell D820", POS_FIX_LPIB),

	SND_PCI_QUIRK(0x1028, 0x01de, "Dell Precision 390", POS_FIX_LPIB),

	SND_PCI_QUIRK(0x1028, 0x01f6, "Dell Latitude 131L", POS_FIX_LPIB),

	SND_PCI_QUIRK(0x103c, 0x306d, "HP dv3", POS_FIX_LPIB),

	SND_PCI_QUIRK(0x1106, 0x3288, "ASUS M2V-MX SE", POS_FIX_LPIB),

	SND_PCI_QUIRK(0x1043, 0x813d, "ASUS P5AD2", POS_FIX_LPIB),

	SND_PCI_QUIRK(0x1462, 0x1002, "MSI Wind U115", POS_FIX_LPIB),

	SND_PCI_QUIRK(0x1565, 0x820f, "Biostar Microtech", POS_FIX_LPIB),

	{}

};
@@ -2354,6 +2358,7 @@ static void __devinit check_probe_mask(struct azx *chip, int dev) 
static struct snd_pci_quirk msi_black_list[] __devinitdata = {

	SND_PCI_QUIRK(0x1043, 0x81f2, "ASUS", 0), /* Athlon64 X2 + nvidia */

	SND_PCI_QUIRK(0x1043, 0x81f6, "ASUS", 0), /* nvidia */

	SND_PCI_QUIRK(0x1849, 0x0888, "ASRock", 0), /* Athlon64 X2 + nvidia */

	{}

};