4.19-stable patches

added patches:
	alsa-ac97-fix-of-node-refcount-unbalance.patch
	alsa-hda-ca0132-make-pci_iounmap-call-conditional.patch
	alsa-x86-fix-runtime-pm-for-hdmi-lpe-audio.patch

diff --git a/queue-4.19/alsa-ac97-fix-of-node-refcount-unbalance.patch b/queue-4.19/alsa-ac97-fix-of-node-refcount-unbalance.patch
new file mode 100644 (file)
index 0000000..aac2f9c
--- /dev/null
+++ b/queue-4.19/alsa-ac97-fix-of-node-refcount-unbalance.patch
@@ -0,0 +1,35 @@
+From 31d2350d602511efc9ef626b848fe521233b0387 Mon Sep 17 00:00:00 2001
+From: Takashi Iwai <tiwai@suse.de>
+Date: Mon, 18 Feb 2019 14:38:06 +0100
+Subject: ALSA: ac97: Fix of-node refcount unbalance
+
+From: Takashi Iwai <tiwai@suse.de>
+
+commit 31d2350d602511efc9ef626b848fe521233b0387 upstream.
+
+ac97_of_get_child_device() take the refcount of the node explicitly
+via of_node_get(), but this leads to an unbalance.  The
+for_each_child_of_node() loop itself takes the refcount for each
+iteration node, hence you don't need to take the extra refcount
+again.
+
+Fixes: 2225a3e6af78 ("ALSA: ac97: add codecs devicetree binding")
+Reviewed-by: Robert Jarzmik <robert.jarzmik@free.fr>
+Signed-off-by: Takashi Iwai <tiwai@suse.de>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ sound/ac97/bus.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/sound/ac97/bus.c
++++ b/sound/ac97/bus.c
+@@ -84,7 +84,7 @@ ac97_of_get_child_device(struct ac97_con
+               if ((idx != of_property_read_u32(node, "reg", &reg)) ||
+                   !of_device_is_compatible(node, compat))
+                       continue;
+-              return of_node_get(node);
++              return node;
+       }
+ 
+       return NULL;

diff --git a/queue-4.19/alsa-hda-ca0132-make-pci_iounmap-call-conditional.patch b/queue-4.19/alsa-hda-ca0132-make-pci_iounmap-call-conditional.patch
new file mode 100644 (file)
index 0000000..ee99979
--- /dev/null
+++ b/queue-4.19/alsa-hda-ca0132-make-pci_iounmap-call-conditional.patch
@@ -0,0 +1,37 @@
+From 1e73359a24fad529b0794515b46cbfff99e5fbe6 Mon Sep 17 00:00:00 2001
+From: Arnd Bergmann <arnd@arndb.de>
+Date: Mon, 10 Dec 2018 21:54:25 +0100
+Subject: ALSA: hda/ca0132 - make pci_iounmap() call conditional
+
+From: Arnd Bergmann <arnd@arndb.de>
+
+commit 1e73359a24fad529b0794515b46cbfff99e5fbe6 upstream.
+
+When building without CONFIG_PCI, we can (depending on the architecture)
+get a link failure:
+
+ERROR: "pci_iounmap" [sound/pci/hda/snd-hda-codec-ca0132.ko] undefined!
+
+Adding a compile-time check for PCI gets it to work correctly on
+32-bit ARM.
+
+Fixes: d99501b8575d ("ALSA: hda/ca0132 - Call pci_iounmap() instead of iounmap()")
+Signed-off-by: Arnd Bergmann <arnd@arndb.de>
+Signed-off-by: Takashi Iwai <tiwai@suse.de>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ sound/pci/hda/patch_ca0132.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/sound/pci/hda/patch_ca0132.c
++++ b/sound/pci/hda/patch_ca0132.c
+@@ -7394,7 +7394,7 @@ static void ca0132_free(struct hda_codec
+       ca0132_exit_chip(codec);
+ 
+       snd_hda_power_down(codec);
+-      if (spec->mem_base)
++      if (IS_ENABLED(CONFIG_PCI) && spec->mem_base)
+               pci_iounmap(codec->bus->pci, spec->mem_base);
+       kfree(spec->spec_init_verbs);
+       kfree(codec->spec);

diff --git a/queue-4.19/alsa-x86-fix-runtime-pm-for-hdmi-lpe-audio.patch b/queue-4.19/alsa-x86-fix-runtime-pm-for-hdmi-lpe-audio.patch
new file mode 100644 (file)
index 0000000..34f687a
--- /dev/null
+++ b/queue-4.19/alsa-x86-fix-runtime-pm-for-hdmi-lpe-audio.patch
@@ -0,0 +1,43 @@
+From 8dfb839cfe737a17def8e5f88ee13c295230364a Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ville=20Syrj=C3=A4l=C3=A4?= <ville.syrjala@linux.intel.com>
+Date: Wed, 24 Oct 2018 18:48:24 +0300
+Subject: ALSA: x86: Fix runtime PM for hdmi-lpe-audio
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+From: Ville Syrjälä <ville.syrjala@linux.intel.com>
+
+commit 8dfb839cfe737a17def8e5f88ee13c295230364a upstream.
+
+Commit 46e831abe864 ("drm/i915/lpe: Mark LPE audio runtime pm as
+"no callbacks"") broke runtime PM with lpe audio. We can no longer
+runtime suspend the GPU since the sysfs  power/control for the
+lpe-audio device no longer exists and the device is considered
+always active. We can fix this by not marking the device as
+active.
+
+Cc: Chris Wilson <chris@chris-wilson.co.uk>
+Cc: Takashi Iwai <tiwai@suse.de>
+Cc: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
+Fixes: 46e831abe864 ("drm/i915/lpe: Mark LPE audio runtime pm as "no callbacks"")
+Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
+Link: https://patchwork.freedesktop.org/patch/msgid/20181024154825.18185-1-ville.syrjala@linux.intel.com
+Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
+Acked-by: Takashi Iwai <tiwai@suse.de>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ sound/x86/intel_hdmi_audio.c |    1 -
+ 1 file changed, 1 deletion(-)
+
+--- a/sound/x86/intel_hdmi_audio.c
++++ b/sound/x86/intel_hdmi_audio.c
+@@ -1900,7 +1900,6 @@ static int hdmi_lpe_audio_probe(struct p
+ 
+       pm_runtime_use_autosuspend(&pdev->dev);
+       pm_runtime_mark_last_busy(&pdev->dev);
+-      pm_runtime_set_active(&pdev->dev);
+ 
+       dev_dbg(&pdev->dev, "%s: handle pending notification\n", __func__);
+       for_each_port(card_ctx, port) {

diff --git a/queue-4.19/series b/queue-4.19/series
index b0f9cb020b7d2237dfc16ca6cc7eb53e10b9911d..40c11132157df99ad1a7009a78bf40b0baf8b249 100644 (file)
--- a/queue-4.19/series
+++ b/queue-4.19/series
@@ -20,3 +20,6 @@ perf-probe-fix-getting-the-kernel-map.patch
 objtool-move-objtool_file-struct-off-the-stack.patch
 irqchip-gic-v3-its-fix-comparison-logic-in-lpi_range_cmp.patch
 smb3-fix-smb3.1.1-guest-mounts-to-samba.patch
+alsa-x86-fix-runtime-pm-for-hdmi-lpe-audio.patch
+alsa-hda-ca0132-make-pci_iounmap-call-conditional.patch
+alsa-ac97-fix-of-node-refcount-unbalance.patch