projects / thirdparty / kernel / stable-queue.git / blame
| Commit | Line | Data |
|---|---|---|
| 881d96e3 GKH |
1 | From 8dfb839cfe737a17def8e5f88ee13c295230364a Mon Sep 17 00:00:00 2001 |
| 2 | From: =?UTF-8?q?Ville=20Syrj=C3=A4l=C3=A4?= <ville.syrjala@linux.intel.com> | |
| 3 | Date: Wed, 24 Oct 2018 18:48:24 +0300 | |
| 4 | Subject: ALSA: x86: Fix runtime PM for hdmi-lpe-audio | |
| 5 | MIME-Version: 1.0 | |
| 6 | Content-Type: text/plain; charset=UTF-8 | |
| 7 | Content-Transfer-Encoding: 8bit | |
| 8 | ||
| 9 | From: Ville Syrjälä <ville.syrjala@linux.intel.com> | |
| 10 | ||
| 11 | commit 8dfb839cfe737a17def8e5f88ee13c295230364a upstream. | |
| 12 | ||
| 13 | Commit 46e831abe864 ("drm/i915/lpe: Mark LPE audio runtime pm as | |
| 14 | "no callbacks"") broke runtime PM with lpe audio. We can no longer | |
| 15 | runtime suspend the GPU since the sysfs power/control for the | |
| 16 | lpe-audio device no longer exists and the device is considered | |
| 17 | always active. We can fix this by not marking the device as | |
| 18 | active. | |
| 19 | ||
| 20 | Cc: Chris Wilson <chris@chris-wilson.co.uk> | |
| 21 | Cc: Takashi Iwai <tiwai@suse.de> | |
| 22 | Cc: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com> | |
| 23 | Fixes: 46e831abe864 ("drm/i915/lpe: Mark LPE audio runtime pm as "no callbacks"") | |
| 24 | Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com> | |
| 25 | Link: https://patchwork.freedesktop.org/patch/msgid/20181024154825.18185-1-ville.syrjala@linux.intel.com | |
| 26 | Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk> | |
| 27 | Acked-by: Takashi Iwai <tiwai@suse.de> | |
| 28 | Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> | |
| 29 | ||
| 30 | --- | |
| 31 | sound/x86/intel_hdmi_audio.c | 1 - | |
| 32 | 1 file changed, 1 deletion(-) | |
| 33 | ||
| 34 | --- a/sound/x86/intel_hdmi_audio.c | |
| 35 | +++ b/sound/x86/intel_hdmi_audio.c | |
| 36 | @@ -1887,7 +1887,6 @@ static int hdmi_lpe_audio_probe(struct p | |
| 37 | ||
| 38 | pm_runtime_use_autosuspend(&pdev->dev); | |
| 39 | pm_runtime_mark_last_busy(&pdev->dev); | |
| 40 | - pm_runtime_set_active(&pdev->dev); | |
| 41 | ||
| 42 | dev_dbg(&pdev->dev, "%s: handle pending notification\n", __func__); | |
| 43 | for_each_port(card_ctx, port) { |