diff options
| author | Imre Deak <imre.deak@intel.com> | 2016-04-19 13:00:36 +0300 |
|---|---|---|
| committer | Imre Deak <imre.deak@intel.com> | 2016-04-21 19:34:56 +0300 |
| commit | 80dbe9973afc6be722bb6dbc1a303f3a7aaa3e1f (patch) | |
| tree | dd31e61fce4175aef89809ab2303bdb322bbfac8 /drivers/gpu/drm/i915 | |
| parent | 00983519214b61c1b9371ec2ed55a4dde773e384 (diff) | |
| download | op-kernel-dev-80dbe9973afc6be722bb6dbc1a303f3a7aaa3e1f.zip op-kernel-dev-80dbe9973afc6be722bb6dbc1a303f3a7aaa3e1f.tar.gz | |
drm/i915/kbl: Don't WARN for expected secondary MISC IO power well request
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@linux.intel.com>
Signed-off-by: Imre Deak <imre.deak@intel.com>
Reviewed-by: Patrik Jakobsson <patrik.jakobsson@linux.intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1461060036-19043-1-git-send-email-imre.deak@intel.com
Diffstat (limited to 'drivers/gpu/drm/i915')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_runtime_pm.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/intel_runtime_pm.c b/drivers/gpu/drm/i915/intel_runtime_pm.c index 06d14c4..9000383 100644 --- a/drivers/gpu/drm/i915/intel_runtime_pm.c +++ b/drivers/gpu/drm/i915/intel_runtime_pm.c @@ -626,7 +626,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 |
