All of lore.kernel.org
 help / color / mirror / Atom feed
From: Mika Kuoppala <mika.kuoppala@linux.intel.com>
To: Chris Wilson <chris@chris-wilson.co.uk>, intel-gfx@lists.freedesktop.org
Subject: Re: [PATCH 2/3] drm/i915: Rename ring->outstanding_lazy_request
Date: Wed, 04 Sep 2013 15:05:25 +0300	[thread overview]
Message-ID: <87li3ceqre.fsf@gaia.fi.intel.com> (raw)
In-Reply-To: <1378287952-29783-2-git-send-email-chris@chris-wilson.co.uk>

Chris Wilson <chris@chris-wilson.co.uk> writes:

Reviewed-by: Mika Kuoppala <mika.kuoppala@intel.com>

> Prior to preallocating an request for lazy emission, rename the existing
> field to make way (and differentiate the seqno from the request struct).
>
> Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
> ---
>  drivers/gpu/drm/i915/i915_gem.c         |  4 ++--
>  drivers/gpu/drm/i915/intel_ringbuffer.c | 18 +++++++++---------
>  drivers/gpu/drm/i915/intel_ringbuffer.h |  6 +++---
>  3 files changed, 14 insertions(+), 14 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
> index c31e0b2..588fae9 100644
> --- a/drivers/gpu/drm/i915/i915_gem.c
> +++ b/drivers/gpu/drm/i915/i915_gem.c
> @@ -964,7 +964,7 @@ i915_gem_check_olr(struct intel_ring_buffer *ring, u32 seqno)
>  	BUG_ON(!mutex_is_locked(&ring->dev->struct_mutex));
>  
>  	ret = 0;
> -	if (seqno == ring->outstanding_lazy_request)
> +	if (seqno == ring->outstanding_lazy_seqno)
>  		ret = i915_add_request(ring, NULL);
>  
>  	return ret;
> @@ -2113,7 +2113,7 @@ int __i915_add_request(struct intel_ring_buffer *ring,
>  	}
>  
>  	trace_i915_gem_request_add(ring, request->seqno);
> -	ring->outstanding_lazy_request = 0;
> +	ring->outstanding_lazy_seqno = 0;
>  
>  	if (!dev_priv->ums.mm_suspended) {
>  		i915_queue_hangcheck(ring->dev);
> diff --git a/drivers/gpu/drm/i915/intel_ringbuffer.c b/drivers/gpu/drm/i915/intel_ringbuffer.c
> index 460ee10..a83ff18 100644
> --- a/drivers/gpu/drm/i915/intel_ringbuffer.c
> +++ b/drivers/gpu/drm/i915/intel_ringbuffer.c
> @@ -593,7 +593,7 @@ update_mboxes(struct intel_ring_buffer *ring,
>  #define MBOX_UPDATE_DWORDS 4
>  	intel_ring_emit(ring, MI_LOAD_REGISTER_IMM(1));
>  	intel_ring_emit(ring, mmio_offset);
> -	intel_ring_emit(ring, ring->outstanding_lazy_request);
> +	intel_ring_emit(ring, ring->outstanding_lazy_seqno);
>  	intel_ring_emit(ring, MI_NOOP);
>  }
>  
> @@ -629,7 +629,7 @@ gen6_add_request(struct intel_ring_buffer *ring)
>  
>  	intel_ring_emit(ring, MI_STORE_DWORD_INDEX);
>  	intel_ring_emit(ring, I915_GEM_HWS_INDEX << MI_STORE_DWORD_INDEX_SHIFT);
> -	intel_ring_emit(ring, ring->outstanding_lazy_request);
> +	intel_ring_emit(ring, ring->outstanding_lazy_seqno);
>  	intel_ring_emit(ring, MI_USER_INTERRUPT);
>  	intel_ring_advance(ring);
>  
> @@ -723,7 +723,7 @@ pc_render_add_request(struct intel_ring_buffer *ring)
>  			PIPE_CONTROL_WRITE_FLUSH |
>  			PIPE_CONTROL_TEXTURE_CACHE_INVALIDATE);
>  	intel_ring_emit(ring, ring->scratch.gtt_offset | PIPE_CONTROL_GLOBAL_GTT);
> -	intel_ring_emit(ring, ring->outstanding_lazy_request);
> +	intel_ring_emit(ring, ring->outstanding_lazy_seqno);
>  	intel_ring_emit(ring, 0);
>  	PIPE_CONTROL_FLUSH(ring, scratch_addr);
>  	scratch_addr += 128; /* write to separate cachelines */
> @@ -742,7 +742,7 @@ pc_render_add_request(struct intel_ring_buffer *ring)
>  			PIPE_CONTROL_TEXTURE_CACHE_INVALIDATE |
>  			PIPE_CONTROL_NOTIFY);
>  	intel_ring_emit(ring, ring->scratch.gtt_offset | PIPE_CONTROL_GLOBAL_GTT);
> -	intel_ring_emit(ring, ring->outstanding_lazy_request);
> +	intel_ring_emit(ring, ring->outstanding_lazy_seqno);
>  	intel_ring_emit(ring, 0);
>  	intel_ring_advance(ring);
>  
> @@ -963,7 +963,7 @@ i9xx_add_request(struct intel_ring_buffer *ring)
>  
>  	intel_ring_emit(ring, MI_STORE_DWORD_INDEX);
>  	intel_ring_emit(ring, I915_GEM_HWS_INDEX << MI_STORE_DWORD_INDEX_SHIFT);
> -	intel_ring_emit(ring, ring->outstanding_lazy_request);
> +	intel_ring_emit(ring, ring->outstanding_lazy_seqno);
>  	intel_ring_emit(ring, MI_USER_INTERRUPT);
>  	intel_ring_advance(ring);
>  
> @@ -1475,7 +1475,7 @@ int intel_ring_idle(struct intel_ring_buffer *ring)
>  	int ret;
>  
>  	/* We need to add any requests required to flush the objects and ring */
> -	if (ring->outstanding_lazy_request) {
> +	if (ring->outstanding_lazy_seqno) {
>  		ret = i915_add_request(ring, NULL);
>  		if (ret)
>  			return ret;
> @@ -1495,10 +1495,10 @@ int intel_ring_idle(struct intel_ring_buffer *ring)
>  static int
>  intel_ring_alloc_seqno(struct intel_ring_buffer *ring)
>  {
> -	if (ring->outstanding_lazy_request)
> +	if (ring->outstanding_lazy_seqno)
>  		return 0;
>  
> -	return i915_gem_get_seqno(ring->dev, &ring->outstanding_lazy_request);
> +	return i915_gem_get_seqno(ring->dev, &ring->outstanding_lazy_seqno);
>  }
>  
>  static int __intel_ring_begin(struct intel_ring_buffer *ring,
> @@ -1545,7 +1545,7 @@ void intel_ring_init_seqno(struct intel_ring_buffer *ring, u32 seqno)
>  {
>  	struct drm_i915_private *dev_priv = ring->dev->dev_private;
>  
> -	BUG_ON(ring->outstanding_lazy_request);
> +	BUG_ON(ring->outstanding_lazy_seqno);
>  
>  	if (INTEL_INFO(ring->dev)->gen >= 6) {
>  		I915_WRITE(RING_SYNC_0(ring->mmio_base), 0);
> diff --git a/drivers/gpu/drm/i915/intel_ringbuffer.h b/drivers/gpu/drm/i915/intel_ringbuffer.h
> index 68b1ca974..c6aa2b3 100644
> --- a/drivers/gpu/drm/i915/intel_ringbuffer.h
> +++ b/drivers/gpu/drm/i915/intel_ringbuffer.h
> @@ -140,7 +140,7 @@ struct  intel_ring_buffer {
>  	/**
>  	 * Do we have some not yet emitted requests outstanding?
>  	 */
> -	u32 outstanding_lazy_request;
> +	u32 outstanding_lazy_seqno;
>  	bool gpu_caches_dirty;
>  	bool fbc_dirty;
>  
> @@ -258,8 +258,8 @@ static inline u32 intel_ring_get_tail(struct intel_ring_buffer *ring)
>  
>  static inline u32 intel_ring_get_seqno(struct intel_ring_buffer *ring)
>  {
> -	BUG_ON(ring->outstanding_lazy_request == 0);
> -	return ring->outstanding_lazy_request;
> +	BUG_ON(ring->outstanding_lazy_seqno == 0);
> +	return ring->outstanding_lazy_seqno;
>  }
>  
>  static inline void i915_trace_irq_get(struct intel_ring_buffer *ring, u32 seqno)
> -- 
> 1.8.4.rc3
>
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/intel-gfx

  reply	other threads:[~2013-09-04 12:05 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-09-04  9:45 [PATCH 1/3] drm/i915: Hold an object reference whilst we shrink it Chris Wilson
2013-09-04  9:45 ` [PATCH 2/3] drm/i915: Rename ring->outstanding_lazy_request Chris Wilson
2013-09-04 12:05   ` Mika Kuoppala [this message]
2013-09-04  9:45 ` [PATCH 3/3] drm/i915; Preallocate the lazy request Chris Wilson
2013-09-04 12:05   ` Mika Kuoppala
2013-09-05 10:16 ` [Intel-gfx] [PATCH 1/3] drm/i915: Hold an object reference whilst we shrink it Daniel Vetter
2013-09-05 10:28   ` Chris Wilson
2013-09-05 11:22     ` Daniel Vetter

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=87li3ceqre.fsf@gaia.fi.intel.com \
    --to=mika.kuoppala@linux.intel.com \
    --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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.