[Intel-gfx] [PATCH 5/5] drm/i915: More renaming of rings to engines

[Chris Wilson]

On Thu, Mar 10, 2016 at 02:21:08PM +0000, Tvrtko Ursulin wrote:
> @@ -4952,14 +4952,14 @@ int i915_gem_init(struct drm_device *dev)
>  
>  	if (!i915.enable_execlists) {
>  		dev_priv->gt.execbuf_submit = i915_gem_ringbuffer_submission;
> -		dev_priv->gt.init_rings = i915_gem_init_rings;
> -		dev_priv->gt.cleanup_ring = intel_cleanup_ring_buffer;
> -		dev_priv->gt.stop_ring = intel_stop_ring_buffer;
> +		dev_priv->gt.init_engines = i915_gem_init_engines;
> +		dev_priv->gt.cleanup_engine = intel_cleanup_engine;
> +		dev_priv->gt.stop_engine = intel_stop_engine;
>  	} else {
>  		dev_priv->gt.execbuf_submit = intel_execlists_submission;
> -		dev_priv->gt.init_rings = intel_logical_rings_init;
> -		dev_priv->gt.cleanup_ring = intel_logical_ring_cleanup;
> -		dev_priv->gt.stop_ring = intel_logical_ring_stop;
> +		dev_priv->gt.init_engines = intel_logical_rings_init;
> +		dev_priv->gt.cleanup_engine = intel_logical_ring_cleanup;
> +		dev_priv->gt.stop_engine = intel_logical_ring_stop;

Making these changes manually or another patch?
-Chris

-- 
Chris Wilson, Intel Open Source Technology Centre