Re: [PATCH 5/5] drm/i915: More renaming of rings to engines

Chris Wilson
2016-03-16T11:15:27Z

On Wed, Mar 16, 2016 at 11:00:40AM +0000, Tvrtko Ursulin wrote:
> 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;

Missing the lrc engines

> --- a/drivers/gpu/drm/i915/i915_gem_execbuffer.c
> +++ b/drivers/gpu/drm/i915/i915_gem_execbuffer.c
> @@ -1369,7 +1369,7 @@ eb_get_batch(struct eb_vmas *eb)
>
> #define I915_USER_RINGS (4)
>
> -static const enum intel_ring_id user_ring_map[I915_USER_RINGS + 1] = {
> +static const enum intel_engine_id user_ring_map[I915_USER_RINGS + 1] = {
> [I915_EXEC_DEFAULT] = RCS,
> [I915_EXEC_RENDER] = RCS,
> [I915_EXEC_BLT] = BCS,

Now user engines;

> @@ -1417,7 +1417,7 @@ eb_select_ring(struct drm_i915_private *dev_priv,
select_engine

Haven't looked outside of the patches for missing changes, but they will
stand out as we update the code nevertheless.

Do it, do it now.
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
-Chris

--
Chris Wilson, Intel Open Source Technology Centre