[Intel-gfx] [PATCH 46/53] drm/i915: Update cacheline_align() 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 intel_ring_cacheline_align() 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/intel_display.c    |    2 +-
>   drivers/gpu/drm/i915/intel_ringbuffer.c |    3 ++-
>   drivers/gpu/drm/i915/intel_ringbuffer.h |    2 +-
>   3 files changed, 4 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
> index 9cbfb93..7962946 100644
> --- a/drivers/gpu/drm/i915/intel_display.c
> +++ b/drivers/gpu/drm/i915/intel_display.c
> @@ -9438,7 +9438,7 @@ static int intel_gen7_queue_flip(struct drm_device *dev,
>   	 * then do the cacheline alignment, and finally emit the
>   	 * MI_DISPLAY_FLIP.
>   	 */
> -	ret = intel_ring_cacheline_align(ring);
> +	ret = intel_ring_cacheline_align(req);
>   	if (ret)
>   		return ret;
>
> diff --git a/drivers/gpu/drm/i915/intel_ringbuffer.c b/drivers/gpu/drm/i915/intel_ringbuffer.c
> index 440356d..109f283 100644
> --- a/drivers/gpu/drm/i915/intel_ringbuffer.c
> +++ b/drivers/gpu/drm/i915/intel_ringbuffer.c
> @@ -2258,8 +2258,9 @@ int intel_ring_begin(struct intel_engine_cs *ring,
>   }
>
>   /* Align the ring tail to a cacheline boundary */
> -int intel_ring_cacheline_align(struct intel_engine_cs *ring)
> +int intel_ring_cacheline_align(struct drm_i915_gem_request *req)
>   {
> +	struct intel_engine_cs *ring = req->ring;
>   	int num_dwords = (ring->buffer->tail & (CACHELINE_BYTES - 1)) / sizeof(uint32_t);
>   	int ret;
>
> diff --git a/drivers/gpu/drm/i915/intel_ringbuffer.h b/drivers/gpu/drm/i915/intel_ringbuffer.h
> index 7c1e0f5..80eb399 100644
> --- a/drivers/gpu/drm/i915/intel_ringbuffer.h
> +++ b/drivers/gpu/drm/i915/intel_ringbuffer.h
> @@ -387,7 +387,7 @@ void intel_stop_ring_buffer(struct intel_engine_cs *ring);
>   void intel_cleanup_ring_buffer(struct intel_engine_cs *ring);
>
>   int __must_check intel_ring_begin(struct intel_engine_cs *ring, int n);
> -int __must_check intel_ring_cacheline_align(struct intel_engine_cs *ring);
> +int __must_check intel_ring_cacheline_align(struct drm_i915_gem_request *req);
>   int __must_check intel_ring_alloc_request(struct intel_engine_cs *ring,
>   					  struct intel_context *ctx,
>   					  struct drm_i915_gem_request **req_out);
>

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

Thanks,
Tomas