From: Greg Kroah-Hartman Date: Mon, 25 Mar 2019 19:53:01 +0000 (+0900) Subject: 4.14-stable patches X-Git-Tag: v4.9.166~35 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=881d96e3fc6535554c7ecc6184571b9eee46312e;p=thirdparty%2Fkernel%2Fstable-queue.git 4.14-stable patches added patches: alsa-x86-fix-runtime-pm-for-hdmi-lpe-audio.patch --- diff --git a/queue-4.14/alsa-x86-fix-runtime-pm-for-hdmi-lpe-audio.patch b/queue-4.14/alsa-x86-fix-runtime-pm-for-hdmi-lpe-audio.patch new file mode 100644 index 00000000000..5615076567e --- /dev/null +++ b/queue-4.14/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?= +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ä + +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 +Cc: Takashi Iwai +Cc: Pierre-Louis Bossart +Fixes: 46e831abe864 ("drm/i915/lpe: Mark LPE audio runtime pm as "no callbacks"") +Signed-off-by: Ville Syrjälä +Link: https://patchwork.freedesktop.org/patch/msgid/20181024154825.18185-1-ville.syrjala@linux.intel.com +Reviewed-by: Chris Wilson +Acked-by: Takashi Iwai +Signed-off-by: Greg Kroah-Hartman + +--- + 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 +@@ -1887,7 +1887,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.14/series b/queue-4.14/series index 47b2c905440..669fd6e1453 100644 --- a/queue-4.14/series +++ b/queue-4.14/series @@ -11,3 +11,4 @@ scsi-ibmvscsi-fix-empty-event-pool-access-during-host-removal.patch futex-ensure-that-futex-address-is-aligned-in-handle_futex_death.patch perf-probe-fix-getting-the-kernel-map.patch objtool-move-objtool_file-struct-off-the-stack.patch +alsa-x86-fix-runtime-pm-for-hdmi-lpe-audio.patch