Attachment 127096 Details for Bug 97985 – Grab RPM reference around vblank

[patch] Grab RPM reference around vblank

0001-drm-i915-Grab-RPM-wakeref-around-enabling-vblank-int.patch (text/plain), 3.63 KB, created by Chris Wilson on 2016-10-07 13:49:54 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Chris Wilson

Created: 2016-10-07 13:49:54 UTC

Size: 3.63 KB

patch

obsolete

>From 804c74f40b1843044a908f07ecac8fc671a99c1d Mon Sep 17 00:00:00 2001
>From: Chris Wilson <chris@chris-wilson.co.uk>
>Date: Fri, 7 Oct 2016 14:46:51 +0100
>Subject: [PATCH] drm/i915: Grab RPM wakeref around enabling vblank interrupts
>
>Whilst the vblank is configured to send an interrupt everytime, we need
>to keep the device awake to process those interrupts.
>
>Reported-by: Anssi Hannula <anssi.hannula@bitwise.fi>
>References: https://bugs.freedesktop.org/show_bug.cgi?id=97985
>Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
>---
> drivers/gpu/drm/i915/i915_irq.c | 16 ++++++++++++++++
> 1 file changed, 16 insertions(+)
>
>diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c
>index bd6c8b0eeaef..bda7a27615a6 100644
>--- a/drivers/gpu/drm/i915/i915_irq.c
>+++ b/drivers/gpu/drm/i915/i915_irq.c
>@@ -2723,6 +2723,8 @@ static int i915_enable_vblank(struct drm_device *dev, unsigned int pipe)
> 	struct drm_i915_private *dev_priv = to_i915(dev);
> 	unsigned long irqflags;
> 
>+	intel_runtime_pm_get(dev_priv);
>+
> 	spin_lock_irqsave(&dev_priv->irq_lock, irqflags);
> 	if (INTEL_INFO(dev)->gen >= 4)
> 		i915_enable_pipestat(dev_priv, pipe,
>@@ -2742,6 +2744,8 @@ static int ironlake_enable_vblank(struct drm_device *dev, unsigned int pipe)
> 	uint32_t bit = (INTEL_INFO(dev)->gen >= 7) ? DE_PIPE_VBLANK_IVB(pipe) :
> 						     DE_PIPE_VBLANK(pipe);
> 
>+	intel_runtime_pm_get(dev_priv);
>+
> 	spin_lock_irqsave(&dev_priv->irq_lock, irqflags);
> 	ilk_enable_display_irq(dev_priv, bit);
> 	spin_unlock_irqrestore(&dev_priv->irq_lock, irqflags);
>@@ -2754,6 +2758,8 @@ static int valleyview_enable_vblank(struct drm_device *dev, unsigned int pipe)
> 	struct drm_i915_private *dev_priv = to_i915(dev);
> 	unsigned long irqflags;
> 
>+	intel_runtime_pm_get(dev_priv);
>+
> 	spin_lock_irqsave(&dev_priv->irq_lock, irqflags);
> 	i915_enable_pipestat(dev_priv, pipe,
> 			     PIPE_START_VBLANK_INTERRUPT_STATUS);
>@@ -2767,6 +2773,8 @@ static int gen8_enable_vblank(struct drm_device *dev, unsigned int pipe)
> 	struct drm_i915_private *dev_priv = to_i915(dev);
> 	unsigned long irqflags;
> 
>+	intel_runtime_pm_get(dev_priv);
>+
> 	spin_lock_irqsave(&dev_priv->irq_lock, irqflags);
> 	bdw_enable_pipe_irq(dev_priv, pipe, GEN8_PIPE_VBLANK);
> 	spin_unlock_irqrestore(&dev_priv->irq_lock, irqflags);
>@@ -2787,6 +2795,8 @@ static void i915_disable_vblank(struct drm_device *dev, unsigned int pipe)
> 			      PIPE_VBLANK_INTERRUPT_STATUS |
> 			      PIPE_START_VBLANK_INTERRUPT_STATUS);
> 	spin_unlock_irqrestore(&dev_priv->irq_lock, irqflags);
>+
>+	intel_runtime_pm_put(dev_priv);
> }
> 
> static void ironlake_disable_vblank(struct drm_device *dev, unsigned int pipe)
>@@ -2799,6 +2809,8 @@ static void ironlake_disable_vblank(struct drm_device *dev, unsigned int pipe)
> 	spin_lock_irqsave(&dev_priv->irq_lock, irqflags);
> 	ilk_disable_display_irq(dev_priv, bit);
> 	spin_unlock_irqrestore(&dev_priv->irq_lock, irqflags);
>+
>+	intel_runtime_pm_put(dev_priv);
> }
> 
> static void valleyview_disable_vblank(struct drm_device *dev, unsigned int pipe)
>@@ -2810,6 +2822,8 @@ static void valleyview_disable_vblank(struct drm_device *dev, unsigned int pipe)
> 	i915_disable_pipestat(dev_priv, pipe,
> 			      PIPE_START_VBLANK_INTERRUPT_STATUS);
> 	spin_unlock_irqrestore(&dev_priv->irq_lock, irqflags);
>+
>+	intel_runtime_pm_put(dev_priv);
> }
> 
> static void gen8_disable_vblank(struct drm_device *dev, unsigned int pipe)
>@@ -2820,6 +2834,8 @@ static void gen8_disable_vblank(struct drm_device *dev, unsigned int pipe)
> 	spin_lock_irqsave(&dev_priv->irq_lock, irqflags);
> 	bdw_disable_pipe_irq(dev_priv, pipe, GEN8_PIPE_VBLANK);
> 	spin_unlock_irqrestore(&dev_priv->irq_lock, irqflags);
>+
>+	intel_runtime_pm_put(dev_priv);
> }
> 
> static bool
>-- 
>2.9.3
>

Actions: View | Splinter Review

Attachments on bug 97985: 126897 | 126898 | 126899 | 126964 | 126965 | 126966 | 126967 | 126968 | 126971 | 126976 | 126987 | 127096 | 127098 | 130372 | 132992

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.