[Intel-gfx] [PATCH 15/31] drm/i915: Rename residual ringbuf parameters

Joonas Lahtinen joonas.lahtinen at linux.intel.com
Mon Jul 25 08:58:37 UTC 2016


On ma, 2016-07-25 at 08:44 +0100, Chris Wilson wrote:
> Now that we have a clear ring/engine split and a struct intel_ring, we
> no longer need the stopgap ringbuf names.

+1 vote for squashing related renames, should be make picking them
later easier, unless there is huge pieces of code in between.

> 
> Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>
> ---
>  drivers/gpu/drm/i915/intel_ringbuffer.c | 66 ++++++++++++++++-----------------
>  drivers/gpu/drm/i915/intel_ringbuffer.h |  6 +--
>  2 files changed, 36 insertions(+), 36 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/intel_ringbuffer.c b/drivers/gpu/drm/i915/intel_ringbuffer.c
> index 90572b862eec..5ff44eb46f55 100644
> --- a/drivers/gpu/drm/i915/intel_ringbuffer.c
> +++ b/drivers/gpu/drm/i915/intel_ringbuffer.c
> @@ -47,15 +47,15 @@ int __intel_ring_space(int head, int tail, int size)
>  	return space - I915_RING_FREE_SPACE;
>  }
>  
> -void intel_ring_update_space(struct intel_ring *ringbuf)
> +void intel_ring_update_space(struct intel_ring *ring)
>  {
> -	if (ringbuf->last_retired_head != -1) {
> -		ringbuf->head = ringbuf->last_retired_head;
> -		ringbuf->last_retired_head = -1;
> +	if (ring->last_retired_head != -1) {
> +		ring->head = ring->last_retired_head;
> +		ring->last_retired_head = -1;
>  	}
>  
> -	ringbuf->space = __intel_ring_space(ringbuf->head & HEAD_ADDR,
> -					    ringbuf->tail, ringbuf->size);
> +	ring->space = __intel_ring_space(ring->head & HEAD_ADDR,
> +					 ring->tail, ring->size);

See, no getter function used here either for ring->tail and how clean
it looks.

Reviewed-by: Joonas Lahtinen <joonas.lahtinen at linux.intel.com>

Regards, Joonas
-- 
Joonas Lahtinen
Open Source Technology Center
Intel Corporation


More information about the Intel-gfx mailing list