[PATCH 54/60] hwsp
Chris Wilson
chris at chris-wilson.co.uk
Fri Dec 21 11:21:11 UTC 2018
---
drivers/gpu/drm/i915/i915_request.h | 11 ++++-------
1 file changed, 4 insertions(+), 7 deletions(-)
diff --git a/drivers/gpu/drm/i915/i915_request.h b/drivers/gpu/drm/i915/i915_request.h
index 2a86c9626662..1ede2ffd30ad 100644
--- a/drivers/gpu/drm/i915/i915_request.h
+++ b/drivers/gpu/drm/i915/i915_request.h
@@ -135,6 +135,8 @@ struct i915_request {
struct i915_sched_node sched;
struct i915_dependency dep;
+ u32 *hwsp_seqno;
+
/**
* GEM sequence number associated with this request on the
* global execution timeline. It is zero when the request is not
@@ -287,11 +289,6 @@ long i915_request_wait(struct i915_request *rq,
#define I915_WAIT_ALL BIT(3) /* used by i915_gem_object_wait() */
#define I915_WAIT_FOR_IDLE_BOOST BIT(4)
-static inline bool intel_engine_has_started(struct intel_engine_cs *engine,
- u32 seqno);
-static inline bool intel_engine_has_completed(struct intel_engine_cs *engine,
- u32 seqno);
-
/**
* Returns true if seq1 is later than seq2.
*/
@@ -317,14 +314,14 @@ static inline bool i915_request_started(const struct i915_request *rq)
if (!seqno) /* not yet submitted to HW */
return false;
- return intel_engine_has_started(rq->engine, seqno);
+ return i915_seqno_passed(READ_ONCE(*rq->hwsp_seqno), seqno);
}
static inline bool
__i915_request_completed(const struct i915_request *rq, u64 seqno)
{
GEM_BUG_ON(!seqno);
- return intel_engine_has_completed(rq->engine, seqno) &&
+ return i915_seqno_passed(READ_ONCE(*rq->hwsp_seqno), seqno) &&
seqno == i915_request_global_seqno(rq);
}
--
2.20.1
More information about the Intel-gfx-trybot
mailing list