diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2019-08-09 19:25:18 +0100 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2019-08-09 20:18:30 +0100 |
| commit | 75d0a7f31eec8ec4a53b4485905800e09dc5091f (patch) | |
| tree | 6dddb910c41c88bc0d48d261daa10f09e4b1f608 /drivers/gpu/drm/i915/gt/intel_context.h | |
| parent | 48ae397b6b935c6733f15476c338df27eac9293c (diff) | |
drm/i915: Lift timeline into intel_context
Move the timeline from being inside the intel_ring to intel_context
itself. This saves much pointer dancing and makes the relations of the
context to its timeline much clearer.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: Matthew Auld <matthew.auld@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20190809182518.20486-4-chris@chris-wilson.co.uk
Diffstat (limited to 'drivers/gpu/drm/i915/gt/intel_context.h')
| -rw-r--r-- | drivers/gpu/drm/i915/gt/intel_context.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/gpu/drm/i915/gt/intel_context.h b/drivers/gpu/drm/i915/gt/intel_context.h index 13f28dd316bc..9fa8b588f18e 100644 --- a/drivers/gpu/drm/i915/gt/intel_context.h +++ b/drivers/gpu/drm/i915/gt/intel_context.h @@ -120,15 +120,15 @@ static inline void intel_context_put(struct intel_context *ce) static inline int __must_check intel_context_timeline_lock(struct intel_context *ce) - __acquires(&ce->ring->timeline->mutex) + __acquires(&ce->timeline->mutex) { - return mutex_lock_interruptible(&ce->ring->timeline->mutex); + return mutex_lock_interruptible(&ce->timeline->mutex); } static inline void intel_context_timeline_unlock(struct intel_context *ce) - __releases(&ce->ring->timeline->mutex) + __releases(&ce->timeline->mutex) { - mutex_unlock(&ce->ring->timeline->mutex); + mutex_unlock(&ce->timeline->mutex); } int intel_context_prepare_remote_request(struct intel_context *ce, |