[Intel-gfx] [PATCH] drm/i915: Drop verbose and archaic "ring" from our internal engine names

[Tvrtko Ursulin]

On 29/03/2017 23:04, Chris Wilson wrote:
> We pretty print the name of an engine in several places, mostly for
> debug, but also in the GPU hang report. Using "ring" in the name is
> archaic (we call those engines now to differentiate them from the
> multiple rings of commands we execute on each engine), quite verbose and
> often tautological. We run out of room in our GPU hang report for
> instance if we have more than a couple of engines hung simultaneously.
> Bit the bullet and update the strings to reflect the common internal names.
>
> Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>
> ---
>  drivers/gpu/drm/i915/intel_engine_cs.c | 10 +++++-----
>  1 file changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/intel_engine_cs.c b/drivers/gpu/drm/i915/intel_engine_cs.c
> index ff6d0e1d1306..7100ac688be5 100644
> --- a/drivers/gpu/drm/i915/intel_engine_cs.c
> +++ b/drivers/gpu/drm/i915/intel_engine_cs.c
> @@ -36,7 +36,7 @@ static const struct engine_info {
>  	int (*init_execlists)(struct intel_engine_cs *engine);
>  } intel_engines[] = {
>  	[RCS] = {
> -		.name = "render ring",
> +		.name = "rcs",
>  		.uabi_id = I915_EXEC_RENDER,
>  		.hw_id = RCS_HW,
>  		.mmio_base = RENDER_RING_BASE,
> @@ -45,7 +45,7 @@ static const struct engine_info {
>  		.init_legacy = intel_init_render_ring_buffer,
>  	},
>  	[BCS] = {
> -		.name = "blitter ring",
> +		.name = "bcs",
>  		.uabi_id = I915_EXEC_BLT,
>  		.hw_id = BCS_HW,
>  		.mmio_base = BLT_RING_BASE,
> @@ -54,7 +54,7 @@ static const struct engine_info {
>  		.init_legacy = intel_init_blt_ring_buffer,
>  	},
>  	[VCS] = {
> -		.name = "bsd ring",
> +		.name = "vcs",
>  		.uabi_id = I915_EXEC_BSD,
>  		.hw_id = VCS_HW,
>  		.mmio_base = GEN6_BSD_RING_BASE,
> @@ -63,7 +63,7 @@ static const struct engine_info {
>  		.init_legacy = intel_init_bsd_ring_buffer,
>  	},
>  	[VCS2] = {
> -		.name = "bsd2 ring",
> +		.name = "vcs2",
>  		.uabi_id = I915_EXEC_BSD2,
>  		.hw_id = VCS2_HW,
>  		.mmio_base = GEN8_BSD2_RING_BASE,
> @@ -72,7 +72,7 @@ static const struct engine_info {
>  		.init_legacy = intel_init_bsd2_ring_buffer,
>  	},
>  	[VECS] = {
> -		.name = "video enhancement ring",
> +		.name = "vecs",
>  		.uabi_id = I915_EXEC_VEBOX,
>  		.hw_id = VECS_HW,
>  		.mmio_base = VEBOX_RING_BASE,
>

I almost sent something like this a few times myself so no objections 
from me.

Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin at intel.com>

Regards,

Tvrtko