Commit d4b05288 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'sound-4.6-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound 

Pull sound fixes from Takashi Iwai:
 "Again a relatively calm week without surprise: most of fixes are about
  HD-audio, including fixes for Cirrus codec regression and a race over
  regmap access.  Although both change are slightly unintuitive, the
  risk of further breakage is quite low, I hope.

  Other than that, all the rest are trivial"

* tag 'sound-4.6-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:
  ALSA: hda - Fix possible race on regmap bypass flip
  ALSA: pcxhr: Fix missing mutex unlock
  ALSA: hda - add PCI ID for Intel Broxton-T
  ALSA: hda - Keep powering up ADCs on Cirrus codecs
  ALSA: hda/realtek - Add ALC3234 headset mode for Optiplex 9020m
  ALSA - hda: hdmi check NULL pointer in hdmi_set_chmap
  ALSA: hda - Don't trust the reported actual power state
parents 5f44abd0 3194ed49

include/sound/hda_regmap.h

+2 −0
Original line number Diff line number Diff line
@@ -17,6 +17,8 @@ int snd_hdac_regmap_add_vendor_verb(struct hdac_device *codec, 
				    unsigned int verb);

int snd_hdac_regmap_read_raw(struct hdac_device *codec, unsigned int reg,

			     unsigned int *val);

int snd_hdac_regmap_read_raw_uncached(struct hdac_device *codec,

				      unsigned int reg, unsigned int *val);

int snd_hdac_regmap_write_raw(struct hdac_device *codec, unsigned int reg,

			      unsigned int val);

int snd_hdac_regmap_update_raw(struct hdac_device *codec, unsigned int reg,

sound/hda/hdac_device.c

+4 −6
Original line number Diff line number Diff line
@@ -299,13 +299,11 @@ EXPORT_SYMBOL_GPL(_snd_hdac_read_parm); 
int snd_hdac_read_parm_uncached(struct hdac_device *codec, hda_nid_t nid,

				int parm)

{

	int val;

	unsigned int cmd, val;



	if (codec->regmap)

		regcache_cache_bypass(codec->regmap, true);

	val = snd_hdac_read_parm(codec, nid, parm);

	if (codec->regmap)

		regcache_cache_bypass(codec->regmap, false);

	cmd = snd_hdac_regmap_encode_verb(nid, AC_VERB_PARAMETERS) | parm;

	if (snd_hdac_regmap_read_raw_uncached(codec, cmd, &val) < 0)

		return -1;

	return val;

}

EXPORT_SYMBOL_GPL(snd_hdac_read_parm_uncached);

sound/hda/hdac_regmap.c

+28 −12
Original line number Diff line number Diff line
@@ -453,14 +453,30 @@ int snd_hdac_regmap_write_raw(struct hdac_device *codec, unsigned int reg, 
EXPORT_SYMBOL_GPL(snd_hdac_regmap_write_raw);



static int reg_raw_read(struct hdac_device *codec, unsigned int reg,

			unsigned int *val)

			unsigned int *val, bool uncached)

{

	if (!codec->regmap)

	if (uncached || !codec->regmap)

		return hda_reg_read(codec, reg, val);

	else

		return regmap_read(codec->regmap, reg, val);

}



static int __snd_hdac_regmap_read_raw(struct hdac_device *codec,

				      unsigned int reg, unsigned int *val,

				      bool uncached)

{

	int err;



	err = reg_raw_read(codec, reg, val, uncached);

	if (err == -EAGAIN) {

		err = snd_hdac_power_up_pm(codec);

		if (!err)

			err = reg_raw_read(codec, reg, val, uncached);

		snd_hdac_power_down_pm(codec);

	}

	return err;

}



/**

 * snd_hdac_regmap_read_raw - read a pseudo register with power mgmt

 * @codec: the codec object
@@ -472,19 +488,19 @@ static int reg_raw_read(struct hdac_device *codec, unsigned int reg, 
int snd_hdac_regmap_read_raw(struct hdac_device *codec, unsigned int reg,

			     unsigned int *val)

{

	int err;



	err = reg_raw_read(codec, reg, val);

	if (err == -EAGAIN) {

		err = snd_hdac_power_up_pm(codec);

		if (!err)

			err = reg_raw_read(codec, reg, val);

		snd_hdac_power_down_pm(codec);

	}

	return err;

	return __snd_hdac_regmap_read_raw(codec, reg, val, false);

}

EXPORT_SYMBOL_GPL(snd_hdac_regmap_read_raw);



/* Works like snd_hdac_regmap_read_raw(), but this doesn't read from the

 * cache but always via hda verbs.

 */

int snd_hdac_regmap_read_raw_uncached(struct hdac_device *codec,

				      unsigned int reg, unsigned int *val)

{

	return __snd_hdac_regmap_read_raw(codec, reg, val, true);

}



/**

 * snd_hdac_regmap_update_raw - update a pseudo register with power mgmt

 * @codec: the codec object

sound/pci/hda/hda_generic.c

+4 −2
Original line number Diff line number Diff line
@@ -826,7 +826,7 @@ static hda_nid_t path_power_update(struct hda_codec *codec, 
				   bool allow_powerdown)

{

	hda_nid_t nid, changed = 0;

	int i, state;

	int i, state, power;



	for (i = 0; i < path->depth; i++) {

		nid = path->path[i];
@@ -838,7 +838,9 @@ static hda_nid_t path_power_update(struct hda_codec *codec, 
			state = AC_PWRST_D0;

		else

			state = AC_PWRST_D3;

		if (!snd_hda_check_power_state(codec, nid, state)) {

		power = snd_hda_codec_read(codec, nid, 0,

					   AC_VERB_GET_POWER_STATE, 0);

		if (power != (state | (state << 4))) {

			snd_hda_codec_write(codec, nid, 0,

					    AC_VERB_SET_POWER_STATE, state);

			changed = nid;

sound/pci/hda/hda_intel.c

+3 −0
Original line number Diff line number Diff line
@@ -2232,6 +2232,9 @@ static const struct pci_device_id azx_ids[] = { 
	/* Broxton-P(Apollolake) */

	{ PCI_DEVICE(0x8086, 0x5a98),

	  .driver_data = AZX_DRIVER_PCH | AZX_DCAPS_INTEL_BROXTON },

	/* Broxton-T */

	{ PCI_DEVICE(0x8086, 0x1a98),

	  .driver_data = AZX_DRIVER_PCH | AZX_DCAPS_INTEL_BROXTON },

	/* Haswell */

	{ PCI_DEVICE(0x8086, 0x0a0c),

	  .driver_data = AZX_DRIVER_HDMI | AZX_DCAPS_INTEL_HASWELL },

CRA Git | Maintained and supported by SUSTech CRA and CCSE