[Intel-gfx] [PATCH 42/53] drm/i915: Update ring->dispatch_execbuffer() to take a request structure

[Tomas Elf]

On 19/02/2015 17:17, John.C.Harrison at Intel.com wrote:
> From: John Harrison <John.C.Harrison at Intel.com>
>
> Updated the various ring->dispatch_execbuffer() implementations to take a
> request instead of a ring.
>
> For: VIZ-5115
> Signed-off-by: John Harrison <John.C.Harrison at Intel.com>
> ---
>   drivers/gpu/drm/i915/i915_gem_execbuffer.c   |    4 ++--
>   drivers/gpu/drm/i915/i915_gem_render_state.c |    3 +--
>   drivers/gpu/drm/i915/intel_ringbuffer.c      |   18 ++++++++++++------
>   drivers/gpu/drm/i915/intel_ringbuffer.h      |    2 +-
>   4 files changed, 16 insertions(+), 11 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/i915_gem_execbuffer.c b/drivers/gpu/drm/i915/i915_gem_execbuffer.c
> index a79c893..8b4f8a9 100644
> --- a/drivers/gpu/drm/i915/i915_gem_execbuffer.c
> +++ b/drivers/gpu/drm/i915/i915_gem_execbuffer.c
> @@ -1265,14 +1265,14 @@ i915_gem_ringbuffer_submission(struct i915_execbuffer_params *params,
>   			if (ret)
>   				goto error;
>
> -			ret = ring->dispatch_execbuffer(ring,
> +			ret = ring->dispatch_execbuffer(params->request,
>   							exec_start, exec_len,
>   							params->dispatch_flags);
>   			if (ret)
>   				goto error;
>   		}
>   	} else {
> -		ret = ring->dispatch_execbuffer(ring,
> +		ret = ring->dispatch_execbuffer(params->request,
>   						exec_start, exec_len,
>   						params->dispatch_flags);
>   		if (ret)
> diff --git a/drivers/gpu/drm/i915/i915_gem_render_state.c b/drivers/gpu/drm/i915/i915_gem_render_state.c
> index 866274c..cdf2fee 100644
> --- a/drivers/gpu/drm/i915/i915_gem_render_state.c
> +++ b/drivers/gpu/drm/i915/i915_gem_render_state.c
> @@ -164,8 +164,7 @@ int i915_gem_render_state_init(struct drm_i915_gem_request *req)
>   	if (so.rodata == NULL)
>   		return 0;
>
> -	ret = req->ring->dispatch_execbuffer(req->ring,
> -					     so.ggtt_offset,
> +	ret = req->ring->dispatch_execbuffer(req, so.ggtt_offset,
>   					     so.rodata->batch_items * 4,
>   					     I915_DISPATCH_SECURE);
>   	if (ret)
> diff --git a/drivers/gpu/drm/i915/intel_ringbuffer.c b/drivers/gpu/drm/i915/intel_ringbuffer.c
> index 99f0dd1..87612f1 100644
> --- a/drivers/gpu/drm/i915/intel_ringbuffer.c
> +++ b/drivers/gpu/drm/i915/intel_ringbuffer.c
> @@ -1694,10 +1694,11 @@ gen8_ring_put_irq(struct intel_engine_cs *ring)
>   }
>
>   static int
> -i965_dispatch_execbuffer(struct intel_engine_cs *ring,
> +i965_dispatch_execbuffer(struct drm_i915_gem_request *req,
>   			 u64 offset, u32 length,
>   			 unsigned dispatch_flags)
>   {
> +	struct intel_engine_cs *ring = req->ring;
>   	int ret;
>
>   	ret = intel_ring_begin(ring, 2);
> @@ -1720,10 +1721,11 @@ i965_dispatch_execbuffer(struct intel_engine_cs *ring,
>   #define I830_TLB_ENTRIES (2)
>   #define I830_WA_SIZE max(I830_TLB_ENTRIES*4096, I830_BATCH_LIMIT)
>   static int
> -i830_dispatch_execbuffer(struct intel_engine_cs *ring,
> +i830_dispatch_execbuffer(struct drm_i915_gem_request *req,
>   			 u64 offset, u32 len,
>   			 unsigned dispatch_flags)
>   {
> +	struct intel_engine_cs *ring = req->ring;
>   	u32 cs_offset = ring->scratch.gtt_offset;
>   	int ret;
>
> @@ -1782,10 +1784,11 @@ i830_dispatch_execbuffer(struct intel_engine_cs *ring,
>   }
>
>   static int
> -i915_dispatch_execbuffer(struct intel_engine_cs *ring,
> +i915_dispatch_execbuffer(struct drm_i915_gem_request *req,
>   			 u64 offset, u32 len,
>   			 unsigned dispatch_flags)
>   {
> +	struct intel_engine_cs *ring = req->ring;
>   	int ret;
>
>   	ret = intel_ring_begin(ring, 2);
> @@ -2370,10 +2373,11 @@ static int gen6_bsd_ring_flush(struct drm_i915_gem_request *req,
>   }
>
>   static int
> -gen8_ring_dispatch_execbuffer(struct intel_engine_cs *ring,
> +gen8_ring_dispatch_execbuffer(struct drm_i915_gem_request *req,
>   			      u64 offset, u32 len,
>   			      unsigned dispatch_flags)
>   {
> +	struct intel_engine_cs *ring = req->ring;
>   	bool ppgtt = USES_PPGTT(ring->dev) &&
>   			!(dispatch_flags & I915_DISPATCH_SECURE);
>   	int ret;
> @@ -2393,10 +2397,11 @@ gen8_ring_dispatch_execbuffer(struct intel_engine_cs *ring,
>   }
>
>   static int
> -hsw_ring_dispatch_execbuffer(struct intel_engine_cs *ring,
> +hsw_ring_dispatch_execbuffer(struct drm_i915_gem_request *req,
>   			     u64 offset, u32 len,
>   			     unsigned dispatch_flags)
>   {
> +	struct intel_engine_cs *ring = req->ring;
>   	int ret;
>
>   	ret = intel_ring_begin(ring, 2);
> @@ -2415,10 +2420,11 @@ hsw_ring_dispatch_execbuffer(struct intel_engine_cs *ring,
>   }
>
>   static int
> -gen6_ring_dispatch_execbuffer(struct intel_engine_cs *ring,
> +gen6_ring_dispatch_execbuffer(struct drm_i915_gem_request *req,
>   			      u64 offset, u32 len,
>   			      unsigned dispatch_flags)
>   {
> +	struct intel_engine_cs *ring = req->ring;
>   	int ret;
>
>   	ret = intel_ring_begin(ring, 2);
> diff --git a/drivers/gpu/drm/i915/intel_ringbuffer.h b/drivers/gpu/drm/i915/intel_ringbuffer.h
> index d8300f2..0b03b3a 100644
> --- a/drivers/gpu/drm/i915/intel_ringbuffer.h
> +++ b/drivers/gpu/drm/i915/intel_ringbuffer.h
> @@ -161,7 +161,7 @@ struct  intel_engine_cs {
>   				     bool lazy_coherency);
>   	void		(*set_seqno)(struct intel_engine_cs *ring,
>   				     u32 seqno);
> -	int		(*dispatch_execbuffer)(struct intel_engine_cs *ring,
> +	int		(*dispatch_execbuffer)(struct drm_i915_gem_request *req,
>   					       u64 offset, u32 length,
>   					       unsigned dispatch_flags);
>   #define I915_DISPATCH_SECURE 0x1
>

Reviewed-by: Tomas Elf <tomas.elf at intel.com>

Thanks,
Tomas