Commit 7e34f4e4 authored by Imre Deak's avatar Imre Deak Committed by Jon Bloomfield
Browse files

drm/i915/gen8+: Add RC6 CTX corruption WA 



In some circumstances the RC6 context can get corrupted. We can detect
this and take the required action, that is disable RC6 and runtime PM.
The HW recovers from the corrupted state after a system suspend/resume
cycle, so detect the recovery and re-enable RC6 and runtime PM.

v2: rebase (Mika)
v3:
- Move intel_suspend_gt_powersave() to the end of the GEM suspend
  sequence.
- Add commit message.
v4:
- Rebased on intel_uncore_forcewake_put(i915->uncore, ...) API
  change.
v5: rebased on gem/gt split (Mika)

Signed-off-by: default avatarImre Deak <imre.deak@intel.com>
Signed-off-by: default avatarMika Kuoppala <mika.kuoppala@linux.intel.com>
parent 1d85a299

drivers/gpu/drm/i915/gt/intel_gt_pm.c

+8 −0
Original line number Diff line number Diff line
@@ -38,6 +38,9 @@ static int __gt_unpark(struct intel_wakeref *wf) 
	gt->awake = intel_display_power_get(i915, POWER_DOMAIN_GT_IRQ);

	GEM_BUG_ON(!gt->awake);



	if (NEEDS_RC6_CTX_CORRUPTION_WA(i915))

		intel_uncore_forcewake_get(&i915->uncore, FORCEWAKE_ALL);



	intel_enable_gt_powersave(i915);



	i915_update_gfx_val(i915);
@@ -67,6 +70,11 @@ static int __gt_park(struct intel_wakeref *wf) 
	if (INTEL_GEN(i915) >= 6)

		gen6_rps_idle(i915);



	if (NEEDS_RC6_CTX_CORRUPTION_WA(i915)) {

		i915_rc6_ctx_wa_check(i915);

		intel_uncore_forcewake_put(&i915->uncore, FORCEWAKE_ALL);

	}



	/* Everything switched off, flush any residual interrupt just in case */

	intel_synchronize_irq(i915);

drivers/gpu/drm/i915/i915_drv.c

