Attachment 44996 Details for Bug 35635 – Move the irq queue init onto the rings

[patch] Move the irq queue init onto the rings

0001-drm-i915-Move-the-irq-wait-queue-initialisation-into.patch (text/plain), 1.69 KB, created by Chris Wilson on 2011-03-29 05:44:12 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Chris Wilson

Created: 2011-03-29 05:44:12 UTC

Size: 1.69 KB

patch

obsolete

>From ea1167d6601f370f5d7e425eb0b3c7577edd02cd Mon Sep 17 00:00:00 2001
>From: Chris Wilson <chris@chris-wilson.co.uk>
>Date: Tue, 29 Mar 2011 13:19:09 +0100
>Subject: [PATCH 1/2] drm/i915: Move the irq wait queue initialisation into the ring init
>
>Required so that we don't obliterate the queue if initialising the
>rings after the global IRQ handler is installed.
>
>Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
>---
> drivers/gpu/drm/i915/i915_irq.c         |    6 ------
> drivers/gpu/drm/i915/intel_ringbuffer.c |    1 +
> 2 files changed, 1 insertions(+), 6 deletions(-)
>
>diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c
>index 188b497..46ccfc8 100644
>--- a/drivers/gpu/drm/i915/i915_irq.c
>+++ b/drivers/gpu/drm/i915/i915_irq.c
>@@ -1688,12 +1688,6 @@ int i915_driver_irq_postinstall(struct drm_device *dev)
> 	u32 enable_mask = I915_INTERRUPT_ENABLE_FIX | I915_INTERRUPT_ENABLE_VAR;
> 	u32 error_mask;
> 
>-	DRM_INIT_WAITQUEUE(&dev_priv->ring[RCS].irq_queue);
>-	if (HAS_BSD(dev))
>-		DRM_INIT_WAITQUEUE(&dev_priv->ring[VCS].irq_queue);
>-	if (HAS_BLT(dev))
>-		DRM_INIT_WAITQUEUE(&dev_priv->ring[BCS].irq_queue);
>-
> 	dev_priv->vblank_pipe = DRM_I915_VBLANK_PIPE_A | DRM_I915_VBLANK_PIPE_B;
> 
> 	if (HAS_PCH_SPLIT(dev))
>diff --git a/drivers/gpu/drm/i915/intel_ringbuffer.c b/drivers/gpu/drm/i915/intel_ringbuffer.c
>index e9e6f71..884556d 100644
>--- a/drivers/gpu/drm/i915/intel_ringbuffer.c
>+++ b/drivers/gpu/drm/i915/intel_ringbuffer.c
>@@ -800,6 +800,7 @@ int intel_init_ring_buffer(struct drm_device *dev,
> 	INIT_LIST_HEAD(&ring->request_list);
> 	INIT_LIST_HEAD(&ring->gpu_write_list);
> 
>+	init_waitqueue_head(&ring->irq_queue);
> 	spin_lock_init(&ring->irq_lock);
> 	ring->irq_mask = ~0;
> 
>-- 
>1.7.4.1
>

Actions: View | Splinter Review

Attachments on bug 35635: 44993 | 44996 | 44997

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.