[Intel-gfx] [PATCH 28/62] drm/i915: Rename backpointer from intel_ringbuffer to intel_engine_cs

[Tvrtko Ursulin]

On 03/06/16 17:36, Chris Wilson wrote:
> Having ringbuf->ring point to an engine is confusing, so rename it once
> again to ring->engine.

I don't see any backpointers here, must be more rebase noise.

Regards,

Tvrtko


> Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>
> ---
>   drivers/gpu/drm/i915/intel_ringbuffer.c | 14 +++++++-------
>   1 file changed, 7 insertions(+), 7 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/intel_ringbuffer.c b/drivers/gpu/drm/i915/intel_ringbuffer.c
> index 0f13e9900bd6..ab498ecce1ca 100644
> --- a/drivers/gpu/drm/i915/intel_ringbuffer.c
> +++ b/drivers/gpu/drm/i915/intel_ringbuffer.c
> @@ -2087,8 +2087,8 @@ static void intel_ring_context_unpin(struct i915_gem_context *ctx,
>   	i915_gem_context_put(ctx);
>   }
>
> -static int intel_init_ring_buffer(struct drm_device *dev,
> -				  struct intel_engine_cs *engine)
> +static int intel_init_engine(struct drm_device *dev,
> +			     struct intel_engine_cs *engine)
>   {
>   	struct drm_i915_private *dev_priv = to_i915(dev);
>   	struct intel_ringbuffer *ringbuf;
> @@ -2707,7 +2707,7 @@ int intel_init_render_ring_buffer(struct drm_device *dev)
>   	engine->init_hw = init_render_ring;
>   	engine->cleanup = render_ring_cleanup;
>
> -	ret = intel_init_ring_buffer(dev, engine);
> +	ret = intel_init_engine(dev, engine);
>   	if (ret)
>   		return ret;
>
> @@ -2794,7 +2794,7 @@ int intel_init_bsd_ring_buffer(struct drm_device *dev)
>   	}
>   	engine->init_hw = init_ring_common;
>
> -	return intel_init_ring_buffer(dev, engine);
> +	return intel_init_engine(dev, engine);
>   }
>
>   /**
> @@ -2828,7 +2828,7 @@ int intel_init_bsd2_ring_buffer(struct drm_device *dev)
>   	}
>   	engine->init_hw = init_ring_common;
>
> -	return intel_init_ring_buffer(dev, engine);
> +	return intel_init_engine(dev, engine);
>   }
>
>   int intel_init_blt_ring_buffer(struct drm_device *dev)
> @@ -2886,7 +2886,7 @@ int intel_init_blt_ring_buffer(struct drm_device *dev)
>   	}
>   	engine->init_hw = init_ring_common;
>
> -	return intel_init_ring_buffer(dev, engine);
> +	return intel_init_engine(dev, engine);
>   }
>
>   int intel_init_vebox_ring_buffer(struct drm_device *dev)
> @@ -2938,7 +2938,7 @@ int intel_init_vebox_ring_buffer(struct drm_device *dev)
>   	}
>   	engine->init_hw = init_ring_common;
>
> -	return intel_init_ring_buffer(dev, engine);
> +	return intel_init_engine(dev, engine);
>   }
>
>   int
>