From: "Ville Syrjälä" <ville.syrjala@linux.intel.com>
To: Ben Widawsky <benjamin.widawsky@intel.com>
Cc: Intel GFX <intel-gfx@lists.freedesktop.org>,
Ben Widawsky <ben@bwidawsk.net>
Subject: Re: [PATCH 05/13] drm/i915: gen specific ring init
Date: Mon, 24 Feb 2014 15:05:46 +0200 [thread overview]
Message-ID: <20140224130546.GO3852@intel.com> (raw)
In-Reply-To: <1392877166-9195-5-git-send-email-benjamin.widawsky@intel.com>
On Wed, Feb 19, 2014 at 10:19:18PM -0800, Ben Widawsky wrote:
> 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
>
> v3: Move everything in the is_semaphore_enabled() check
>
> Signed-off-by: Ben Widawsky <ben@bwidawsk.net>
> ---
> drivers/gpu/drm/i915/intel_ringbuffer.c | 142 ++++++++++++++++++++++----------
> 1 file changed, 97 insertions(+), 45 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/intel_ringbuffer.c b/drivers/gpu/drm/i915/intel_ringbuffer.c
> index bf061dd..691da67 100644
> --- a/drivers/gpu/drm/i915/intel_ringbuffer.c
> +++ b/drivers/gpu/drm/i915/intel_ringbuffer.c
> @@ -1870,19 +1870,34 @@ 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;
> + if (i915_semaphore_is_enabled(dev)) {
> + ring->semaphore.sync_to = gen6_ring_sync;
> + ring->semaphore.signal = gen6_signal;
> + ring->semaphore.signal = gen6_signal;
Double assignment.
> + ring->semaphore.mbox.wait[RCS] = MI_SEMAPHORE_SYNC_INVALID;
> + ring->semaphore.mbox.wait[VCS] = MI_SEMAPHORE_SYNC_INVALID;
> + ring->semaphore.mbox.wait[BCS] = MI_SEMAPHORE_SYNC_INVALID;
> + ring->semaphore.mbox.wait[VECS] = MI_SEMAPHORE_SYNC_INVALID;
> + ring->semaphore.mbox.signal[RCS] = GEN6_NOSYNC;
> + ring->semaphore.mbox.signal[VCS] = GEN6_NOSYNC;
> + ring->semaphore.mbox.signal[BCS] = GEN6_NOSYNC;
> + ring->semaphore.mbox.signal[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;
> @@ -1925,6 +1940,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))
> @@ -2058,24 +2074,36 @@ int intel_init_bsd_ring_buffer(struct drm_device *dev)
> ring->irq_put = gen8_ring_put_irq;
> ring->dispatch_execbuffer =
> gen8_ring_dispatch_execbuffer;
> + if (i915_semaphore_is_enabled(dev)) {
> + ring->semaphore.sync_to = gen6_ring_sync;
> + ring->semaphore.signal = gen6_signal;
> + ring->semaphore.mbox.wait[RCS] = MI_SEMAPHORE_SYNC_INVALID;
> + ring->semaphore.mbox.wait[VCS] = MI_SEMAPHORE_SYNC_INVALID;
> + ring->semaphore.mbox.wait[BCS] = MI_SEMAPHORE_SYNC_INVALID;
> + ring->semaphore.mbox.wait[VECS] = MI_SEMAPHORE_SYNC_INVALID;
> + ring->semaphore.mbox.signal[RCS] = GEN6_NOSYNC;
> + ring->semaphore.mbox.signal[VCS] = GEN6_NOSYNC;
> + ring->semaphore.mbox.signal[BCS] = GEN6_NOSYNC;
> + ring->semaphore.mbox.signal[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;
> - }
> - if (i915_semaphore_is_enabled(dev)) {
> - ring->semaphore.sync_to = gen6_ring_sync;
> - ring->semaphore.signal = gen6_signal;
> - ring->semaphore.mbox.wait[RCS] = MI_SEMAPHORE_SYNC_VR;
> - ring->semaphore.mbox.wait[VCS] = MI_SEMAPHORE_SYNC_INVALID;
> - ring->semaphore.mbox.wait[BCS] = MI_SEMAPHORE_SYNC_VB;
> - ring->semaphore.mbox.wait[VECS] = MI_SEMAPHORE_SYNC_VVE;
> - ring->semaphore.mbox.signal[RCS] = GEN6_RVSYNC;
> - ring->semaphore.mbox.signal[VCS] = GEN6_NOSYNC;
> - ring->semaphore.mbox.signal[BCS] = GEN6_BVSYNC;
> - ring->semaphore.mbox.signal[VECS] = GEN6_VEVSYNC;
> + if (i915_semaphore_is_enabled(dev)) {
> + ring->semaphore.sync_to = gen6_ring_sync;
> + ring->semaphore.signal = gen6_signal;
> + ring->semaphore.mbox.wait[RCS] = MI_SEMAPHORE_SYNC_VR;
> + ring->semaphore.mbox.wait[VCS] = MI_SEMAPHORE_SYNC_INVALID;
> + ring->semaphore.mbox.wait[BCS] = MI_SEMAPHORE_SYNC_VB;
> + ring->semaphore.mbox.wait[VECS] = MI_SEMAPHORE_SYNC_VVE;
> + ring->semaphore.mbox.signal[RCS] = GEN6_RVSYNC;
> + ring->semaphore.mbox.signal[VCS] = GEN6_NOSYNC;
> + ring->semaphore.mbox.signal[BCS] = GEN6_BVSYNC;
> + ring->semaphore.mbox.signal[VECS] = GEN6_VEVSYNC;
> + }
> }
> } else {
> ring->mmio_base = BSD_RING_BASE;
> @@ -2119,23 +2147,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;
> + if (i915_semaphore_is_enabled(dev)) {
> + ring->semaphore.sync_to = gen6_ring_sync;
> + ring->semaphore.signal = gen6_signal;
> + ring->semaphore.mbox.wait[RCS] = MI_SEMAPHORE_SYNC_INVALID;
> + ring->semaphore.mbox.wait[VCS] = MI_SEMAPHORE_SYNC_INVALID;
> + ring->semaphore.mbox.wait[BCS] = MI_SEMAPHORE_SYNC_INVALID;
> + ring->semaphore.mbox.wait[VECS] = MI_SEMAPHORE_SYNC_INVALID;
> + ring->semaphore.mbox.signal[RCS] = GEN6_NOSYNC;
> + ring->semaphore.mbox.signal[VCS] = GEN6_NOSYNC;
> + ring->semaphore.mbox.signal[BCS] = GEN6_NOSYNC;
> + ring->semaphore.mbox.signal[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;
> - }
> - if (i915_semaphore_is_enabled(dev)) {
> - ring->semaphore.signal = gen6_signal;
> - ring->semaphore.sync_to = gen6_ring_sync;
> - ring->semaphore.mbox.wait[RCS] = MI_SEMAPHORE_SYNC_BR;
> - ring->semaphore.mbox.wait[VCS] = MI_SEMAPHORE_SYNC_BV;
> - ring->semaphore.mbox.wait[BCS] = MI_SEMAPHORE_SYNC_INVALID;
> - ring->semaphore.mbox.wait[VECS] = MI_SEMAPHORE_SYNC_BVE;
> - ring->semaphore.mbox.signal[RCS] = GEN6_RBSYNC;
> - ring->semaphore.mbox.signal[VCS] = GEN6_VBSYNC;
> - ring->semaphore.mbox.signal[BCS] = GEN6_NOSYNC;
> - ring->semaphore.mbox.signal[VECS] = GEN6_VEBSYNC;
> + if (i915_semaphore_is_enabled(dev)) {
> + ring->semaphore.signal = gen6_signal;
> + ring->semaphore.sync_to = gen6_ring_sync;
> + ring->semaphore.mbox.wait[RCS] = MI_SEMAPHORE_SYNC_BR;
> + ring->semaphore.mbox.wait[VCS] = MI_SEMAPHORE_SYNC_BV;
> + ring->semaphore.mbox.wait[BCS] = MI_SEMAPHORE_SYNC_INVALID;
> + ring->semaphore.mbox.wait[VECS] = MI_SEMAPHORE_SYNC_BVE;
> + ring->semaphore.mbox.signal[RCS] = GEN6_RBSYNC;
> + ring->semaphore.mbox.signal[VCS] = GEN6_VBSYNC;
> + ring->semaphore.mbox.signal[BCS] = GEN6_NOSYNC;
> + ring->semaphore.mbox.signal[VECS] = GEN6_VEBSYNC;
> + }
> }
> ring->init = init_ring_common;
>
> @@ -2163,23 +2203,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;
> + if (i915_semaphore_is_enabled(dev)) {
> + ring->semaphore.sync_to = gen6_ring_sync;
> + ring->semaphore.signal = gen6_signal;
> + ring->semaphore.mbox.wait[RCS] = MI_SEMAPHORE_SYNC_INVALID;
> + ring->semaphore.mbox.wait[VCS] = MI_SEMAPHORE_SYNC_INVALID;
> + ring->semaphore.mbox.wait[BCS] = MI_SEMAPHORE_SYNC_INVALID;
> + ring->semaphore.mbox.wait[VECS] = MI_SEMAPHORE_SYNC_INVALID;
> + ring->semaphore.mbox.signal[RCS] = GEN6_NOSYNC;
> + ring->semaphore.mbox.signal[VCS] = GEN6_NOSYNC;
> + ring->semaphore.mbox.signal[BCS] = GEN6_NOSYNC;
> + ring->semaphore.mbox.signal[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->dispatch_execbuffer = gen6_ring_dispatch_execbuffer;
> - }
> - if (i915_semaphore_is_enabled(dev)) {
> - ring->semaphore.sync_to = gen6_ring_sync;
> - ring->semaphore.signal = gen6_signal;
> - ring->semaphore.mbox.wait[RCS] = MI_SEMAPHORE_SYNC_VER;
> - ring->semaphore.mbox.wait[VCS] = MI_SEMAPHORE_SYNC_VEV;
> - ring->semaphore.mbox.wait[BCS] = MI_SEMAPHORE_SYNC_VEB;
> - ring->semaphore.mbox.wait[VECS] = MI_SEMAPHORE_SYNC_INVALID;
> - ring->semaphore.mbox.signal[RCS] = GEN6_RVESYNC;
> - ring->semaphore.mbox.signal[VCS] = GEN6_VVESYNC;
> - ring->semaphore.mbox.signal[BCS] = GEN6_BVESYNC;
> - ring->semaphore.mbox.signal[VECS] = GEN6_NOSYNC;
> + if (i915_semaphore_is_enabled(dev)) {
> + ring->semaphore.sync_to = gen6_ring_sync;
> + ring->semaphore.signal = gen6_signal;
> + ring->semaphore.mbox.wait[RCS] = MI_SEMAPHORE_SYNC_VER;
> + ring->semaphore.mbox.wait[VCS] = MI_SEMAPHORE_SYNC_VEV;
> + ring->semaphore.mbox.wait[BCS] = MI_SEMAPHORE_SYNC_VEB;
> + ring->semaphore.mbox.wait[VECS] = MI_SEMAPHORE_SYNC_INVALID;
> + ring->semaphore.mbox.signal[RCS] = GEN6_RVESYNC;
> + ring->semaphore.mbox.signal[VCS] = GEN6_VVESYNC;
> + ring->semaphore.mbox.signal[BCS] = GEN6_BVESYNC;
> + ring->semaphore.mbox.signal[VECS] = GEN6_NOSYNC;
> + }
> }
> ring->init = init_ring_common;
>
> --
> 1.9.0
--
Ville Syrjälä
Intel OTC
next prev parent reply other threads:[~2014-02-24 13:05 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
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 02/13] drm/i915: Virtualize the ringbuffer signal func Ben Widawsky
2014-02-20 6:19 ` [PATCH 03/13] drm/i915: Move ring_begin to signal() Ben Widawsky
2014-02-20 6:19 ` [PATCH 04/13] drm/i915: Make semaphore updates more precise Ben Widawsky
2014-02-24 13:09 ` Ville Syrjälä
2014-02-20 6:19 ` [PATCH 05/13] drm/i915: gen specific ring init Ben Widawsky
2014-02-24 13:05 ` Ville Syrjälä [this message]
2014-02-20 6:19 ` [PATCH 06/13] drm/i915/bdw: implement semaphore signal Ben Widawsky
2014-02-24 13:10 ` Ville Syrjälä
2014-03-05 12:24 ` Ville Syrjälä
2014-02-20 6:19 ` [PATCH 07/13] drm/i915/bdw: implement semaphore wait Ben Widawsky
2014-02-20 6:19 ` [PATCH 08/13] drm/i915/bdw: poll semaphores Ben Widawsky
2014-02-24 13:06 ` Ville Syrjälä
2014-02-20 6:19 ` [PATCH 09/13] drm/i915: Extract semaphore error collection Ben Widawsky
2014-02-20 6:19 ` [PATCH 10/13] drm/i915/bdw: collect semaphore error state Ben Widawsky
2014-02-24 13:08 ` Ville Syrjälä
2014-04-29 21:43 ` Ben Widawsky
2014-02-20 6:19 ` [PATCH 11/13] drm/i915: unleash semaphores on gen8 Ben Widawsky
2014-02-20 6:19 ` [PATCH 12/13] drm/i915: semaphore debugfs Ben Widawsky
2014-02-20 6:19 ` [PATCH 13/13] DONT_MERGE drm/i915: FORCE_RESTORE for gen8 semaphores Ben Widawsky
2014-03-05 12:29 ` [PATCH 01/13] drm/i915: Move semaphore specific ring members to struct Ville Syrjälä
-- strict thread matches above, loose matches on Subject: below --
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
2014-01-29 19:55 [PATCH 00/13] [REPOST] Broadwell HW semaphores Ben Widawsky
2014-01-29 19:55 ` [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=20140224130546.GO3852@intel.com \
--to=ville.syrjala@linux.intel.com \
--cc=ben@bwidawsk.net \
--cc=benjamin.widawsky@intel.com \
--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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.