From: Ben Widawsky <ben@bwidawsk.net>
To: Chris Wilson <chris@chris-wilson.co.uk>
Cc: intel-gfx@lists.freedesktop.org
Subject: Re: [PATCH 2/3] drm/i915: Move the irq wait queue initialisation into the ring init
Date: Wed, 13 Apr 2011 23:20:19 -0700 [thread overview]
Message-ID: <20110414062019.GA10182@lundgren.kumite> (raw)
In-Reply-To: <1302683305-19417-3-git-send-email-chris@chris-wilson.co.uk>
On Wed, Apr 13, 2011 at 09:28:24AM +0100, Chris Wilson wrote:
> Required so that we don't obliterate the queue if initialising the
> rings after the global IRQ handler is installed.
>
> [Jesse, you recently looked at refactoring the IRQ installation
> routines, does moving the initialisation of ring buffer data structures away
> from that routine make sense in your grand scheme?]
>
> Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
> Cc: Jesse Barnes <jbarnes@virtuousgeek.org>
> ---
> 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;
>
I don't really understand why we went from DRM_INIT_WAITQUEUE to
init_waitqueue_head, but I'm okay with it.
Reviewed-by: Ben Widawsky <ben@bwidawsk.net>
next prev parent reply other threads:[~2011-04-14 6:20 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-04-13 8:28 i915 fixes Chris Wilson
2011-04-13 8:28 ` [PATCH 1/3] drm/i915: Initialise g4x watermarks for disabled pipes Chris Wilson
2011-04-13 8:28 ` [PATCH 2/3] drm/i915: Move the irq wait queue initialisation into the ring init Chris Wilson
2011-04-14 6:20 ` Ben Widawsky [this message]
2011-04-14 6:58 ` Chris Wilson
2011-04-13 8:28 ` [PATCH 3/3] drm/i915: Disable all outputs early, before KMS takeover Chris Wilson
2011-04-14 6:23 ` Ben Widawsky
2011-04-13 16:30 ` i915 fixes Keith Packard
2011-04-13 16:49 ` Chris Wilson
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=20110414062019.GA10182@lundgren.kumite \
--to=ben@bwidawsk.net \
--cc=chris@chris-wilson.co.uk \
--cc=intel-gfx@lists.freedesktop.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
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).