From dce1f036814feddbc6a9ce10714edb676e29c69c Mon Sep 17 00:00:00 2001 From: Mika Kuoppala Date: Tue, 3 Feb 2015 18:51:06 +0200 Subject: [PATCH] drm/i915: Squelch overzealous uncore reset WARN_ON We added this WARN_ON to guard against using uninitialized forcewake domains. But forgot blissfully that not all gens have forcewake domains in the first place. Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=88911 Signed-off-by: Mika Kuoppala --- drivers/gpu/drm/i915/intel_uncore.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/gpu/drm/i915/intel_uncore.c b/drivers/gpu/drm/i915/intel_uncore.c index 76b60a3..bbee962 100644 --- a/drivers/gpu/drm/i915/intel_uncore.c +++ b/drivers/gpu/drm/i915/intel_uncore.c @@ -166,6 +166,9 @@ fw_domains_reset(struct drm_i915_private *dev_priv, enum forcewake_domains fw_do struct intel_uncore_forcewake_domain *d; enum forcewake_domain_id id; + if (INTEL_INFO(dev_priv->dev)->gen <= 5) + return; + WARN_ON(dev_priv->uncore.fw_domains == 0); for_each_fw_domain_mask(d, fw_domains, dev_priv, id) -- 1.9.1