drm/i915/tgl: Keep forcewake always for now

Submitted by Mika Kuoppala on Sept. 10, 2019, 11:35 a.m.

Details

Message ID 20190910113547.7656-1-mika.kuoppala@linux.intel.com
State New
Headers show
Series "drm/i915/tgl: Keep forcewake always for now" ( rev: 1 ) in Intel GFX

Not browsing as part of any series.

Commit Message

Mika Kuoppala Sept. 10, 2019, 11:35 a.m.
Forcewake handling is a prime suspect now. Keep ref
always on tgl to test the theory and reveal the coverage.

Testcase: igt/gem_sync
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Suggested-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Mika Kuoppala <mika.kuoppala@linux.intel.com>
---
 drivers/gpu/drm/i915/i915_gem.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

Patch hide | download patch | download mbox

diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
index 141024c66f36..2ab970b4d534 100644
--- a/drivers/gpu/drm/i915/i915_gem.c
+++ b/drivers/gpu/drm/i915/i915_gem.c
@@ -1144,7 +1144,10 @@  void i915_gem_sanitize(struct drm_i915_private *i915)
 	 */
 	intel_gt_sanitize(&i915->gt, false);
 
-	intel_uncore_forcewake_put(&i915->uncore, FORCEWAKE_ALL);
+	/* XXX Forcewake handling is a prime suspect now */
+	if (INTEL_GEN(i915) < 12)
+		intel_uncore_forcewake_put(&i915->uncore, FORCEWAKE_ALL);
+
 	intel_runtime_pm_put(&i915->runtime_pm, wakeref);
 }
 

Comments

Quoting Mika Kuoppala (2019-09-10 12:35:47)
> Forcewake handling is a prime suspect now. Keep ref
> always on tgl to test the theory and reveal the coverage.
> 
> Testcase: igt/gem_sync
> Cc: Chris Wilson <chris@chris-wilson.co.uk>
> Suggested-by: Chris Wilson <chris@chris-wilson.co.uk>
> Signed-off-by: Mika Kuoppala <mika.kuoppala@linux.intel.com>

Gets us as far as reload, before we hit the WARN for the unbalanced
forcewake.

Seems like a worthwhile approach if we can refine it slightly.
-Chris