From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jesse Barnes Subject: Re: [PATCH 7/8] drm/i915: Generalize intel_ring_get_tail to take a ringbuf Date: Mon, 30 Jun 2014 13:59:01 -0700 Message-ID: <20140630135901.0a77b748@jbarnes-desktop> References: <1403789059-5692-1-git-send-email-oscar.mateo@intel.com> <1403789059-5692-8-git-send-email-oscar.mateo@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from mail-pa0-f46.google.com (mail-pa0-f46.google.com [209.85.220.46]) by gabe.freedesktop.org (Postfix) with ESMTP id B9B806E215 for ; Mon, 30 Jun 2014 13:58:20 -0700 (PDT) Received: by mail-pa0-f46.google.com with SMTP id eu11so9307811pac.33 for ; Mon, 30 Jun 2014 13:58:20 -0700 (PDT) In-Reply-To: <1403789059-5692-8-git-send-email-oscar.mateo@intel.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: oscar.mateo@intel.com Cc: intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org On Thu, 26 Jun 2014 14:24:18 +0100 oscar.mateo@intel.com wrote: > From: Oscar Mateo > > Again, it's low-level enough to simply take a ringbuf and nothing > else. > > Trivial change. > > Signed-off-by: Oscar Mateo > --- > drivers/gpu/drm/i915/i915_gem.c | 4 ++-- > drivers/gpu/drm/i915/intel_ringbuffer.h | 4 ++-- > 2 files changed, 4 insertions(+), 4 deletions(-) > > diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c > index f6d1238..ac7d50a 100644 > --- a/drivers/gpu/drm/i915/i915_gem.c > +++ b/drivers/gpu/drm/i915/i915_gem.c > @@ -2330,7 +2330,7 @@ int __i915_add_request(struct intel_engine_cs *ring, > u32 request_ring_position, request_start; > int ret; > > - request_start = intel_ring_get_tail(ring); > + request_start = intel_ring_get_tail(ring->buffer); > /* > * Emit any outstanding flushes - execbuf can fail to emit the flush > * after having emitted the batchbuffer command. Hence we need to fix > @@ -2351,7 +2351,7 @@ int __i915_add_request(struct intel_engine_cs *ring, > * GPU processing the request, we never over-estimate the > * position of the head. > */ > - request_ring_position = intel_ring_get_tail(ring); > + request_ring_position = intel_ring_get_tail(ring->buffer); > > ret = ring->add_request(ring); > if (ret) > diff --git a/drivers/gpu/drm/i915/intel_ringbuffer.h b/drivers/gpu/drm/i915/intel_ringbuffer.h > index e72017b..070568b 100644 > --- a/drivers/gpu/drm/i915/intel_ringbuffer.h > +++ b/drivers/gpu/drm/i915/intel_ringbuffer.h > @@ -318,9 +318,9 @@ int intel_init_vebox_ring_buffer(struct drm_device *dev); > u64 intel_ring_get_active_head(struct intel_engine_cs *ring); > void intel_ring_setup_status_page(struct intel_engine_cs *ring); > > -static inline u32 intel_ring_get_tail(struct intel_engine_cs *ring) > +static inline u32 intel_ring_get_tail(struct intel_ringbuffer *ringbuf) > { > - return ring->buffer->tail; > + return ringbuf->tail; > } > > static inline u32 intel_ring_get_seqno(struct intel_engine_cs *ring) Reviewed-by: Jesse Barnes -- Jesse Barnes, Intel Open Source Technology Center