Skip to contentSkip to conversation

Patch "drm/i915: Always call to intel_display_set_init_power() in resume_early." has been added to the 4.14-stable tree

PATCH [email protected] 1 participant 1 message Mar 12, 2018

Subsystems (3)
lore
Share & tools
lore

[email protected]

author maintainer Applied
#0 lore raw

This is a note to let you know that I've just added the patch titled

drm/i915: Always call to intel_display_set_init_power() in resume_early.

to the 4.14-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
drm-i915-always-call-to-intel_display_set_init_power-in-resume_early.patch
and it can be found in the queue-4.14 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

Quoted 1 line

From d13a8479f3584613b6aacbb793eae64578b8f69a Mon Sep 17 00:00:00 2001

From: Maarten Lankhorst <[email protected]>
Date: Tue, 16 Jan 2018 16:53:24 +0100
Subject: drm/i915: Always call to intel_display_set_init_power() in resume_early.

From: Maarten Lankhorst <[email protected]>

commit d13a8479f3584613b6aacbb793eae64578b8f69a upstream.

intel_power_domains_init_hw() calls set_init_power, but when using runtime power management this call is skipped. This prevents hw readout from taking place.

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=104172

Fixes bc87229f323e ("drm/i915/skl: enable PC9/10 power states during suspend-to-idle")
Cc Nivedita Swaminathan <[email protected]>
Cc Imre Deak <[email protected]>
Cc Patrik Jakobsson <[email protected]>
Cc Jani Nikula <[email protected]>
Cc Joonas Lahtinen <[email protected]>
Cc Rodrigo Vivi <[email protected]>
Cc <[email protected]> # v4.5+
(cherry picked from commit ac25dfed15d470d7f23dd817e965b54aa3f94a1e)
---
 drivers/gpu/drm/i915/i915_drv.c |    2 ++
 1 file changed, 2 insertions(+)
drivers/gpu/drm/i915/i915_drv.c +2 -0
@@ -1806,6 +1806,8 @@ static int i915_drm_resume_early(struct
 	if (IS_GEN9_LP(dev_priv) ||
 	    !(dev_priv->suspended_to_idle && dev_priv->csr.dmc_payload))
 		intel_power_domains_init_hw(dev_priv, true);
+	else
+		intel_display_set_init_power(dev_priv, true);
 
 	i915_gem_sanitize(dev_priv);
 

Patches currently in stable-queue which might be from [email protected] are

queue-4.14/drm-i915-update-watermark-state-correctly-in-sanitize_watermarks.patch queue-4.14/drm-i915-always-call-to-intel_display_set_init_power-in-resume_early.patch