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

Web:        https://git.kernel.org/torvalds/c/d13a8479f3584613b6aacbb793eae64578b8f69a
Commit:     d13a8479f3584613b6aacbb793eae64578b8f69a
Parent:     61a669473f82cd5cac66146644b829b370c791ca
Refname:    refs/heads/master
Author:     Maarten Lankhorst <[email protected]>
AuthorDate: Tue Jan 16 16:53:24 2018 +0100
Committer:  Rodrigo Vivi <[email protected]>
CommitDate: Thu Feb 1 07:32:21 2018 -0800

    drm/i915: Always call to intel_display_set_init_power() in resume_early.
    
    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.
    
    Signed-off-by: Maarten Lankhorst <[email protected]>
    Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=104172
    Link: https://patchwork.freedesktop.org/patch/msgid/[email protected]
    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+
    Reviewed-by: Imre Deak <[email protected]>
    (cherry picked from commit ac25dfed15d470d7f23dd817e965b54aa3f94a1e)
    Signed-off-by: Rodrigo Vivi <[email protected]>
---
 drivers/gpu/drm/i915/i915_drv.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
index 6c8da9d20c33..173d0095e3b2 100644
--- a/drivers/gpu/drm/i915/i915_drv.c
+++ b/drivers/gpu/drm/i915/i915_drv.c
@@ -1842,6 +1842,8 @@ static int i915_drm_resume_early(struct drm_device *dev)
 	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);
 
--
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html