Attachment 110995 Details for Bug 87429 – fix rps interrupt disabling

[patch] fix rps interrupt disabling

0001-drm-i915-gen6-fix-rps-interrupt-disabling.patch (text/plain), 3.27 KB, created by Imre Deak on 2014-12-18 17:05:42 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Imre Deak

Created: 2014-12-18 17:05:42 UTC

Size: 3.27 KB

patch

obsolete

>From b44d6b33e160853c0aeec34bdfff20f9ba90ba41 Mon Sep 17 00:00:00 2001
>From: Imre Deak <imre.deak@intel.com>
>Date: Thu, 18 Dec 2014 18:57:55 +0200
>Subject: [PATCH] drm/i915: gen6: fix rps interrupt disabling
>
>Signed-off-by: Imre Deak <imre.deak@intel.com>
>---
> drivers/gpu/drm/i915/i915_irq.c  | 17 +++++++++++++++--
> drivers/gpu/drm/i915/intel_drv.h |  1 +
> drivers/gpu/drm/i915/intel_pm.c  | 11 +----------
> 3 files changed, 17 insertions(+), 12 deletions(-)
>
>diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c
>index aa3180c..b10004d 100644
>--- a/drivers/gpu/drm/i915/i915_irq.c
>+++ b/drivers/gpu/drm/i915/i915_irq.c
>@@ -296,6 +296,20 @@ 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)
>+{
>+	/* IVB and SNB hard hangs on looping batchbuffer
>+	 * if GEN6_PM_UP_EI_EXPIRED is masked.
>+	 */
>+	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->dev)->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 +322,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)) &
>diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h
>index 588b618..bb871f3 100644
>--- a/drivers/gpu/drm/i915/intel_drv.h
>+++ b/drivers/gpu/drm/i915/intel_drv.h
>@@ -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)
>diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c
>index a3ebaa8..4bd1b8b 100644
>--- a/drivers/gpu/drm/i915/intel_pm.c
>+++ b/drivers/gpu/drm/i915/intel_pm.c
>@@ -3745,16 +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;
> 
>-	/* IVB and SNB hard hangs on looping batchbuffer
>-	 * if GEN6_PM_UP_EI_EXPIRED is masked.
>-	 */
>-	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))
>-		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
>-- 
>1.8.3.2
>

Actions: View | Splinter Review

Attachments on bug 87429: 110995

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.