Having the ring id all set up will allow us to use some macro shortcuts during ringbuffer init. Admittedly it leaves the code a bit confusing, having the initialization of the id member in a separate place - but I think the savings is worth it.
Signed-off-by: Ben Widawsky <[email protected]> --- drivers/gpu/drm/i915/i915_gem.c | 6 +++++- drivers/gpu/drm/i915/intel_ringbuffer.c | 4 ---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c index 820328d..ba8f0f4 100644 --- a/drivers/gpu/drm/i915/i915_gem.c +++ b/drivers/gpu/drm/i915/i915_gem.c @@ -4420,7 +4420,11 @@ intel_enable_blt(struct drm_device *dev) static int i915_gem_init_rings(struct drm_device *dev) { struct drm_i915_private *dev_priv = dev->dev_private; - int ret; + struct intel_ring_buffer *ring; + int ret, i; + + for_all_rings(ring, dev_priv, i) + dev_priv->ring[i].id = i; ret = intel_init_render_ring_buffer(dev); if (ret) diff --git a/drivers/gpu/drm/i915/intel_ringbuffer.c b/drivers/gpu/drm/i915/intel_ringbuffer.c index 3b30780..889668d 100644 --- a/drivers/gpu/drm/i915/intel_ringbuffer.c +++ b/drivers/gpu/drm/i915/intel_ringbuffer.c @@ -1855,7 +1855,6 @@ int intel_init_render_ring_buffer(struct drm_device *dev) struct intel_ring_buffer *ring = &dev_priv->ring[RCS]; ring->name = "render ring"; - ring->id = RCS; ring->mmio_base = RENDER_RING_BASE; if (INTEL_INFO(dev)->gen >= 8) { @@ -2041,7 +2040,6 @@ int intel_init_bsd_ring_buffer(struct drm_device *dev) struct intel_ring_buffer *ring = &dev_priv->ring[VCS]; ring->name = "bsd ring"; - ring->id = VCS; ring->write_tail = ring_write_tail; if (INTEL_INFO(dev)->gen >= 6) { @@ -2117,7 +2115,6 @@ int intel_init_blt_ring_buffer(struct drm_device *dev) struct intel_ring_buffer *ring = &dev_priv->ring[BCS]; ring->name = "blitter ring"; - ring->id = BCS; ring->mmio_base = BLT_RING_BASE; ring->write_tail = ring_write_tail; @@ -2171,7 +2168,6 @@ int intel_init_vebox_ring_buffer(struct drm_device *dev) struct intel_ring_buffer *ring = &dev_priv->ring[VECS]; ring->name = "video enhancement ring"; - ring->id = VECS; ring->mmio_base = VEBOX_RING_BASE; ring->write_tail = ring_write_tail; -- 1.8.5.1 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
