sound fixes for 3.16-rc6
Subsystems (2)
Linus,
please pull sound fixes for v3.16-rc6 from:
git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git tags/sound-3.16-rc6
The topmost commit is 4da63c6fc426023d1a20e45508c47d7d68c6a53d
----------------------------------------------------------------
sound fixes for 3.16-rc6
Things seem to calm down so far, just a small few HD-audio fixes (regression fixes and a new codec ID addition) popping up.
----------------------------------------------------------------
Aaron Plattner (1):
ALSA: hda - Add new GPU codec ID 0x10de0070 to snd-hda
Takashi Iwai (2):
ALSA: hda - Revert stream assignment order for Intel controllers
ALSA: hda - Fix broken PM due to incomplete i915 initialization
Thierry Reding (1):
ALSA: hda: Fix build warning
--- sound/pci/hda/hda_controller.c | 3 ++- sound/pci/hda/hda_intel.c | 12 ++++++------ sound/pci/hda/hda_priv.h | 1 + sound/pci/hda/hda_tegra.c | 2 +- sound/pci/hda/patch_hdmi.c | 2 ++ 5 files changed, 12 insertions(+), 8 deletions(-)
sound/pci/hda/hda_controller.c +2 -1
@@ -193,7 +193,8 @@ azx_assign_device(struct azx *chip, struct snd_pcm_substream *substream)dsp_unlock (azx_dev);return azx_dev; } -if (!res) +if (!res || + (chip->driver_caps &AZX_DCAPS_REVERSE_ASSIGN )) res = azx_dev; }dsp_unlock (azx_dev);
sound/pci/hda/hda_intel.c +6 -6
@@ -227,7 +227,7 @@ enum {/* quirks for Intel PCH */ #define AZX_DCAPS_INTEL_PCH_NOPM \ (AZX_DCAPS_SCH_SNOOP | AZX_DCAPS_BUFSIZE | \ - AZX_DCAPS_COUNT_LPIB_DELAY) + AZX_DCAPS_COUNT_LPIB_DELAY | AZX_DCAPS_REVERSE_ASSIGN)#define AZX_DCAPS_INTEL_PCH \ (AZX_DCAPS_INTEL_PCH_NOPM | AZX_DCAPS_PM_RUNTIME)
@@ -596,7 +596,7 @@ static int azx_suspend(struct device *dev)struct azx *chip = card->private_data;struct azx_pcm *p; -if (chip->disabled) +if (chip->disabled || chip->init_failed)return 0 ;snd_power_change_state (card, SNDRV_CTL_POWER_D3hot);
@@ -628,7 +628,7 @@ static int azx_resume(struct device *dev)struct snd_card *card =dev_get_drvdata (dev);struct azx *chip = card->private_data; -if (chip->disabled) +if (chip->disabled || chip->init_failed)return 0 ;if (chip->driver_caps &AZX_DCAPS_I915_POWERWELL ) {
@@ -665,7 +665,7 @@ static int azx_runtime_suspend(struct device *dev)struct snd_card *card =dev_get_drvdata (dev);struct azx *chip = card->private_data; -if (chip->disabled) +if (chip->disabled || chip->init_failed)return 0 ;if (!(chip->driver_caps &AZX_DCAPS_PM_RUNTIME ))
@@ -692,7 +692,7 @@ static int azx_runtime_resume(struct device *dev)struct hda_codec *codec;int status; -if (chip->disabled) +if (chip->disabled || chip->init_failed)return 0 ;if (!(chip->driver_caps &AZX_DCAPS_PM_RUNTIME ))
@@ -729,7 +729,7 @@ static int azx_runtime_idle(struct device *dev)struct snd_card *card =dev_get_drvdata (dev);struct azx *chip = card->private_data; -if (chip->disabled) +if (chip->disabled || chip->init_failed)return 0 ; if (!power_save_controller ||
sound/pci/hda/hda_priv.h +1 -0
@@ -186,6 +186,7 @@ enum { SDI0, SDI1, SDI2, SDI3, SDO0, SDO1, SDO2, SDO3 };#define AZX_DCAPS_BUFSIZE (1 << 21)/* no buffer size alignment */ #define AZX_DCAPS_ALIGN_BUFSIZE (1 << 22)/* buffer size alignment */ #define AZX_DCAPS_4K_BDLE_BOUNDARY (1 << 23)/* BDLE in 4k boundary */ +#define AZX_DCAPS_REVERSE_ASSIGN (1 << 24)/* Assign devices in reverse order */ #define AZX_DCAPS_COUNT_LPIB_DELAY (1 << 25)/* Take LPIB as delay */ #define AZX_DCAPS_PM_RUNTIME (1 << 26)/* runtime PM support */ #define AZX_DCAPS_I915_POWERWELL (1 << 27)/* HSW i915 powerwell support */
sound/pci/hda/hda_tegra.c +1 -1
@@ -236,6 +236,7 @@ disable_hda:return rc; } +#ifdef CONFIG_PM_SLEEP static void hda_tegra_disable_clocks (struct hda_tegra *data) {clk_disable_unprepare (data->hda2hdmi_clk);
@@ -243,7 +244,6 @@ static void hda_tegra_disable_clocks(struct hda_tegra *data)clk_disable_unprepare (data->hda_clk); } -#ifdef CONFIG_PM_SLEEP /* * power management */
sound/pci/hda/patch_hdmi.c +2 -0
@@ -3337,6 +3337,7 @@ static const struct hda_codec_preset snd_hda_preset_hdmi[] = { { .id = 0x10de0051, .name = "GPU 51 HDMI/DP", .patch = patch_nvhdmi }, { .id = 0x10de0060, .name = "GPU 60 HDMI/DP", .patch = patch_nvhdmi }, { .id = 0x10de0067, .name = "MCP67 HDMI", .patch = patch_nvhdmi_2ch }, +{ .id = 0x10de0070, .name = "GPU 70 HDMI/DP", .patch = patch_nvhdmi }, { .id = 0x10de0071, .name = "GPU 71 HDMI/DP", .patch = patch_nvhdmi }, { .id = 0x10de8001, .name = "MCP73 HDMI", .patch = patch_nvhdmi_2ch }, { .id = 0x11069f80, .name = "VX900 HDMI/DP", .patch = patch_via_hdmi },
@@ -3394,6 +3395,7 @@ MODULE_ALIAS("snd-hda-codec-id:10de0044");MODULE_ALIAS ("snd-hda-codec-id:10de0051" );MODULE_ALIAS ("snd-hda-codec-id:10de0060" );MODULE_ALIAS ("snd-hda-codec-id:10de0067" ); +MODULE_ALIAS ("snd-hda-codec-id:10de0070" );MODULE_ALIAS ("snd-hda-codec-id:10de0071" );MODULE_ALIAS ("snd-hda-codec-id:10de8001" );MODULE_ALIAS ("snd-hda-codec-id:11069f80" );