UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

drm/i915/gt: Use soft-rc6 for w/a protection 

Now that we have soft-rc6 in place, we can use that instead of the
forcewake to disable rc6 while active; preferred by a few
microbenchmarks.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Andi Shyti <andi.shyti@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20191202110836.2342685-1-chris@chris-wilson.co.uk
This commit is contained in:
Chris Wilson 2019-12-02 11:08:35 +00:00
parent 98cf5c9a48
commit 61e258ee33
3 changed files with 13 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/gpu/drm/i915/gt/intel_gt_pm.c
View File

@ -61,9 +61,6 @@ static int __gt_unpark(struct intel_wakeref *wf)
gt->awake = intel_display_power_get(i915, POWER_DOMAIN_GT_IRQ); gt->awake = intel_display_power_get(i915, POWER_DOMAIN_GT_IRQ);
GEM_BUG_ON(!gt->awake); GEM_BUG_ON(!gt->awake);
if (NEEDS_RC6_CTX_CORRUPTION_WA(i915))
intel_uncore_forcewake_get(gt->uncore, FORCEWAKE_ALL);
intel_rc6_unpark(&gt->rc6); intel_rc6_unpark(&gt->rc6);
intel_rps_unpark(&gt->rps); intel_rps_unpark(&gt->rps);
i915_pmu_gt_unparked(i915); i915_pmu_gt_unparked(i915);
@ -91,11 +88,6 @@ static int __gt_park(struct intel_wakeref *wf)
/* Everything switched off, flush any residual interrupt just in case */ /* Everything switched off, flush any residual interrupt just in case */
intel_synchronize_irq(i915); intel_synchronize_irq(i915);
if (NEEDS_RC6_CTX_CORRUPTION_WA(i915)) {
intel_rc6_ctx_wa_check(&gt->rc6);
intel_uncore_forcewake_put(gt->uncore, FORCEWAKE_ALL);
}
GEM_BUG_ON(!wakeref); GEM_BUG_ON(!wakeref);
intel_display_power_put(i915, POWER_DOMAIN_GT_IRQ, wakeref); intel_display_power_put(i915, POWER_DOMAIN_GT_IRQ, wakeref);

19
drivers/gpu/drm/i915/gt/intel_rc6.c
View File

@ -527,26 +527,25 @@ void intel_rc6_ctx_wa_resume(struct intel_rc6 *rc6)
* Check if an RC6 CTX corruption has happened since the last check and if so * Check if an RC6 CTX corruption has happened since the last check and if so
* disable RC6 and runtime power management. * disable RC6 and runtime power management.
*/ */
void intel_rc6_ctx_wa_check(struct intel_rc6 *rc6) static bool intel_rc6_ctx_wa_check(struct intel_rc6 *rc6)
{ {
struct drm_i915_private *i915 = rc6_to_i915(rc6); struct drm_i915_private *i915 = rc6_to_i915(rc6);
if (!NEEDS_RC6_CTX_CORRUPTION_WA(i915)) if (!NEEDS_RC6_CTX_CORRUPTION_WA(i915))
return; return false;
if (rc6->ctx_corrupted) if (rc6->ctx_corrupted)
return; return false;
if (!intel_rc6_ctx_corrupted(rc6)) if (!intel_rc6_ctx_corrupted(rc6))
return; return false;
dev_notice(i915->drm.dev, dev_notice(i915->drm.dev,
"RC6 context corruption, disabling runtime power management\n"); "RC6 context corruption, disabling runtime power management\n");
intel_rc6_disable(rc6);
rc6->ctx_corrupted = true; rc6->ctx_corrupted = true;
return; return true;
} }
static void __intel_rc6_disable(struct intel_rc6 *rc6) static void __intel_rc6_disable(struct intel_rc6 *rc6)
@ -627,6 +626,9 @@ void intel_rc6_enable(struct intel_rc6 *rc6)
else if (INTEL_GEN(i915) >= 6) else if (INTEL_GEN(i915) >= 6)
gen6_rc6_enable(rc6); gen6_rc6_enable(rc6);
if (NEEDS_RC6_CTX_CORRUPTION_WA(i915))
rc6->ctl_enable = 0;
intel_uncore_forcewake_put(uncore, FORCEWAKE_ALL); intel_uncore_forcewake_put(uncore, FORCEWAKE_ALL);
/* rc6 is ready, runtime-pm is go! */ /* rc6 is ready, runtime-pm is go! */
@ -652,6 +654,11 @@ void intel_rc6_park(struct intel_rc6 *rc6)
if (!rc6->enabled) if (!rc6->enabled)
return; return;
if (unlikely(intel_rc6_ctx_wa_check(rc6))) {
intel_rc6_disable(rc6);
return;
}
/* Turn off the HW timers and go directly to rc6 */ /* Turn off the HW timers and go directly to rc6 */
set(uncore, GEN6_RC_CONTROL, GEN6_RC_CTL_RC6_ENABLE); set(uncore, GEN6_RC_CONTROL, GEN6_RC_CTL_RC6_ENABLE);
set(uncore, GEN6_RC_STATE, 0x4 << RC_SW_TARGET_STATE_SHIFT); set(uncore, GEN6_RC_STATE, 0x4 << RC_SW_TARGET_STATE_SHIFT);

1
drivers/gpu/drm/i915/gt/intel_rc6.h
View File

@ -25,7 +25,6 @@ void intel_rc6_disable(struct intel_rc6 *rc6);
u64 intel_rc6_residency_ns(struct intel_rc6 *rc6, i915_reg_t reg); u64 intel_rc6_residency_ns(struct intel_rc6 *rc6, i915_reg_t reg);
u64 intel_rc6_residency_us(struct intel_rc6 *rc6, i915_reg_t reg); u64 intel_rc6_residency_us(struct intel_rc6 *rc6, i915_reg_t reg);
void intel_rc6_ctx_wa_check(struct intel_rc6 *rc6);
void intel_rc6_ctx_wa_resume(struct intel_rc6 *rc6); void intel_rc6_ctx_wa_resume(struct intel_rc6 *rc6);
#endif /* INTEL_RC6_H */ #endif /* INTEL_RC6_H */