diff options
author | Chris Wilson <chris@chris-wilson.co.uk> | 2017-05-03 10:39:22 +0100 |
---|---|---|
committer | Chris Wilson <chris@chris-wilson.co.uk> | 2017-05-03 11:08:52 +0100 |
commit | 7e8894e97dc4999270a5713034d8bd265e3ac3da (patch) | |
tree | 66f8844105b212ee87e6d5053477dbe35484297f /drivers/gpu/drm/i915/i915_gem_timeline.h | |
parent | 4797948071f607c5b43753cb8f1b7ddcf22e146d (diff) |
drm/i915: Rename intel_timeline.sync_seqno[] to .global_sync[]
With the addition of the inter-context intel_time.sync map, having a
very similar sync_seqno[] is confusing. Aide the reader by denoting that
this is a pre-allocated array for storing semaphore sync points wrt to
the global seqno.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/20170503093924.5320-5-chris@chris-wilson.co.uk
Diffstat (limited to 'drivers/gpu/drm/i915/i915_gem_timeline.h')
-rw-r--r-- | drivers/gpu/drm/i915/i915_gem_timeline.h | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/i915_gem_timeline.h b/drivers/gpu/drm/i915/i915_gem_timeline.h index ff65c648407f..bfb5eb94c64d 100644 --- a/drivers/gpu/drm/i915/i915_gem_timeline.h +++ b/drivers/gpu/drm/i915/i915_gem_timeline.h @@ -68,7 +68,14 @@ struct intel_timeline { * redundant and we can discard it without loss of generality. */ struct i915_syncmap *sync; - u32 sync_seqno[I915_NUM_ENGINES]; + /** + * Separately to the inter-context seqno map above, we track the last + * barrier (e.g. semaphore wait) to the global engine timelines. Note + * that this tracks global_seqno rather than the context.seqno, and + * so it is subject to the limitations of hw wraparound and that we + * may need to revoke global_seqno (on pre-emption). + */ + u32 global_sync[I915_NUM_ENGINES]; struct i915_gem_timeline *common; }; |