[PATCH 19/23] drm/i915: Do not print DC off mismatch state when DMC firmware in not loaded
José Roberto de Souza
jose.souza at intel.com
Wed Sep 12 01:26:18 UTC 2018
When DMC firmware is not loaded, we return earlier in
gen9_dc_off_power_well_disable() as it will have no effect without
DMC. But is can cause intel_power_domains_verify_state() print
mismatch states errors, if running it with power domains enabled, so
skipping this error in this case.
Signed-off-by: José Roberto de Souza <jose.souza at intel.com>
---
drivers/gpu/drm/i915/intel_runtime_pm.c | 13 ++++++++++++-
1 file changed, 12 insertions(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/i915/intel_runtime_pm.c b/drivers/gpu/drm/i915/intel_runtime_pm.c
index 419eae7c9ba1..10c22ea26f0b 100644
--- a/drivers/gpu/drm/i915/intel_runtime_pm.c
+++ b/drivers/gpu/drm/i915/intel_runtime_pm.c
@@ -4006,11 +4006,22 @@ static void intel_power_domains_verify_state(struct drm_i915_private *dev_priv)
enabled = power_well->desc->ops->is_enabled(dev_priv,
power_well);
if ((power_well->count || power_well->desc->always_on) !=
- enabled)
+ enabled) {
+ /* If DMC firmware is not loaded it could cause a
+ * mismatch state as we can't disable DC off, so let's
+ * do not print any errors in this scenario.
+ */
+ if ((power_well->desc->domains &
+ BIT_ULL(POWER_DOMAIN_GT_IRQ))
+ && !dev_priv->csr.dmc_payload)
+ goto skip_state_mismatch_error;
+
DRM_ERROR("power well %s state mismatch (refcount %d/enabled %d)",
power_well->desc->name,
power_well->count, enabled);
+ }
+skip_state_mismatch_error:
domains_count = 0;
for_each_power_domain(domain, power_well->desc->domains)
domains_count += power_domains->domain_use_count[domain];
--
2.19.0
More information about the Intel-gfx-trybot
mailing list