From: Ben Widawsky <ben@bwidawsk.net>
To: Daniel Vetter <daniel@ffwll.ch>
Cc: Intel GFX <intel-gfx@lists.freedesktop.org>
Subject: Re: [PATCH] drm/i915: Fix disabled semaphores
Date: Mon, 13 Jan 2014 15:25:35 -0800 [thread overview]
Message-ID: <20140113232534.GA2378@bwidawsk.net> (raw)
In-Reply-To: <1387339560-13604-1-git-send-email-benjamin.widawsky@intel.com>
Daniel, please consider merging this, or the rest of the semaphore
series. Existing code is broken.
On Tue, Dec 17, 2013 at 08:06:00PM -0800, Ben Widawsky wrote:
> The ring will emit too many if semaphores are disabled since we do not
> add the correct number to num_dwords anymore.
>
> This was introduced:
> commit 52ed23253b68e1cf154b03d91bed619504cf955b
> Author: Ben Widawsky <benjamin.widawsky@intel.com>
> Date: Mon Dec 16 20:50:38 2013 -0800
>
> drm/i915: Don't emit mbox updates without semaphores
>
> FWIW, the bug was fixed later in the series.
>
> /me hangs head in shame.
>
> Daniel: Also note that we should have merged the read-only semaphore
> modparam before this patch.
>
> Reported-by: Kenneth Graunke <kenneth@whitecape.org>
> Signed-off-by: Ben Widawsky <ben@bwidawsk.net>
> ---
> drivers/gpu/drm/i915/intel_ringbuffer.c | 10 ++++++----
> 1 file changed, 6 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/intel_ringbuffer.c b/drivers/gpu/drm/i915/intel_ringbuffer.c
> index b106984..b242dbb 100644
> --- a/drivers/gpu/drm/i915/intel_ringbuffer.c
> +++ b/drivers/gpu/drm/i915/intel_ringbuffer.c
> @@ -673,10 +673,12 @@ gen6_add_request(struct intel_ring_buffer *ring)
> if (ret)
> return ret;
>
> - for_each_ring(useless, dev_priv, i) {
> - u32 mbox_reg = ring->signal_mbox[i];
> - if (mbox_reg != GEN6_NOSYNC)
> - update_mboxes(ring, mbox_reg);
> + if (i915_semaphore_is_enabled(dev)) {
> + for_each_ring(useless, dev_priv, i) {
> + u32 mbox_reg = ring->signal_mbox[i];
> + if (mbox_reg != GEN6_NOSYNC)
> + update_mboxes(ring, mbox_reg);
> + }
> }
>
> intel_ring_emit(ring, MI_STORE_DWORD_INDEX);
> --
> 1.8.5.1
>
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/intel-gfx
--
Ben Widawsky, Intel Open Source Technology Center
prev parent reply other threads:[~2014-01-13 23:25 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-12-18 4:06 [PATCH] drm/i915: Fix disabled semaphores Ben Widawsky
2014-01-13 23:25 ` Ben Widawsky [this message]
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=20140113232534.GA2378@bwidawsk.net \
--to=ben@bwidawsk.net \
--cc=daniel@ffwll.ch \
--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