+4 −0
Original line number Diff line number Diff line
@@ -1850,6 +1850,8 @@ static int i915_drm_suspend_late(struct drm_device *dev, bool hibernation) 


	i915_gem_suspend_late(dev_priv);



	i915_rc6_ctx_wa_suspend(dev_priv);



	intel_uncore_suspend(&dev_priv->uncore);



	intel_power_domains_suspend(dev_priv,
@@ -2053,6 +2055,8 @@ static int i915_drm_resume_early(struct drm_device *dev) 


	intel_power_domains_resume(dev_priv);



	i915_rc6_ctx_wa_resume(dev_priv);



	intel_gt_sanitize(&dev_priv->gt, true);



	enable_rpm_wakeref_asserts(&dev_priv->runtime_pm);

drivers/gpu/drm/i915/i915_drv.h

+6 −2
Original line number Diff line number Diff line
@@ -593,6 +593,8 @@ struct intel_rps { 


struct intel_rc6 {

	bool enabled;

	bool ctx_corrupted;

	intel_wakeref_t ctx_corrupted_wakeref;

	u64 prev_hw_residency[4];

	u64 cur_residency[4];

};
@@ -2117,10 +2119,12 @@ IS_SUBPLATFORM(const struct drm_i915_private *i915, 
/* Early gen2 have a totally busted CS tlb and require pinned batches. */

#define HAS_BROKEN_CS_TLB(dev_priv)	(IS_I830(dev_priv) || IS_I845G(dev_priv))



#define NEEDS_RC6_CTX_CORRUPTION_WA(dev_priv)	\

	(IS_BROADWELL(dev_priv) || IS_GEN(dev_priv, 9))



/* WaRsDisableCoarsePowerGating:skl,cnl */

#define NEEDS_WaRsDisableCoarsePowerGating(dev_priv) \

	(IS_CANNONLAKE(dev_priv) || \

	 IS_SKL_GT3(dev_priv) || IS_SKL_GT4(dev_priv))

	(IS_CANNONLAKE(dev_priv) || IS_GEN(dev_priv, 9))



#define HAS_GMBUS_IRQ(dev_priv) (INTEL_GEN(dev_priv) >= 4)

#define HAS_GMBUS_BURST_READ(dev_priv) (INTEL_GEN(dev_priv) >= 10 || \

drivers/gpu/drm/i915/i915_reg.h

+2 −0
Original line number Diff line number Diff line
@@ -471,6 +471,8 @@ static inline bool i915_mmio_reg_valid(i915_reg_t reg) 
#define   ECOCHK_PPGTT_WT_HSW		(0x2 << 3)

#define   ECOCHK_PPGTT_WB_HSW		(0x3 << 3)



#define GEN8_RC6_CTX_INFO		_MMIO(0x8504)



#define GAC_ECO_BITS			_MMIO(0x14090)

#define   ECOBITS_SNB_BIT		(1 << 13)

#define   ECOBITS_PPGTT_CACHE64B	(3 << 8)

drivers/gpu/drm/i915/intel_pm.c

+112 −2
Original line number Diff line number Diff line
@@ -8552,6 +8552,100 @@ static void intel_init_emon(struct drm_i915_private *dev_priv) 
	dev_priv->ips.corr = (lcfuse & LCFUSE_HIV_MASK);

}



static bool i915_rc6_ctx_corrupted(struct drm_i915_private *dev_priv)

{

	return !I915_READ(GEN8_RC6_CTX_INFO);

}



static void i915_rc6_ctx_wa_init(struct drm_i915_private *i915)

{

	if (!NEEDS_RC6_CTX_CORRUPTION_WA(i915))

		return;



	if (i915_rc6_ctx_corrupted(i915)) {

		DRM_INFO("RC6 context corrupted, disabling runtime power management\n");

		i915->gt_pm.rc6.ctx_corrupted = true;

		i915->gt_pm.rc6.ctx_corrupted_wakeref =

			intel_runtime_pm_get(&i915->runtime_pm);

	}

}



static void i915_rc6_ctx_wa_cleanup(struct drm_i915_private *i915)

{

	if (i915->gt_pm.rc6.ctx_corrupted) {

		intel_runtime_pm_put(&i915->runtime_pm,

				     i915->gt_pm.rc6.ctx_corrupted_wakeref);

		i915->gt_pm.rc6.ctx_corrupted = false;

	}

}



/**

 * i915_rc6_ctx_wa_suspend - system suspend sequence for the RC6 CTX WA

 * @i915: i915 device

 *

 * Perform any steps needed to clean up the RC6 CTX WA before system suspend.

 */

void i915_rc6_ctx_wa_suspend(struct drm_i915_private *i915)

{

	if (i915->gt_pm.rc6.ctx_corrupted)

		intel_runtime_pm_put(&i915->runtime_pm,

				     i915->gt_pm.rc6.ctx_corrupted_wakeref);

}



/**

 * i915_rc6_ctx_wa_resume - system resume sequence for the RC6 CTX WA

 * @i915: i915 device

 *

 * Perform any steps needed to re-init the RC6 CTX WA after system resume.

 */

void i915_rc6_ctx_wa_resume(struct drm_i915_private *i915)

{

	if (!i915->gt_pm.rc6.ctx_corrupted)

		return;



	if (i915_rc6_ctx_corrupted(i915)) {

		i915->gt_pm.rc6.ctx_corrupted_wakeref =

			intel_runtime_pm_get(&i915->runtime_pm);

		return;

	}



	DRM_INFO("RC6 context restored, re-enabling runtime power management\n");

	i915->gt_pm.rc6.ctx_corrupted = false;

}



static void intel_disable_rc6(struct drm_i915_private *dev_priv);



/**

 * i915_rc6_ctx_wa_check - check for a new RC6 CTX corruption

 * @i915: i915 device

 *

 * Check if an RC6 CTX corruption has happened since the last check and if so

 * disable RC6 and runtime power management.

 *

 * Return false if no context corruption has happened since the last call of

 * this function, true otherwise.

*/

bool i915_rc6_ctx_wa_check(struct drm_i915_private *i915)

{

	if (!NEEDS_RC6_CTX_CORRUPTION_WA(i915))

		return false;



	if (i915->gt_pm.rc6.ctx_corrupted)

		return false;



	if (!i915_rc6_ctx_corrupted(i915))

		return false;



	DRM_NOTE("RC6 context corruption, disabling runtime power management\n");



	intel_disable_rc6(i915);

	i915->gt_pm.rc6.ctx_corrupted = true;

	i915->gt_pm.rc6.ctx_corrupted_wakeref =

		intel_runtime_pm_get_noresume(&i915->runtime_pm);



	return true;

}



void intel_init_gt_powersave(struct drm_i915_private *dev_priv)

{

	struct intel_rps *rps = &dev_priv->gt_pm.rps;
@@ -8565,6 +8659,8 @@ void intel_init_gt_powersave(struct drm_i915_private *dev_priv) 
		pm_runtime_get(&dev_priv->drm.pdev->dev);

	}



	i915_rc6_ctx_wa_init(dev_priv);



	/* Initialize RPS limits (for userspace) */

	if (IS_CHERRYVIEW(dev_priv))

		cherryview_init_gt_powersave(dev_priv);
@@ -8603,6 +8699,8 @@ void intel_cleanup_gt_powersave(struct drm_i915_private *dev_priv) 
	if (IS_VALLEYVIEW(dev_priv))

		valleyview_cleanup_gt_powersave(dev_priv);



	i915_rc6_ctx_wa_cleanup(dev_priv);



	if (!HAS_RC6(dev_priv))

		pm_runtime_put(&dev_priv->drm.pdev->dev);

}
@@ -8631,7 +8729,7 @@ static inline void intel_disable_llc_pstate(struct drm_i915_private *i915) 
	i915->gt_pm.llc_pstate.enabled = false;

}



