[Intel-gfx] [PATCH] drm/i915/kbl: Don't WARN for expected secondary MISC IO power well request

[Patrik Jakobsson]

On Tue, Apr 19, 2016 at 01:00:36PM +0300, Imre Deak wrote:
> In commit 5f304c873634 ("drm/i915/kbl: Reset secondary power well requests
> left on by DMC/KVMR") I forgot about the fact that SKL==KBL most of the
> time and that a secondary MISC IO power well request left on by the DMC is
> "expected". Tune down the corresponding WARN to be a debug message. This
> was caught by CI suspend tests.
> 
> CC: Patrik Jakobsson <patrik.jakobsson at linux.intel.com>
> Signed-off-by: Imre Deak <imre.deak at intel.com>

Was just about to bug you about this. You're one step ahead of me :)

Reviewed-by: Patrik Jakobsson <patrik.jakobsson at linux.intel.com>

> ---
>  drivers/gpu/drm/i915/intel_runtime_pm.c | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/gpu/drm/i915/intel_runtime_pm.c b/drivers/gpu/drm/i915/intel_runtime_pm.c
> index 0ed3ec8..56df7ff 100644
> --- a/drivers/gpu/drm/i915/intel_runtime_pm.c
> +++ b/drivers/gpu/drm/i915/intel_runtime_pm.c
> @@ -635,7 +635,8 @@ gen9_sanitize_power_well_requests(struct drm_i915_private *dev_priv,
>  	 * other request bits to be set, so WARN for those.
>  	 */
>  	if (power_well_id == SKL_DISP_PW_1 ||
> -	    (IS_SKYLAKE(dev_priv) && power_well_id == SKL_DISP_PW_MISC_IO))
> +	    ((IS_SKYLAKE(dev_priv) || IS_KABYLAKE(dev_priv)) &&
> +	     power_well_id == SKL_DISP_PW_MISC_IO))
>  		DRM_DEBUG_DRIVER("Clearing auxiliary requests for %s forced on "
>  				 "by DMC\n", power_well->name);
>  	else
> -- 
> 2.5.0
> 

-- 
Intel Sweden AB Registered Office: Knarrarnasgatan 15, 164 40 Kista, Stockholm, Sweden Registration Number: 556189-6027