[PATCH 53/74] drm/i915: Reuse legacy breadcrumbs + tail emission
Chris Wilson
chris at chris-wilson.co.uk
Sat Apr 30 17:00:08 UTC 2016
As GEN6+ is now a simple variant on the basic breadcrumbs + tail write,
reuse the common code.
Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>
---
drivers/gpu/drm/i915/intel_ringbuffer.c | 77 ++++++++++-----------------------
1 file changed, 24 insertions(+), 53 deletions(-)
diff --git a/drivers/gpu/drm/i915/intel_ringbuffer.c b/drivers/gpu/drm/i915/intel_ringbuffer.c
index c29909d83e77..e404dc2c0ba8 100644
--- a/drivers/gpu/drm/i915/intel_ringbuffer.c
+++ b/drivers/gpu/drm/i915/intel_ringbuffer.c
@@ -1343,27 +1343,13 @@ static int gen6_signal(struct drm_i915_gem_request *signaller_req)
return 0;
}
-/**
- * gen6_add_request - Update the semaphore mailbox registers
- *
- * @request - request to write to the ring
- *
- * Update the mailbox registers in the *other* rings with the current seqno.
- * This acts like a signal in the canonical semaphore.
- */
static int
-gen6_add_request(struct drm_i915_gem_request *req)
+i9xx_add_request(struct drm_i915_gem_request *req)
{
struct drm_i915_private *dev_priv = req->i915;
struct intel_ring *ring = req->ring;
int ret;
- if (req->engine->semaphore.signal) {
- ret = req->engine->semaphore.signal(req);
- if (ret)
- return ret;
- }
-
ret = intel_ring_begin(req, 4);
if (ret)
return ret;
@@ -1380,11 +1366,31 @@ gen6_add_request(struct drm_i915_gem_request *req)
return 0;
}
+
+/**
+ * gen6_add_request - Update the semaphore mailbox registers
+ *
+ * @request - request to write to the ring
+ *
+ * Update the mailbox registers in the *other* rings with the current seqno.
+ * This acts like a signal in the canonical semaphore.
+ */
+static int
+gen6_add_request(struct drm_i915_gem_request *req)
+{
+ if (req->engine->semaphore.signal) {
+ int ret = req->engine->semaphore.signal(req);
+ if (ret)
+ return ret;
+ }
+
+ return i9xx_add_request(req);
+}
+
static int
gen6_bsd_add_request(struct drm_i915_gem_request *req)
{
struct drm_i915_private *dev_priv = req->i915;
- struct intel_ring *ring = req->ring;
int ret;
if (req->engine->semaphore.signal) {
@@ -1393,16 +1399,6 @@ gen6_bsd_add_request(struct drm_i915_gem_request *req)
return ret;
}
- ret = intel_ring_begin(req, 4);
- if (ret)
- return ret;
-
- intel_ring_emit(ring, MI_STORE_DWORD_INDEX);
- intel_ring_emit(ring, I915_GEM_HWS_INDEX << MI_STORE_DWORD_INDEX_SHIFT);
- intel_ring_emit(ring, req->fence.seqno);
- intel_ring_emit(ring, MI_USER_INTERRUPT);
- intel_ring_advance(ring);
-
/* Every tail move must follow the sequence below */
/* Disable notification that the ring is IDLE. The GT
@@ -1421,9 +1417,7 @@ gen6_bsd_add_request(struct drm_i915_gem_request *req)
DRM_ERROR("timed out waiting for the BSD ring to wake up\n");
/* Now that the ring is fully powered up, update the tail */
- req->tail = intel_ring_get_tail(ring);
- I915_WRITE_TAIL(req->engine, req->tail);
- POSTING_READ(RING_TAIL(req->engine->mmio_base));
+ ret = i9xx_add_request(req);
/* Let the ring send IDLE messages to the GT again,
* and so let it sleep to conserve power when idle.
@@ -1431,7 +1425,7 @@ gen6_bsd_add_request(struct drm_i915_gem_request *req)
I915_WRITE(GEN6_BSD_SLEEP_PSMI_CONTROL,
_MASKED_BIT_DISABLE(GEN6_BSD_SLEEP_MSG_DISABLE));
- return 0;
+ return ret;
}
static int
@@ -1674,29 +1668,6 @@ bsd_ring_flush(struct drm_i915_gem_request *req,
return 0;
}
-static int
-i9xx_add_request(struct drm_i915_gem_request *req)
-{
- struct drm_i915_private *dev_priv = req->i915;
- struct intel_ring *ring = req->ring;
- int ret;
-
- ret = intel_ring_begin(req, 4);
- if (ret)
- return ret;
-
- intel_ring_emit(ring, MI_STORE_DWORD_INDEX);
- intel_ring_emit(ring, I915_GEM_HWS_INDEX << MI_STORE_DWORD_INDEX_SHIFT);
- intel_ring_emit(ring, req->fence.seqno);
- intel_ring_emit(ring, MI_USER_INTERRUPT);
- intel_ring_advance(ring);
-
- req->tail = intel_ring_get_tail(ring);
- I915_WRITE_TAIL(req->engine, req->tail);
-
- return 0;
-}
-
static void
gen6_ring_enable_irq(struct intel_engine_cs *engine)
{
--
2.8.1
More information about the Intel-gfx-trybot
mailing list