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 14/17] drm/i915: Extract semaphore error collection
Date: Fri, 13 Dec 2013 20:16:02 -0800 [thread overview]
Message-ID: <1386994565-29395-15-git-send-email-benjamin.widawsky@intel.com> (raw)
In-Reply-To: <1386994565-29395-1-git-send-email-benjamin.widawsky@intel.com>
Signed-off-by: Ben Widawsky <ben@bwidawsk.net>
---
drivers/gpu/drm/i915/i915_gpu_error.c | 31 +++++++++++++++++++------------
1 file changed, 19 insertions(+), 12 deletions(-)
diff --git a/drivers/gpu/drm/i915/i915_gpu_error.c b/drivers/gpu/drm/i915/i915_gpu_error.c
index a577640..ebdc8a7 100644
--- a/drivers/gpu/drm/i915/i915_gpu_error.c
+++ b/drivers/gpu/drm/i915/i915_gpu_error.c
@@ -695,6 +695,24 @@ i915_error_first_batchbuffer(struct drm_i915_private *dev_priv,
return NULL;
}
+static void gen6_record_semaphore_state(struct drm_i915_private *dev_priv,
+ struct drm_i915_error_state *error,
+ struct intel_ring_buffer *ring)
+{
+ error->semaphore_mboxes[ring->id][0]
+ = I915_READ(RING_SYNC_0(ring->mmio_base));
+ error->semaphore_mboxes[ring->id][1]
+ = I915_READ(RING_SYNC_1(ring->mmio_base));
+ error->semaphore_seqno[ring->id][0] = ring->semaphore.sync_seqno[0];
+ error->semaphore_seqno[ring->id][1] = ring->semaphore.sync_seqno[1];
+
+ if (HAS_VEBOX(dev_priv->dev)) {
+ error->semaphore_mboxes[ring->id][2] =
+ I915_READ(RING_SYNC_2(ring->mmio_base));
+ error->semaphore_seqno[ring->id][2] = ring->semaphore.sync_seqno[2];
+ }
+}
+
static void i915_record_ring_state(struct drm_device *dev,
struct drm_i915_error_state *error,
struct intel_ring_buffer *ring)
@@ -704,18 +722,7 @@ static void i915_record_ring_state(struct drm_device *dev,
if (INTEL_INFO(dev)->gen >= 6) {
error->rc_psmi[ring->id] = I915_READ(ring->mmio_base + 0x50);
error->fault_reg[ring->id] = I915_READ(RING_FAULT_REG(ring));
- error->semaphore_mboxes[ring->id][0]
- = I915_READ(RING_SYNC_0(ring->mmio_base));
- error->semaphore_mboxes[ring->id][1]
- = I915_READ(RING_SYNC_1(ring->mmio_base));
- error->semaphore_seqno[ring->id][0] = ring->semaphore.sync_seqno[0];
- error->semaphore_seqno[ring->id][1] = ring->semaphore.sync_seqno[1];
- }
-
- if (HAS_VEBOX(dev)) {
- error->semaphore_mboxes[ring->id][2] =
- I915_READ(RING_SYNC_2(ring->mmio_base));
- error->semaphore_seqno[ring->id][2] = ring->semaphore.sync_seqno[2];
+ gen6_record_semaphore_state(dev_priv, error, ring);
}
if (INTEL_INFO(dev)->gen >= 4) {
--
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 ` [PATCH 09/17] drm/i915: init ring->id early Ben Widawsky
2013-12-14 21:45 ` 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 ` Ben Widawsky [this message]
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-15-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