Attachment 60635 Details for Bug 48798 – dont clobber rps work when reinstalling the irq

[patch] dont clobber rps work when reinstalling the irq

0001-drm-i915-Unconditionally-initialise-the-interrupt-wo.patch (text/plain), 2.54 KB, created by Daniel Vetter on 2012-04-26 13:58:03 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Daniel Vetter

Created: 2012-04-26 13:58:03 UTC

Size: 2.54 KB

patch

obsolete

>From f737bc449d93084bccf8718f2f739f86033d914e Mon Sep 17 00:00:00 2001
>From: Chris Wilson <chris@chris-wilson.co.uk>
>Date: Tue, 24 Apr 2012 22:59:41 +0100
>Subject: [PATCH] drm/i915: Unconditionally initialise the interrupt workers
>
>Rather than duplicate similar code across the IRQ installers, perform
>the initialisation of the workers upfront. This will lead to simpler
>teardown and quiescent code as we can assume that the workers have
>been initialised.
>
>Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
>Reviewed-by: Jesse Barnes <jbarnes@virtuousgeek.org>
>Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
>---
> drivers/gpu/drm/i915/i915_irq.c |   16 ++++++----------
> 1 file changed, 6 insertions(+), 10 deletions(-)
>
>diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c
>index 0211263..2dc023d 100644
>--- a/drivers/gpu/drm/i915/i915_irq.c
>+++ b/drivers/gpu/drm/i915/i915_irq.c
>@@ -2004,10 +2004,6 @@ static void ironlake_irq_preinstall(struct drm_device *dev)
> 
> 	atomic_set(&dev_priv->irq_received, 0);
> 
>-	INIT_WORK(&dev_priv->hotplug_work, i915_hotplug_work_func);
>-	INIT_WORK(&dev_priv->error_work, i915_error_work_func);
>-	if (IS_GEN6(dev) || IS_IVYBRIDGE(dev))
>-		INIT_WORK(&dev_priv->rps_work, gen6_pm_rps_work);
> 
> 	I915_WRITE(HWSTAM, 0xeffe);
> 
>@@ -2035,9 +2031,6 @@ static void valleyview_irq_preinstall(struct drm_device *dev)
> 
> 	atomic_set(&dev_priv->irq_received, 0);
> 
>-	INIT_WORK(&dev_priv->hotplug_work, i915_hotplug_work_func);
>-	INIT_WORK(&dev_priv->error_work, i915_error_work_func);
>-
> 	/* VLV magic */
> 	I915_WRITE(VLV_IMR, 0);
> 	I915_WRITE(RING_IMR(RENDER_RING_BASE), 0);
>@@ -2306,9 +2299,6 @@ static void i915_driver_irq_preinstall(struct drm_device * dev)
> 
> 	atomic_set(&dev_priv->irq_received, 0);
> 
>-	INIT_WORK(&dev_priv->hotplug_work, i915_hotplug_work_func);
>-	INIT_WORK(&dev_priv->error_work, i915_error_work_func);
>-
> 	if (I915_HAS_HOTPLUG(dev)) {
> 		I915_WRITE(PORT_HOTPLUG_EN, 0);
> 		I915_WRITE(PORT_HOTPLUG_STAT, I915_READ(PORT_HOTPLUG_STAT));
>@@ -2625,6 +2615,12 @@ static void i8xx_irq_uninstall(struct drm_device * dev)
> 
> void intel_irq_init(struct drm_device *dev)
> {
>+	struct drm_i915_private *dev_priv = dev->dev_private;
>+
>+	INIT_WORK(&dev_priv->hotplug_work, i915_hotplug_work_func);
>+	INIT_WORK(&dev_priv->error_work, i915_error_work_func);
>+	INIT_WORK(&dev_priv->rps_work, gen6_pm_rps_work);
>+
> 	dev->driver->get_vblank_counter = i915_get_vblank_counter;
> 	dev->max_vblank_count = 0xffffff; /* only 24 bits of frame count */
> 	if (IS_G4X(dev) || IS_GEN5(dev) || IS_GEN6(dev) || IS_IVYBRIDGE(dev) ||
>-- 
>1.7.10
>

Actions: View | Splinter Review

Attachments on bug 48798: 60145 | 60227 | 60228 | 60598 | 60635

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.