drm/i915: Drop verbose and archaic "ring" from our internal engine names

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@chris-wilson.co.uk>
Reviewed-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin@linux.intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/20170330134820.12273-1-chris@chris-wilson.co.uk

diff --git a/drivers/gpu/drm/i915/intel_engine_cs.c b/drivers/gpu/drm/i915/intel_engine_cs.c
index ef3c6200069738917e899bddf1c9967078c2f482..1fb97e8401de0fbc3beddbdd18be1b91303fe81d 100644 (file)
--- a/drivers/gpu/drm/i915/intel_engine_cs.c
+++ b/drivers/gpu/drm/i915/intel_engine_cs.c
@@ -36,45 +36,45 @@ static const struct engine_info {
        int (*init_execlists)(struct intel_engine_cs *engine);
 } intel_engines[] = {
        [RCS] = {
-               .name = "render ring",
-               .exec_id = I915_EXEC_RENDER,
+               .name = "rcs",
                .hw_id = RCS_HW,
+               .exec_id = I915_EXEC_RENDER,
                .mmio_base = RENDER_RING_BASE,
                .irq_shift = GEN8_RCS_IRQ_SHIFT,
                .init_execlists = logical_render_ring_init,
                .init_legacy = intel_init_render_ring_buffer,
        },
        [BCS] = {
-               .name = "blitter ring",
-               .exec_id = I915_EXEC_BLT,
+               .name = "bcs",
                .hw_id = BCS_HW,
+               .exec_id = I915_EXEC_BLT,
                .mmio_base = BLT_RING_BASE,
                .irq_shift = GEN8_BCS_IRQ_SHIFT,
                .init_execlists = logical_xcs_ring_init,
                .init_legacy = intel_init_blt_ring_buffer,
        },
        [VCS] = {
-               .name = "bsd ring",
-               .exec_id = I915_EXEC_BSD,
+               .name = "vcs",
                .hw_id = VCS_HW,
+               .exec_id = I915_EXEC_BSD,
                .mmio_base = GEN6_BSD_RING_BASE,
                .irq_shift = GEN8_VCS1_IRQ_SHIFT,
                .init_execlists = logical_xcs_ring_init,
                .init_legacy = intel_init_bsd_ring_buffer,
        },
        [VCS2] = {
-               .name = "bsd2 ring",
-               .exec_id = I915_EXEC_BSD,
+               .name = "vcs2",
                .hw_id = VCS2_HW,
+               .exec_id = I915_EXEC_BSD,
                .mmio_base = GEN8_BSD2_RING_BASE,
                .irq_shift = GEN8_VCS2_IRQ_SHIFT,
                .init_execlists = logical_xcs_ring_init,
                .init_legacy = intel_init_bsd2_ring_buffer,
        },
        [VECS] = {
-               .name = "video enhancement ring",
-               .exec_id = I915_EXEC_VEBOX,
+               .name = "vecs",
                .hw_id = VECS_HW,
+               .exec_id = I915_EXEC_VEBOX,
                .mmio_base = VEBOX_RING_BASE,
                .irq_shift = GEN8_VECS_IRQ_SHIFT,
                .init_execlists = logical_xcs_ring_init,