From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ben Widawsky 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 Message-ID: <20110414062019.GA10182@lundgren.kumite> References: <1302683305-19417-1-git-send-email-chris@chris-wilson.co.uk> <1302683305-19417-3-git-send-email-chris@chris-wilson.co.uk> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from cloud01.chad-versace.us (184-106-247-128.static.cloud-ips.com [184.106.247.128]) by gabe.freedesktop.org (Postfix) with ESMTP id 635469F51B for ; Wed, 13 Apr 2011 23:20:33 -0700 (PDT) Content-Disposition: inline In-Reply-To: <1302683305-19417-3-git-send-email-chris@chris-wilson.co.uk> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: intel-gfx-bounces+gcfxdi-intel-gfx=m.gmane.org@lists.freedesktop.org Errors-To: intel-gfx-bounces+gcfxdi-intel-gfx=m.gmane.org@lists.freedesktop.org To: Chris Wilson Cc: intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org 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 > Cc: Jesse Barnes > --- > 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