From 75d0a7f31eec8ec4a53b4485905800e09dc5091f Mon Sep 17 00:00:00 2001 From: Chris Wilson Date: Fri, 9 Aug 2019 19:25:18 +0100 Subject: 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 Reviewed-by: Matthew Auld Link: https://patchwork.freedesktop.org/patch/msgid/20190809182518.20486-4-chris@chris-wilson.co.uk --- drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c') diff --git a/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c b/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c index 2fa08357944e..1bd2187ac8d6 100644 --- a/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c +++ b/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c @@ -2182,7 +2182,7 @@ err_unpin: static void eb_unpin_context(struct i915_execbuffer *eb) { struct intel_context *ce = eb->context; - struct intel_timeline *tl = ce->ring->timeline; + struct intel_timeline *tl = ce->timeline; mutex_lock(&tl->mutex); intel_context_exit(ce); -- cgit v1.2.3