From: Sagar Arun Kamble <sagar.a.kamble@xxxxxxxxx> intel_runtime_suspend failed with warning if RPS was disabled. With SLPC enabled, RPS is disabled. With SLPC, warning is now changed to consider SLPC active status as well. This will ensure runtime suspend proceeds when SLPC enabled. v2: Commit message update. (Tom) Signed-off-by: Sagar Arun Kamble <sagar.a.kamble@xxxxxxxxx> Signed-off-by: Tom O'Rourke <Tom.O'Rourke@xxxxxxxxx> --- drivers/gpu/drm/i915/i915_drv.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c index cc22fa0..00a2713 100644 --- a/drivers/gpu/drm/i915/i915_drv.c +++ b/drivers/gpu/drm/i915/i915_drv.c @@ -1474,7 +1474,8 @@ static int intel_runtime_suspend(struct device *device) struct drm_i915_private *dev_priv = dev->dev_private; int ret; - if (WARN_ON_ONCE(!(dev_priv->rps.enabled && intel_enable_rc6(dev)))) + if (WARN_ON_ONCE(!((dev_priv->rps.enabled || intel_slpc_active(dev)) && + intel_enable_rc6(dev)))) return -ENODEV; if (WARN_ON_ONCE(!HAS_RUNTIME_PM(dev))) -- 1.9.1 _______________________________________________ Intel-gfx mailing list Intel-gfx@xxxxxxxxxxxxxxxxxxxxx https://lists.freedesktop.org/mailman/listinfo/intel-gfx
