drm/i915: gen9: fix RPS interrupt routing to CPU vs. GT
Subsystems (2)
PATCH v3 1/3 drm/i915: gen9: fix RPS interrupt routing to CPU vs. GT
GEN8+ HW has the option to route PM interrupts to either the CPU or to GT. For GEN8 this was already set correctly to routing to CPU, but not for GEN9, so fix this. Note that when disabling RPS interrupts this was set already correctly, though in that case it didn't matter much except for the possibility of spurious interrupts.
--- drivers/gpu/drm/i915/intel_pm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/i915/intel_pm.c +1 -1
@@ -3751,7 +3751,7 @@ static u32 gen6_rps_pm_mask(struct drm_i915_private *dev_priv, u8 val)if (INTEL_INFO (dev_priv->dev)->gen <=7 && !IS_HASWELL (dev_priv->dev)) mask |=GEN6_PM_RP_UP_EI_EXPIRED ; -if (IS_GEN8 (dev_priv->dev)) +if (INTEL_INFO (dev_priv)->gen >=8 ) mask |=GEN8_PMINTR_REDIRECT_TO_NON_DISP ;return ~mask;
Signature · 6 lines
1.8.4 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v3 2/3 drm/i915: vlv: sanitize RPS interrupt mask during GPU idling
We apply the RPS interrupt workaround on VLV everywhere except when writing the mask directly during idling the GPU. For consistency do this also there.
While at it also extend the code comment about affected platforms. I couldn't reproduce the issue on VLV fixed by this workaround, by removing the workaround from everywhere, while it's 100% reproducible on SNB using igt/gem_reset_stats/ban-ctx-render. So also add a note that it hasn't been verified if the workaround really applies to VLV/CHV.
--- drivers/gpu/drm/i915/intel_pm.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
drivers/gpu/drm/i915/intel_pm.c +6 -2
@@ -3745,8 +3745,11 @@ static u32 gen6_rps_pm_mask(struct drm_i915_private *dev_priv, u8 val) mask |= dev_priv->pm_rps_events & (GEN6_PM_RP_DOWN_EI_EXPIRED |GEN6_PM_RP_UP_EI_EXPIRED ); mask &= dev_priv->pm_rps_events; -/* IVB and SNB hard hangs on looping batchbuffer +/* +* SNB,IVB can while VLV,CHV may hard hang on looping batchbuffer * if GEN6_PM_UP_EI_EXPIRED is masked. +* +* TODO: verify if this can be reproduced on VLV,CHV. */ if (INTEL_INFO (dev_priv->dev)->gen <=7 && !IS_HASWELL (dev_priv->dev)) mask |=GEN6_PM_RP_UP_EI_EXPIRED ;
@@ -3823,7 +3826,8 @@ static void vlv_set_rps_idle(struct drm_i915_private *dev_priv)return ;/* Mask turbo interrupt so that they will not come in between */ -I915_WRITE (GEN6_PMINTRMSK ,0xffffffff ); +I915_WRITE (GEN6_PMINTRMSK , +gen6_sanitize_rps_pm_mask (dev_priv, ~0 ));vlv_force_gfx_clock (dev_priv, true);
Signature · 6 lines
1.8.4 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v3 3/3 drm/i915: fix HW lockup due to missing RPS IRQ workaround on GEN6
In reply to Imre DeakIn
commit dbea3cea69508e9d548ed4a6be13de35492e5d15
Author: Imre Deak <[email protected]> Date: Mon Dec 15 18:59:28 2014 +0200
drm/i915: sanitize RPS resetting during GPU reset
we disable RPS interrupts during GPU resetting, but don't apply the necessary GEN6 HW workaround. This leads to a HW lockup during a subsequent "looping batchbuffer" workload. This is triggered by the testcase that submits exactly this kind of workload after a simulated GPU reset. I'm not sure how likely the bug would have triggered otherwise, since we would have applied the workaround anyway shortly after the GPU reset, when enabling GT powersaving from the deferred work.
This may also fix unrelated issues, since during driver loading / suspending we also disable RPS interrupts and so we also had a short window during the rest of the loading / resuming where a similar workload could run without the workaround applied.
v2:
- separate the fix to route RPS interrupts to the CPU on GEN9 too to a separate patch (Daniel)
Testcase: igt/gem_reset_stats/ban-ctx-render
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=87429
--- drivers/gpu/drm/i915/i915_irq.c | 20 ++++++++++++++++++-- drivers/gpu/drm/i915/intel_drv.h | 1 + drivers/gpu/drm/i915/intel_pm.c | 14 +------------- 3 files changed, 20 insertions(+), 15 deletions(-)
drivers/gpu/drm/i915/i915_irq.c +18 -2
@@ -296,6 +296,23 @@ void gen6_enable_rps_interrupts(struct drm_device *dev)spin_unlock_irq (&dev_priv->irq_lock); } +u32 gen6_sanitize_rps_pm_mask (struct drm_i915_private *dev_priv,u32 mask) +{ +/* +* SNB,IVB can while VLV,CHV may hard hang on looping batchbuffer +* if GEN6_PM_UP_EI_EXPIRED is masked. +* +* TODO: verify if this can be reproduced on VLV,CHV. +*/ +if (INTEL_INFO (dev_priv)->gen <=7 && !IS_HASWELL (dev_priv)) + mask &= ~GEN6_PM_RP_UP_EI_EXPIRED ; + +if (INTEL_INFO (dev_priv)->gen >=8 ) + mask &= ~GEN8_PMINTR_REDIRECT_TO_NON_DISP ; + +return mask; +} +void gen6_disable_rps_interrupts (struct drm_device *dev) {struct drm_i915_private *dev_priv = dev->dev_private;
@@ -308,8 +325,7 @@ void gen6_disable_rps_interrupts(struct drm_device *dev)spin_lock_irq (&dev_priv->irq_lock); -I915_WRITE (GEN6_PMINTRMSK ,INTEL_INFO (dev_priv)->gen >=8 ? - ~GEN8_PMINTR_REDIRECT_TO_NON_DISP : ~0 ); +I915_WRITE (GEN6_PMINTRMSK ,gen6_sanitize_rps_pm_mask (dev_priv, ~0 ));__gen6_disable_pm_irq (dev_priv, dev_priv->pm_rps_events); I915_WRITE(gen6_pm_ier(dev_priv), I915_READ(gen6_pm_ier(dev_priv)) &
drivers/gpu/drm/i915/intel_drv.h +1 -0
@@ -795,6 +795,7 @@ void gen6_disable_pm_irq(struct drm_i915_private *dev_priv, uint32_t mask);void gen6_reset_rps_interrupts (struct drm_device *dev);void gen6_enable_rps_interrupts (struct drm_device *dev);void gen6_disable_rps_interrupts (struct drm_device *dev); +u32 gen6_sanitize_rps_pm_mask (struct drm_i915_private *dev_priv,u32 mask);void intel_runtime_pm_disable_interrupts (struct drm_i915_private *dev_priv);void intel_runtime_pm_enable_interrupts (struct drm_i915_private *dev_priv);static inline bool intel_irqs_enabled (struct drm_i915_private *dev_priv)
drivers/gpu/drm/i915/intel_pm.c +1 -13
@@ -3745,19 +3745,7 @@ static u32 gen6_rps_pm_mask(struct drm_i915_private *dev_priv, u8 val) mask |= dev_priv->pm_rps_events & (GEN6_PM_RP_DOWN_EI_EXPIRED |GEN6_PM_RP_UP_EI_EXPIRED ); mask &= dev_priv->pm_rps_events; -/* -* SNB,IVB can while VLV,CHV may hard hang on looping batchbuffer -* if GEN6_PM_UP_EI_EXPIRED is masked. -* -* TODO: verify if this can be reproduced on VLV,CHV. -*/ -if (INTEL_INFO (dev_priv->dev)->gen <=7 && !IS_HASWELL (dev_priv->dev)) - mask |=GEN6_PM_RP_UP_EI_EXPIRED ; - -if (INTEL_INFO (dev_priv)->gen >=8 ) - mask |=GEN8_PMINTR_REDIRECT_TO_NON_DISP ; - -return ~mask; +return gen6_sanitize_rps_pm_mask (dev_priv, ~mask); }/* gen6_set_rps is called to update the frequency request, but should also be
Signature · 6 lines
1.8.4 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx