[PATCH 1/2] drm/i915: Skip forcewake_reset when resetting a single engine

[Michel Thierry]

It seems to affect innocent engines while reading their CSB events.

XXX: Explain why it isn't so important in single reset.

Signed-off-by: Michel Thierry <michel.thierry at intel.com>
---
 drivers/gpu/drm/i915/intel_uncore.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/i915/intel_uncore.c b/drivers/gpu/drm/i915/intel_uncore.c
index 1b433e363dce..0972fae5b416 100644
--- a/drivers/gpu/drm/i915/intel_uncore.c
+++ b/drivers/gpu/drm/i915/intel_uncore.c
@@ -1511,7 +1511,9 @@ static int gen6_reset_engines(struct drm_i915_private *dev_priv,
 
 	ret = gen6_hw_domain_reset(dev_priv, hw_mask);
 
-	intel_uncore_forcewake_reset(dev_priv, true);
+	/* this seems to affect innocent engines while doing an engine reset */
+	if (hw_mask & GEN6_GRDOM_FULL)
+		intel_uncore_forcewake_reset(dev_priv, true);
 
 	return ret;
 }
-- 
2.13.0