From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail.linuxfoundation.org ([140.211.169.12]:56748 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752136AbeCLPle (ORCPT ); Mon, 12 Mar 2018 11:41:34 -0400 Subject: Patch "drm/i915: Always call to intel_display_set_init_power() in resume_early." has been added to the 4.14-stable tree To: maarten.lankhorst@linux.intel.com, gregkh@linuxfoundation.org, imre.deak@intel.com, jani.nikula@linux.intel.com, joonas.lahtinen@linux.intel.com, nivedita.swaminathan@intel.com, patrik.jakobsson@linux.intel.com, rodrigo.vivi@intel.com, stable@vger.kernel.org Cc: , From: Date: Mon, 12 Mar 2018 16:41:00 +0100 Message-ID: <15208692605313@kroah.com> MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org List-ID: 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 know about it. >>From d13a8479f3584613b6aacbb793eae64578b8f69a Mon Sep 17 00:00:00 2001 From: Maarten Lankhorst 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 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. Signed-off-by: Maarten Lankhorst Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=104172 Link: https://patchwork.freedesktop.org/patch/msgid/20180116155324.75120-1-maarten.lankhorst@linux.intel.com Fixes: bc87229f323e ("drm/i915/skl: enable PC9/10 power states during suspend-to-idle") Cc: Nivedita Swaminathan Cc: Imre Deak Cc: Patrik Jakobsson Cc: Jani Nikula Cc: Joonas Lahtinen Cc: Rodrigo Vivi Cc: # v4.5+ Reviewed-by: Imre Deak (cherry picked from commit ac25dfed15d470d7f23dd817e965b54aa3f94a1e) Signed-off-by: Rodrigo Vivi Signed-off-by: Greg Kroah-Hartman --- drivers/gpu/drm/i915/i915_drv.c | 2 ++ 1 file changed, 2 insertions(+) --- a/drivers/gpu/drm/i915/i915_drv.c +++ b/drivers/gpu/drm/i915/i915_drv.c @@ -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 maarten.lankhorst@linux.intel.com 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