[Intel-gfx] [PATCH 2/5] drm/i915: s/intel_workarouns_ring/intel_render_workarounds/

[Dave Gordon]

On 19/11/14 23:33, Daniel Vetter wrote:
> Since it's not for the rings but engine, and its specifically for
> render state and workarounds.
> 
> Note that there's a massive s/ring/engine/ required all over the
> driver, but that's really not part of this patch here. So I've leaft
> the paramter names as-is.
> 
> Signed-off-by: Daniel Vetter <daniel.vetter at intel.com>
> ---

Code is fine, but the commit message contains several typos.
s/leaft/left/ and s/paramter/parameter/ don't really matter,
but the one in the subject line is a bit more important.
It should be "s/init_workarounds_ring/init_render_workarounds/",
with no mention of "intel_" !

Once that's corrected, then

Reviewed-by: Dave Gordon <david.s.gordon at intel.com>

.Dave.

>  drivers/gpu/drm/i915/intel_lrc.c        | 2 +-
>  drivers/gpu/drm/i915/intel_ringbuffer.c | 4 ++--
>  drivers/gpu/drm/i915/intel_ringbuffer.h | 2 +-
>  3 files changed, 4 insertions(+), 4 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/intel_lrc.c b/drivers/gpu/drm/i915/intel_lrc.c
> index 5e14316c80d0..25a2c2b45c6e 100644
> --- a/drivers/gpu/drm/i915/intel_lrc.c
> +++ b/drivers/gpu/drm/i915/intel_lrc.c
> @@ -1165,7 +1165,7 @@ static int gen8_init_render_ring(struct intel_engine_cs *ring)
>  
>  	I915_WRITE(INSTPM, _MASKED_BIT_ENABLE(INSTPM_FORCE_ORDERING));
>  
> -	return init_workarounds_ring(ring);
> +	return init_render_workarounds(ring);
>  }
>  
>  static int gen8_emit_bb_start(struct intel_ringbuffer *ringbuf,
> diff --git a/drivers/gpu/drm/i915/intel_ringbuffer.c b/drivers/gpu/drm/i915/intel_ringbuffer.c
> index 367a715a044c..24af1e33a314 100644
> --- a/drivers/gpu/drm/i915/intel_ringbuffer.c
> +++ b/drivers/gpu/drm/i915/intel_ringbuffer.c
> @@ -803,7 +803,7 @@ static int chv_init_workarounds(struct intel_engine_cs *ring)
>  	return 0;
>  }
>  
> -int init_workarounds_ring(struct intel_engine_cs *ring)
> +int init_render_workarounds(struct intel_engine_cs *ring)
>  {
>  	struct drm_device *dev = ring->dev;
>  	struct drm_i915_private *dev_priv = dev->dev_private;
> @@ -876,7 +876,7 @@ static int init_render_ring(struct intel_engine_cs *ring)
>  	if (HAS_L3_DPF(dev))
>  		I915_WRITE_IMR(ring, ~GT_PARITY_ERROR(dev));
>  
> -	return init_workarounds_ring(ring);
> +	return init_render_workarounds(ring);
>  }
>  
>  static void render_ring_cleanup(struct intel_engine_cs *ring)
> diff --git a/drivers/gpu/drm/i915/intel_ringbuffer.h b/drivers/gpu/drm/i915/intel_ringbuffer.h
> index 5033cd0d0580..f5cfab0d162b 100644
> --- a/drivers/gpu/drm/i915/intel_ringbuffer.h
> +++ b/drivers/gpu/drm/i915/intel_ringbuffer.h
> @@ -429,7 +429,7 @@ int intel_init_vebox_ring_buffer(struct drm_device *dev);
>  u64 intel_ring_get_active_head(struct intel_engine_cs *ring);
>  void intel_ring_setup_status_page(struct intel_engine_cs *ring);
>  
> -int init_workarounds_ring(struct intel_engine_cs *ring);
> +int init_render_workarounds(struct intel_engine_cs *ring);
>  
>  static inline u32 intel_ring_get_tail(struct intel_ringbuffer *ringbuf)
>  {
>