drm/i915/gt: Simplify rc6 w/a application

Quite simply we only need to check for prior corruption on enabling rc6
on module load and resume, so by hooking into the common entry points.

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-2-chris@chris-wilson.co.uk

diff --git a/drivers/gpu/drm/i915/gt/intel_rc6.c b/drivers/gpu/drm/i915/gt/intel_rc6.c
index f58674f..4dc8219 100644 (file)
--- a/drivers/gpu/drm/i915/gt/intel_rc6.c
+++ b/drivers/gpu/drm/i915/gt/intel_rc6.c
@@ -488,63 +488,18 @@ static void rpm_put(struct intel_rc6 *rc6)
        rc6->wakeref = false;
 }
 
-static bool intel_rc6_ctx_corrupted(struct intel_rc6 *rc6)
-{
-       return !intel_uncore_read(rc6_to_uncore(rc6), GEN8_RC6_CTX_INFO);
-}
-
-static void intel_rc6_ctx_wa_init(struct intel_rc6 *rc6)
-{
-       struct drm_i915_private *i915 = rc6_to_i915(rc6);
-
-       if (!NEEDS_RC6_CTX_CORRUPTION_WA(i915))
-               return;
-
-       if (intel_rc6_ctx_corrupted(rc6)) {
-               DRM_INFO("RC6 context corrupted, disabling runtime power management\n");
-               rc6->ctx_corrupted = true;
-       }
-}
-
-/**
- * intel_rc6_ctx_wa_resume - system resume sequence for the RC6 CTX WA
- * @rc6: rc6 state
- *
- * Perform any steps needed to re-init the RC6 CTX WA after system resume.
- */
-void intel_rc6_ctx_wa_resume(struct intel_rc6 *rc6)
-{
-       if (rc6->ctx_corrupted && !intel_rc6_ctx_corrupted(rc6)) {
-               DRM_INFO("RC6 context restored, re-enabling runtime power management\n");
-               rc6->ctx_corrupted = false;
-       }
-}
-
-/**
- * intel_rc6_ctx_wa_check - check for a new RC6 CTX corruption
- * @rc6: rc6 state
- *
- * Check if an RC6 CTX corruption has happened since the last check and if so
- * disable RC6 and runtime power management.
-*/
-static bool intel_rc6_ctx_wa_check(struct intel_rc6 *rc6)
+static bool pctx_corrupted(struct intel_rc6 *rc6)
 {
        struct drm_i915_private *i915 = rc6_to_i915(rc6);
 
        if (!NEEDS_RC6_CTX_CORRUPTION_WA(i915))
                return false;
 
-       if (rc6->ctx_corrupted)
-               return false;
-
-       if (!intel_rc6_ctx_corrupted(rc6))
+       if (intel_uncore_read(rc6_to_uncore(rc6), GEN8_RC6_CTX_INFO))
                return false;
 
        dev_notice(i915->drm.dev,
                   "RC6 context corruption, disabling runtime power management\n");
-
-       rc6->ctx_corrupted = true;
-
        return true;
 }
 
@@ -572,8 +527,6 @@ void intel_rc6_init(struct intel_rc6 *rc6)
        if (!rc6_supported(rc6))
                return;
 
-       intel_rc6_ctx_wa_init(rc6);
-
        if (IS_CHERRYVIEW(i915))
                err = chv_rc6_init(rc6);
        else if (IS_VALLEYVIEW(i915))
@@ -608,9 +561,6 @@ void intel_rc6_enable(struct intel_rc6 *rc6)
 
        GEM_BUG_ON(rc6->enabled);
 
-       if (rc6->ctx_corrupted)
-               return;
-
        intel_uncore_forcewake_get(uncore, FORCEWAKE_ALL);
 
        if (IS_CHERRYVIEW(i915))
@@ -631,6 +581,9 @@ void intel_rc6_enable(struct intel_rc6 *rc6)
 
        intel_uncore_forcewake_put(uncore, FORCEWAKE_ALL);
 
+       if (unlikely(pctx_corrupted(rc6)))
+               return;
+
        /* rc6 is ready, runtime-pm is go! */
        rpm_put(rc6);
        rc6->enabled = true;
@@ -654,7 +607,7 @@ void intel_rc6_park(struct intel_rc6 *rc6)
        if (!rc6->enabled)
                return;
 
-       if (unlikely(intel_rc6_ctx_wa_check(rc6))) {
+       if (unlikely(pctx_corrupted(rc6))) {
                intel_rc6_disable(rc6);
                return;
        }

diff --git a/drivers/gpu/drm/i915/gt/intel_rc6.h b/drivers/gpu/drm/i915/gt/intel_rc6.h
index f282157..9f0f23f 100644 (file)
--- a/drivers/gpu/drm/i915/gt/intel_rc6.h
+++ b/drivers/gpu/drm/i915/gt/intel_rc6.h
@@ -25,6 +25,4 @@ 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_us(struct intel_rc6 *rc6, i915_reg_t reg);
 
-void intel_rc6_ctx_wa_resume(struct intel_rc6 *rc6);
-
 #endif /* INTEL_RC6_H */

diff --git a/drivers/gpu/drm/i915/gt/intel_rc6_types.h b/drivers/gpu/drm/i915/gt/intel_rc6_types.h
index 9f3d568..60decae 100644 (file)
--- a/drivers/gpu/drm/i915/gt/intel_rc6_types.h
+++ b/drivers/gpu/drm/i915/gt/intel_rc6_types.h
@@ -25,7 +25,6 @@ struct intel_rc6 {
        bool supported : 1;
        bool enabled : 1;
        bool wakeref : 1;
-       bool ctx_corrupted : 1;
 };
 
 #endif /* INTEL_RC6_TYPES_H */

diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
index aa1d9e2..018914b 100644 (file)
--- a/drivers/gpu/drm/i915/i915_drv.c
+++ b/drivers/gpu/drm/i915/i915_drv.c
@@ -1817,8 +1817,6 @@ static int i915_drm_resume(struct drm_device *dev)
 
        disable_rpm_wakeref_asserts(&dev_priv->runtime_pm);
 
-       intel_rc6_ctx_wa_resume(&dev_priv->gt.rc6);
-
        intel_gt_sanitize(&dev_priv->gt, true);
 
        ret = i915_ggtt_enable_hw(dev_priv);