Intel-GFX Archive on lore.kernel.org
 help / color / Atom feed
From: Chris Wilson <chris@chris-wilson.co.uk>
To: intel-gfx@lists.freedesktop.org
Cc: Pekka Enberg <penberg@kernel.org>,
	linux-kernel@vger.kernel.org,
	Chris Wilson <chris@chris-wilson.co.uk>
Subject: [PATCH] drm/i915: Move the irq wait queue initialisation into the ring init
Date: Tue, 29 Mar 2011 13:23:05 +0100
Message-ID: <1301401385-8935-1-git-send-email-chris@chris-wilson.co.uk> (raw)
In-Reply-To: <1301395589-8121-1-git-send-email-chris@chris-wilson.co.uk>

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>
---

This patch is required in conjunction with the first to prevent an oops
the first time we try to use i915_wait_request (i.e. when starting X).
-Chris

---
 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

  reply index

Thread overview: 25+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
     [not found] <AANLkTi=VqkYjdiDLJvM-OfmBSGx-EkRkt=4XCDEnvZsU@mail.gmail.com>
2011-03-29 10:46 ` [PATCH] drm/i915: Disable all outputs early, before KMS takeover Chris Wilson
2011-03-29 12:23   ` Chris Wilson [this message]
2011-03-29 13:05     ` [PATCH] drm/i915: Move the irq wait queue initialisation into the ring init Pekka Enberg
2011-03-29 13:22       ` Chris Wilson
2011-03-29 13:39         ` Pekka Enberg
2011-03-29 14:22           ` Pekka Enberg
2011-03-29 14:32             ` Chris Wilson
2011-03-29 15:21               ` Pekka Enberg
2011-04-01 11:44   ` [PATCH] drm/i915: Disable all outputs early, before KMS takeover Daniel Vetter
2011-04-01 11:51     ` [Intel-gfx] " Pekka Enberg
2011-04-05 10:21       ` Tomas Winkler
2011-04-05 10:30         ` Chris Wilson
2011-04-05 10:37           ` Pekka Enberg
2011-04-05 11:55             ` Tomas Winkler
2011-04-05 14:11             ` Pekka Enberg
2011-04-05 14:27               ` Chris Wilson
2011-04-05 14:31                 ` [Intel-gfx] " Pekka Enberg
2011-04-05 14:34               ` Chris Wilson
2011-04-05 15:11                 ` Pekka Enberg
2011-04-05 15:32                   ` Chris Wilson
2011-04-05 15:44                     ` Pekka Enberg
2011-04-05 14:42           ` Linus Torvalds
2011-04-05 15:01             ` Keith Packard
2011-04-05 15:12             ` [Intel-gfx] " Chris Wilson
2011-04-05 15:35               ` Pekka Enberg

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1301401385-8935-1-git-send-email-chris@chris-wilson.co.uk \
    --to=chris@chris-wilson.co.uk \
    --cc=intel-gfx@lists.freedesktop.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=penberg@kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

Intel-GFX Archive on lore.kernel.org

Archives are clonable:
	git clone --mirror https://lore.kernel.org/intel-gfx/0 intel-gfx/git/0.git
	git clone --mirror https://lore.kernel.org/intel-gfx/1 intel-gfx/git/1.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 intel-gfx intel-gfx/ https://lore.kernel.org/intel-gfx \
		intel-gfx@lists.freedesktop.org
	public-inbox-index intel-gfx

Example config snippet for mirrors

Newsgroup available over NNTP:
	nntp://nntp.lore.kernel.org/org.freedesktop.lists.intel-gfx


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git