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 05/13] drm/i915: gen specific ring init
Date: Wed, 29 Jan 2014 11:55:25 -0800 [thread overview]
Message-ID: <1391025333-31587-6-git-send-email-benjamin.widawsky@intel.com> (raw)
In-Reply-To: <1391025333-31587-1-git-send-email-benjamin.widawsky@intel.com>
Gen8 has already had some differentiation with how it handles rings.
Semaphores bring yet more differences, and now is as good a time as any
to do the split.
Also, since gen8 doesn't actually use semaphores up until this point,
put the proper "NULL" values in for the mbox info.
v2: v1 had a stale commit message
Signed-off-by: Ben Widawsky <ben@bwidawsk.net>
---
drivers/gpu/drm/i915/intel_ringbuffer.c | 134 ++++++++++++++++++++++----------
1 file changed, 92 insertions(+), 42 deletions(-)
diff --git a/drivers/gpu/drm/i915/intel_ringbuffer.c b/drivers/gpu/drm/i915/intel_ringbuffer.c
index 97789ff..37ae2b1 100644
--- a/drivers/gpu/drm/i915/intel_ringbuffer.c
+++ b/drivers/gpu/drm/i915/intel_ringbuffer.c
@@ -1861,19 +1861,33 @@ int intel_init_render_ring_buffer(struct drm_device *dev)
ring->id = RCS;
ring->mmio_base = RENDER_RING_BASE;
- if (INTEL_INFO(dev)->gen >= 6) {
+ if (INTEL_INFO(dev)->gen >= 8) {
+ ring->add_request = gen6_add_request;
+ ring->flush = gen8_render_ring_flush;
+ ring->irq_get = gen8_ring_get_irq;
+ ring->irq_put = gen8_ring_put_irq;
+ ring->irq_enable_mask = GT_RENDER_USER_INTERRUPT;
+ ring->get_seqno = gen6_ring_get_seqno;
+ ring->set_seqno = ring_set_seqno;
+ ring->semaphore.sync_to = gen6_ring_sync;
+ if (i915_semaphore_is_enabled(dev))
+ ring->semaphore.signal = gen6_signal;
+ ring->semaphore.signal = gen6_signal;
+ ring->semaphore.mbox[RCS] = MI_SEMAPHORE_SYNC_INVALID;
+ ring->semaphore.mbox[VCS] = MI_SEMAPHORE_SYNC_INVALID;
+ ring->semaphore.mbox[BCS] = MI_SEMAPHORE_SYNC_INVALID;
+ ring->semaphore.mbox[VECS] = MI_SEMAPHORE_SYNC_INVALID;
+ ring->semaphore.signal_mbox[RCS] = GEN6_NOSYNC;
+ ring->semaphore.signal_mbox[VCS] = GEN6_NOSYNC;
+ ring->semaphore.signal_mbox[BCS] = GEN6_NOSYNC;
+ ring->semaphore.signal_mbox[VECS] = GEN6_NOSYNC;
+ } else if (INTEL_INFO(dev)->gen >= 6) {
ring->add_request = gen6_add_request;
ring->flush = gen7_render_ring_flush;
if (INTEL_INFO(dev)->gen == 6)
ring->flush = gen6_render_ring_flush;
- if (INTEL_INFO(dev)->gen >= 8) {
- ring->flush = gen8_render_ring_flush;
- ring->irq_get = gen8_ring_get_irq;
- ring->irq_put = gen8_ring_put_irq;
- } else {
- ring->irq_get = gen6_ring_get_irq;
- ring->irq_put = gen6_ring_put_irq;
- }
+ ring->irq_get = gen6_ring_get_irq;
+ ring->irq_put = gen6_ring_put_irq;
ring->irq_enable_mask = GT_RENDER_USER_INTERRUPT;
ring->get_seqno = gen6_ring_get_seqno;
ring->set_seqno = ring_set_seqno;
@@ -1915,6 +1929,7 @@ int intel_init_render_ring_buffer(struct drm_device *dev)
ring->irq_enable_mask = I915_USER_INTERRUPT;
}
ring->write_tail = ring_write_tail;
+
if (IS_HASWELL(dev))
ring->dispatch_execbuffer = hsw_ring_dispatch_execbuffer;
else if (IS_GEN8(dev))
@@ -2048,24 +2063,35 @@ int intel_init_bsd_ring_buffer(struct drm_device *dev)
ring->irq_put = gen8_ring_put_irq;
ring->dispatch_execbuffer =
gen8_ring_dispatch_execbuffer;
+ ring->semaphore.sync_to = gen6_ring_sync;
+ if (i915_semaphore_is_enabled(dev))
+ ring->semaphore.signal = gen6_signal;
+ ring->semaphore.mbox[RCS] = MI_SEMAPHORE_SYNC_INVALID;
+ ring->semaphore.mbox[VCS] = MI_SEMAPHORE_SYNC_INVALID;
+ ring->semaphore.mbox[BCS] = MI_SEMAPHORE_SYNC_INVALID;
+ ring->semaphore.mbox[VECS] = MI_SEMAPHORE_SYNC_INVALID;
+ ring->semaphore.signal_mbox[RCS] = GEN6_NOSYNC;
+ ring->semaphore.signal_mbox[VCS] = GEN6_NOSYNC;
+ ring->semaphore.signal_mbox[BCS] = GEN6_NOSYNC;
+ ring->semaphore.signal_mbox[VECS] = GEN6_NOSYNC;
} else {
ring->irq_enable_mask = GT_BSD_USER_INTERRUPT;
ring->irq_get = gen6_ring_get_irq;
ring->irq_put = gen6_ring_put_irq;
ring->dispatch_execbuffer =
gen6_ring_dispatch_execbuffer;
+ ring->semaphore.sync_to = gen6_ring_sync;
+ if (i915_semaphore_is_enabled(dev))
+ ring->semaphore.signal = gen6_signal;
+ ring->semaphore.mbox[RCS] = MI_SEMAPHORE_SYNC_VR;
+ ring->semaphore.mbox[VCS] = MI_SEMAPHORE_SYNC_INVALID;
+ ring->semaphore.mbox[BCS] = MI_SEMAPHORE_SYNC_VB;
+ ring->semaphore.mbox[VECS] = MI_SEMAPHORE_SYNC_VVE;
+ ring->semaphore.signal_mbox[RCS] = GEN6_RVSYNC;
+ ring->semaphore.signal_mbox[VCS] = GEN6_NOSYNC;
+ ring->semaphore.signal_mbox[BCS] = GEN6_BVSYNC;
+ ring->semaphore.signal_mbox[VECS] = GEN6_VEVSYNC;
}
- ring->semaphore.sync_to = gen6_ring_sync;
- if (i915_semaphore_is_enabled(dev))
- ring->semaphore.signal = gen6_signal;
- ring->semaphore.mbox[RCS] = MI_SEMAPHORE_SYNC_VR;
- ring->semaphore.mbox[VCS] = MI_SEMAPHORE_SYNC_INVALID;
- ring->semaphore.mbox[BCS] = MI_SEMAPHORE_SYNC_VB;
- ring->semaphore.mbox[VECS] = MI_SEMAPHORE_SYNC_VVE;
- ring->semaphore.signal_mbox[RCS] = GEN6_RVSYNC;
- ring->semaphore.signal_mbox[VCS] = GEN6_NOSYNC;
- ring->semaphore.signal_mbox[BCS] = GEN6_BVSYNC;
- ring->semaphore.signal_mbox[VECS] = GEN6_VEVSYNC;
} else {
ring->mmio_base = BSD_RING_BASE;
ring->flush = bsd_ring_flush;
@@ -2108,23 +2134,35 @@ int intel_init_blt_ring_buffer(struct drm_device *dev)
ring->irq_get = gen8_ring_get_irq;
ring->irq_put = gen8_ring_put_irq;
ring->dispatch_execbuffer = gen8_ring_dispatch_execbuffer;
+ ring->semaphore.sync_to = gen6_ring_sync;
+ if (i915_semaphore_is_enabled(dev))
+ ring->semaphore.signal = gen6_signal;
+ ring->semaphore.mbox[RCS] = MI_SEMAPHORE_SYNC_INVALID;
+ ring->semaphore.mbox[VCS] = MI_SEMAPHORE_SYNC_INVALID;
+ ring->semaphore.mbox[BCS] = MI_SEMAPHORE_SYNC_INVALID;
+ ring->semaphore.mbox[VECS] = MI_SEMAPHORE_SYNC_INVALID;
+ ring->semaphore.signal_mbox[RCS] = GEN6_NOSYNC;
+ ring->semaphore.signal_mbox[VCS] = GEN6_NOSYNC;
+ ring->semaphore.signal_mbox[BCS] = GEN6_NOSYNC;
+ ring->semaphore.signal_mbox[VECS] = GEN6_NOSYNC;
} else {
ring->irq_enable_mask = GT_BLT_USER_INTERRUPT;
ring->irq_get = gen6_ring_get_irq;
ring->irq_put = gen6_ring_put_irq;
ring->dispatch_execbuffer = gen6_ring_dispatch_execbuffer;
+ ring->semaphore.sync_to = gen6_ring_sync;
+ if (i915_semaphore_is_enabled(dev))
+ ring->semaphore.signal = gen6_signal;
+ ring->semaphore.mbox[RCS] = MI_SEMAPHORE_SYNC_BR;
+ ring->semaphore.mbox[VCS] = MI_SEMAPHORE_SYNC_BV;
+ ring->semaphore.mbox[BCS] = MI_SEMAPHORE_SYNC_INVALID;
+ ring->semaphore.mbox[VECS] = MI_SEMAPHORE_SYNC_BVE;
+ ring->semaphore.signal_mbox[RCS] = GEN6_RBSYNC;
+ ring->semaphore.signal_mbox[VCS] = GEN6_VBSYNC;
+ ring->semaphore.signal_mbox[BCS] = GEN6_NOSYNC;
+ ring->semaphore.signal_mbox[VECS] = GEN6_VEBSYNC;
}
- ring->semaphore.sync_to = gen6_ring_sync;
- if (i915_semaphore_is_enabled(dev))
- ring->semaphore.signal = gen6_signal;
- ring->semaphore.mbox[RCS] = MI_SEMAPHORE_SYNC_BR;
- ring->semaphore.mbox[VCS] = MI_SEMAPHORE_SYNC_BV;
- ring->semaphore.mbox[BCS] = MI_SEMAPHORE_SYNC_INVALID;
- ring->semaphore.mbox[VECS] = MI_SEMAPHORE_SYNC_BVE;
- ring->semaphore.signal_mbox[RCS] = GEN6_RBSYNC;
- ring->semaphore.signal_mbox[VCS] = GEN6_VBSYNC;
- ring->semaphore.signal_mbox[BCS] = GEN6_NOSYNC;
- ring->semaphore.signal_mbox[VECS] = GEN6_VEBSYNC;
+
ring->init = init_ring_common;
return intel_init_ring_buffer(dev, ring);
@@ -2151,23 +2189,35 @@ int intel_init_vebox_ring_buffer(struct drm_device *dev)
ring->irq_get = gen8_ring_get_irq;
ring->irq_put = gen8_ring_put_irq;
ring->dispatch_execbuffer = gen8_ring_dispatch_execbuffer;
+ ring->semaphore.sync_to = gen6_ring_sync;
+ if (i915_semaphore_is_enabled(dev))
+ ring->semaphore.signal = gen6_signal;
+ ring->semaphore.mbox[RCS] = MI_SEMAPHORE_SYNC_INVALID;
+ ring->semaphore.mbox[VCS] = MI_SEMAPHORE_SYNC_INVALID;
+ ring->semaphore.mbox[BCS] = MI_SEMAPHORE_SYNC_INVALID;
+ ring->semaphore.mbox[VECS] = MI_SEMAPHORE_SYNC_INVALID;
+ ring->semaphore.signal_mbox[RCS] = GEN6_NOSYNC;
+ ring->semaphore.signal_mbox[VCS] = GEN6_NOSYNC;
+ ring->semaphore.signal_mbox[BCS] = GEN6_NOSYNC;
+ ring->semaphore.signal_mbox[VECS] = GEN6_NOSYNC;
} else {
ring->irq_enable_mask = PM_VEBOX_USER_INTERRUPT;
ring->irq_get = hsw_vebox_get_irq;
ring->irq_put = hsw_vebox_put_irq;
+ ring->semaphore.sync_to = gen6_ring_sync;
+ if (i915_semaphore_is_enabled(dev))
+ ring->semaphore.signal = gen6_signal;
+ ring->semaphore.mbox[RCS] = MI_SEMAPHORE_SYNC_VER;
+ ring->semaphore.mbox[VCS] = MI_SEMAPHORE_SYNC_VEV;
+ ring->semaphore.mbox[BCS] = MI_SEMAPHORE_SYNC_VEB;
+ ring->semaphore.mbox[VECS] = MI_SEMAPHORE_SYNC_INVALID;
+ ring->semaphore.signal_mbox[RCS] = GEN6_RVESYNC;
+ ring->semaphore.signal_mbox[VCS] = GEN6_VVESYNC;
+ ring->semaphore.signal_mbox[BCS] = GEN6_BVESYNC;
+ ring->semaphore.signal_mbox[VECS] = GEN6_NOSYNC;
ring->dispatch_execbuffer = gen6_ring_dispatch_execbuffer;
}
- ring->semaphore.sync_to = gen6_ring_sync;
- if (i915_semaphore_is_enabled(dev))
- ring->semaphore.signal = gen6_signal;
- ring->semaphore.mbox[RCS] = MI_SEMAPHORE_SYNC_VER;
- ring->semaphore.mbox[VCS] = MI_SEMAPHORE_SYNC_VEV;
- ring->semaphore.mbox[BCS] = MI_SEMAPHORE_SYNC_VEB;
- ring->semaphore.mbox[VECS] = MI_SEMAPHORE_SYNC_INVALID;
- ring->semaphore.signal_mbox[RCS] = GEN6_RVESYNC;
- ring->semaphore.signal_mbox[VCS] = GEN6_VVESYNC;
- ring->semaphore.signal_mbox[BCS] = GEN6_BVESYNC;
- ring->semaphore.signal_mbox[VECS] = GEN6_NOSYNC;
+
ring->init = init_ring_common;
return intel_init_ring_buffer(dev, ring);
--
1.8.5.3
next prev parent reply other threads:[~2014-01-29 19:55 UTC|newest]
Thread overview: 42+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-01-29 19:55 [PATCH 00/13] [REPOST] Broadwell HW semaphores Ben Widawsky
2014-01-29 19:55 ` [PATCH 01/13] drm/i915: Move semaphore specific ring members to struct Ben Widawsky
2014-01-29 19:55 ` [PATCH 02/13] drm/i915: Virtualize the ringbuffer signal func Ben Widawsky
2014-01-29 19:55 ` [PATCH 03/13] drm/i915: Move ring_begin to signal() Ben Widawsky
2014-01-29 19:55 ` [PATCH 04/13] drm/i915: Make semaphore updates more precise Ben Widawsky
2014-01-30 11:25 ` Ville Syrjälä
2014-02-11 16:08 ` Ben Widawsky
2014-02-11 17:13 ` Ville Syrjälä
2014-02-11 20:20 ` [PATCH] [v2] " Ben Widawsky
2014-02-11 20:53 ` Ville Syrjälä
2014-02-11 21:50 ` Ben Widawsky
2014-01-29 19:55 ` Ben Widawsky [this message]
2014-01-29 19:55 ` [PATCH 06/13] drm/i915/bdw: implement semaphore signal Ben Widawsky
2014-01-30 12:38 ` Ville Syrjälä
2014-01-30 12:46 ` Chris Wilson
2014-01-30 13:18 ` Daniel Vetter
2014-01-30 13:25 ` Chris Wilson
2014-01-30 13:35 ` Chris Wilson
2014-02-11 21:48 ` Ben Widawsky
2014-02-11 22:23 ` Chris Wilson
2014-02-11 22:25 ` Ben Widawsky
2014-02-11 22:28 ` Chris Wilson
2014-02-11 22:11 ` Ben Widawsky
2014-02-11 22:22 ` Ben Widawsky
2014-02-11 23:01 ` Ben Widawsky
2014-02-12 9:29 ` Ville Syrjälä
2014-01-29 19:55 ` [PATCH 07/13] drm/i915/bdw: implement semaphore wait Ben Widawsky
2014-01-30 12:48 ` Ville Syrjälä
2014-01-29 19:55 ` [PATCH 08/13] drm/i915: FORCE_RESTORE for gen8 semaphores Ben Widawsky
2014-01-29 19:55 ` [PATCH 09/13] drm/i915/bdw: poll semaphores Ben Widawsky
2014-01-30 13:26 ` Ville Syrjälä
2014-01-29 19:55 ` [PATCH 10/13] drm/i915: Extract semaphore error collection Ben Widawsky
2014-01-29 19:55 ` [PATCH 11/13] drm/i915/bdw: collect semaphore error state Ben Widawsky
2014-01-30 14:53 ` Ville Syrjälä
2014-01-30 14:58 ` Chris Wilson
2014-02-12 0:19 ` Ben Widawsky
2014-02-12 0:23 ` Ben Widawsky
2014-01-29 19:55 ` [PATCH 12/13] drm/i915: unleash semaphores on gen8 Ben Widawsky
2014-01-29 19:55 ` [PATCH 13/13] drm/i915: semaphore debugfs Ben Widawsky
-- strict thread matches above, loose matches on Subject: below --
2014-02-20 6:19 [PATCH 01/13] drm/i915: Move semaphore specific ring members to struct Ben Widawsky
2014-02-20 6:19 ` [PATCH 05/13] drm/i915: gen specific ring init Ben Widawsky
2014-02-24 13:05 ` Ville Syrjälä
2014-04-29 21:52 [PATCH 00/13] [REPOST] BDW Semaphores Ben Widawsky
2014-04-29 21:52 ` [PATCH 05/13] drm/i915: gen specific ring init 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=1391025333-31587-6-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