[10/11] timeline

Submitted by Chris Wilson on Feb. 10, 2019, 2:56 p.m.

Details

Message ID 20190210145639.19369-10-chris@chris-wilson.co.uk
State New
Headers show
Series "Series without cover letter" ( rev: 1 ) in Intel GFX - Try Bot

Not browsing as part of any series.

Commit Message

Chris Wilson Feb. 10, 2019, 2:56 p.m.
---
 drivers/gpu/drm/i915/i915_timeline.c | 8 +++-----
 drivers/gpu/drm/i915/i915_timeline.h | 2 +-
 2 files changed, 4 insertions(+), 6 deletions(-)

Patch hide | download patch | download mbox

diff --git a/drivers/gpu/drm/i915/i915_timeline.c b/drivers/gpu/drm/i915/i915_timeline.c
index 7009bf8767fb..796ec09e298b 100644
--- a/drivers/gpu/drm/i915/i915_timeline.c
+++ b/drivers/gpu/drm/i915/i915_timeline.c
@@ -503,12 +503,10 @@  int i915_timeline_get_seqno(struct i915_timeline *tl,
 	return 0;
 }
 
-int i915_timeline_read_lock(struct i915_timeline *tl, struct i915_request *rq)
+int i915_timeline_read_lock(struct i915_timeline_cacheline *cl,
+			    struct i915_request *rq)
 {
-	GEM_BUG_ON(!tl->pin_count);
-	GEM_BUG_ON(!tl->hwsp_cacheline);
-	return i915_active_ref(&tl->hwsp_cacheline->active,
-			       rq->fence.context, rq);
+	return i915_active_ref(&cl->active, rq->fence.context, rq);
 }
 
 void i915_timeline_unpin(struct i915_timeline *tl)
diff --git a/drivers/gpu/drm/i915/i915_timeline.h b/drivers/gpu/drm/i915/i915_timeline.h
index ca1efaa1d41d..d6e860a54d41 100644
--- a/drivers/gpu/drm/i915/i915_timeline.h
+++ b/drivers/gpu/drm/i915/i915_timeline.h
@@ -167,7 +167,7 @@  int i915_timeline_pin(struct i915_timeline *tl);
 int i915_timeline_get_seqno(struct i915_timeline *tl,
 			    struct i915_request *rq,
 			    u32 *seqno);
-int i915_timeline_read_lock(struct i915_timeline *tl,
+int i915_timeline_read_lock(struct i915_timeline_cacheline *cl,
 			    struct i915_request *rq);
 void i915_timeline_unpin(struct i915_timeline *tl);