static void intel_disable_rc6(struct drm_i915_private *dev_priv)

static void __intel_disable_rc6(struct drm_i915_private *dev_priv)

{

	lockdep_assert_held(&dev_priv->gt_pm.rps.lock);
@@ -8650,6 +8748,15 @@ static void intel_disable_rc6(struct drm_i915_private *dev_priv) 
	dev_priv->gt_pm.rc6.enabled = false;

}



static void intel_disable_rc6(struct drm_i915_private *dev_priv)

{

	struct intel_rps *rps = &dev_priv->gt_pm.rps;



	mutex_lock(&rps->lock);

	__intel_disable_rc6(dev_priv);

	mutex_unlock(&rps->lock);

}



static void intel_disable_rps(struct drm_i915_private *dev_priv)

{

	lockdep_assert_held(&dev_priv->gt_pm.rps.lock);
@@ -8675,7 +8782,7 @@ void intel_disable_gt_powersave(struct drm_i915_private *dev_priv) 
{

	mutex_lock(&dev_priv->gt_pm.rps.lock);



	intel_disable_rc6(dev_priv);

	__intel_disable_rc6(dev_priv);

	intel_disable_rps(dev_priv);

	if (HAS_LLC(dev_priv))

		intel_disable_llc_pstate(dev_priv);
@@ -8702,6 +8809,9 @@ static void intel_enable_rc6(struct drm_i915_private *dev_priv) 
	if (dev_priv->gt_pm.rc6.enabled)

		return;



	if (dev_priv->gt_pm.rc6.ctx_corrupted)

		return;



	if (IS_CHERRYVIEW(dev_priv))

		cherryview_enable_rc6(dev_priv);

	else if (IS_VALLEYVIEW(dev_priv))

CRA Git | Maintained and supported by SUSTech CRA and CCSE