diff mbox

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

Message ID 20180116155324.75120-1-maarten.lankhorst@linux.intel.com (mailing list archive)
State New, archived
Headers show

Commit Message

Maarten Lankhorst Jan. 16, 2018, 3:53 p.m. UTC
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 <maarten.lankhorst@linux.intel.com>
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=104172
Cc: imre.deak@intel.com
---
 drivers/gpu/drm/i915/i915_drv.c | 2 ++
 1 file changed, 2 insertions(+)

Comments

Imre Deak Jan. 16, 2018, 4:44 p.m. UTC | #1
On Tue, Jan 16, 2018 at 04:53:24PM +0100, Maarten Lankhorst wrote:
> intel_power_domains_init_hw() calls set_init_power, but when using
> runtime power management this call is skipped.

It's skipped during suspend-to-idle. 

> This prevents hw readout from taking place.
> 
> Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
> Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=104172
> Cc: imre.deak@intel.com

Fixes: 4900727d35bb ("drm/i915/skl: enable PC9/10 power states during suspend-to-idle")

Thanks for following up on this,
Reviewed-by: Imre Deak <imre.deak@intel.com>

> ---
>  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 9cace8732dcf..4cecf5c01265 100644
> --- a/drivers/gpu/drm/i915/i915_drv.c
> +++ b/drivers/gpu/drm/i915/i915_drv.c
> @@ -1836,6 +1836,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);
>  
> -- 
> 2.15.1
>
Maarten Lankhorst Jan. 16, 2018, 6:02 p.m. UTC | #2
Op 16-01-18 om 17:44 schreef Imre Deak:
> On Tue, Jan 16, 2018 at 04:53:24PM +0100, Maarten Lankhorst wrote:
>> intel_power_domains_init_hw() calls set_init_power, but when using
>> runtime power management this call is skipped.
> It's skipped during suspend-to-idle. 
>
>> This prevents hw readout from taking place.
>>
>> Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
>> Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=104172
>> Cc: imre.deak@intel.com
> Fixes: 4900727d35bb ("drm/i915/skl: enable PC9/10 power states during suspend-to-idle")
>
> Thanks for following up on this,
> Reviewed-by: Imre Deak <imre.deak@intel.com>
Thanks, your commit id was wrong but pushed with the right $id. :)
diff mbox

Patch

diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
index 9cace8732dcf..4cecf5c01265 100644
--- a/drivers/gpu/drm/i915/i915_drv.c
+++ b/drivers/gpu/drm/i915/i915_drv.c
@@ -1836,6 +1836,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);