Commit aeab92e2 authored by Chris Wilson's avatar Chris Wilson
Browse files

drm/i915/gt: Use gt locals for accessing rc6



RC6 is tracked underneath the intel_gt, so use our local pointers.

Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Cc: Tvrtko Ursulin <tvrtko.ursulin@linux.intel.com>
Cc: Andi Shyti <andi.shyti@intel.com>
Reviewed-by: default avatarTvrtko Ursulin <tvrtko.ursulin@intel.com>
Acked-by: default avatarAndi Shyti <andi.shyti@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20191115114800.725061-1-chris@chris-wilson.co.uk
parent 90eb7d2a
Loading
Loading
Loading
Loading
+3 −3
Original line number Diff line number Diff line
@@ -62,7 +62,7 @@ static int __gt_unpark(struct intel_wakeref *wf)
	GEM_BUG_ON(!gt->awake);

	if (NEEDS_RC6_CTX_CORRUPTION_WA(i915))
		intel_uncore_forcewake_get(&i915->uncore, FORCEWAKE_ALL);
		intel_uncore_forcewake_get(gt->uncore, FORCEWAKE_ALL);

	intel_rps_unpark(&gt->rps);
	i915_pmu_gt_unparked(i915);
@@ -90,8 +90,8 @@ static int __gt_park(struct intel_wakeref *wf)
	intel_synchronize_irq(i915);

	if (NEEDS_RC6_CTX_CORRUPTION_WA(i915)) {
		intel_rc6_ctx_wa_check(&i915->gt.rc6);
		intel_uncore_forcewake_put(&i915->uncore, FORCEWAKE_ALL);
		intel_rc6_ctx_wa_check(&gt->rc6);
		intel_uncore_forcewake_put(gt->uncore, FORCEWAKE_ALL);
	}

	GEM_BUG_ON(!wakeref);