From: Ben Widawsky <benjamin.widawsky@intel.com>
To: Intel GFX <intel-gfx@lists.freedesktop.org>
Cc: Ben Widawsky <ben@bwidawsk.net>,
Ben Widawsky <benjamin.widawsky@intel.com>
Subject: [PATCH 09/17] drm/i915: init ring->id early
Date: Fri, 13 Dec 2013 20:15:57 -0800 [thread overview]
Message-ID: <1386994565-29395-10-git-send-email-benjamin.widawsky@intel.com> (raw)
In-Reply-To: <1386994565-29395-1-git-send-email-benjamin.widawsky@intel.com>
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 <ben@bwidawsk.net>
---
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
next prev parent reply other threads:[~2013-12-14 4:16 UTC|newest]
Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-12-14 4:15 [PATCH 00/17] Broadwell HW semaphores Ben Widawsky
2013-12-14 4:15 ` [PATCH 01/17] drm/i915: Reorder/respace MI instruction definition Ben Widawsky
2013-12-14 4:15 ` [PATCH 02/17] drm/i915: Don't emit mbox updates without semaphores Ben Widawsky
2013-12-14 4:15 ` [PATCH 03/17] drm/i915: Move semaphore specific ring members to struct Ben Widawsky
2013-12-14 4:15 ` [PATCH 04/17] drm/i915: Virtualize the ringbuffer signal func Ben Widawsky
2013-12-14 4:15 ` [PATCH 05/17] drm/i915: Move ring_begin to signal() Ben Widawsky
2013-12-14 9:05 ` Chris Wilson
2013-12-14 18:42 ` Ben Widawsky
2013-12-14 19:27 ` [PATCH 05/17] [v2] " Ben Widawsky
2013-12-14 4:15 ` [PATCH 06/17] drm/i915: Make semaphore updates more precise Ben Widawsky
2013-12-14 4:15 ` [PATCH 07/17] drm/i915: gen specific semaphore info Ben Widawsky
2013-12-14 4:17 ` Ben Widawsky
2013-12-14 5:46 ` [PATCH 07/17] [v2] drm/i915: gen specific ring init Ben Widawsky
2013-12-14 4:15 ` [PATCH 08/17] drm/i915: Create for_all_rings Ben Widawsky
2013-12-14 4:15 ` Ben Widawsky [this message]
2013-12-14 21:45 ` [PATCH 09/17] drm/i915: init ring->id early Chris Wilson
2013-12-15 1:42 ` Ben Widawsky
2013-12-15 9:24 ` Chris Wilson
2013-12-15 20:13 ` Ben Widawsky
2013-12-14 4:15 ` [PATCH 10/17] drm/i915/bdw: implement semaphore signal Ben Widawsky
2013-12-14 4:15 ` [PATCH 11/17] drm/i915/bdw: implement semaphore wait Ben Widawsky
2013-12-14 4:16 ` [PATCH 12/17] drm/i915: FORCE_RESTORE for gen8 semaphores Ben Widawsky
2013-12-14 4:16 ` [PATCH 13/17] drm/i915/bdw: poll semaphores Ben Widawsky
2013-12-14 4:16 ` [PATCH 14/17] drm/i915: Extract semaphore error collection Ben Widawsky
2013-12-14 4:16 ` [PATCH 15/17] drm/i915/bdw: collect semaphore error state Ben Widawsky
2013-12-14 19:47 ` Ben Widawsky
2013-12-14 21:38 ` Chris Wilson
2013-12-15 1:48 ` Ben Widawsky
2013-12-15 9:18 ` Chris Wilson
2013-12-15 20:07 ` [PATCH 15/17] [v3] " Ben Widawsky
2013-12-14 4:16 ` [PATCH 16/17] drm/i915: unleash semaphores on gen8 Ben Widawsky
2013-12-14 4:16 ` [PATCH 17/17] drm/i915: semaphore debugfs Ben Widawsky
2013-12-14 9:08 ` [PATCH 00/17] Broadwell HW semaphores Chris Wilson
2013-12-14 19:39 ` Ben Widawsky
2013-12-14 21:16 ` Chris Wilson
2013-12-14 21:25 ` Ben Widawsky
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1386994565-29395-10-git-send-email-benjamin.widawsky@intel.com \
--to=benjamin.widawsky@intel.com \
--cc=ben@bwidawsk.net \
--cc=intel-gfx@lists.freedesktop.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox