From aeab92e264d4083864733e6013245257ac28aec1 Mon Sep 17 00:00:00 2001 From: Chris Wilson Date: Fri, 15 Nov 2019 11:48:00 +0000 Subject: [PATCH] drm/i915/gt: Use gt locals for accessing rc6 RC6 is tracked underneath the intel_gt, so use our local pointers. Signed-off-by: Chris Wilson Cc: Tvrtko Ursulin Cc: Andi Shyti Reviewed-by: Tvrtko Ursulin Acked-by: Andi Shyti Link: https://patchwork.freedesktop.org/patch/msgid/20191115114800.725061-1-chris@chris-wilson.co.uk --- drivers/gpu/drm/i915/gt/intel_gt_pm.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/i915/gt/intel_gt_pm.c b/drivers/gpu/drm/i915/gt/intel_gt_pm.c index 6187cdd..e61f752 100644 --- a/drivers/gpu/drm/i915/gt/intel_gt_pm.c +++ b/drivers/gpu/drm/i915/gt/intel_gt_pm.c @@ -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(>->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(>->rc6); + intel_uncore_forcewake_put(gt->uncore, FORCEWAKE_ALL); } GEM_BUG_ON(!wakeref); -- 2.7.4