diff options
| author | Mika Kuoppala | 2012-11-28 16:18:45 +0100 |
|---|---|---|
| committer | Daniel Vetter | 2012-11-29 11:43:54 +0100 |
| commit | 7b01e260a6cad9152eefb44ce64f3a2073af1e6b (patch) | |
| tree | dcd6f9de12bf3e22c79561b5f1a7b9a7aa42f4e3 /drivers/gpu/drm/i915/i915_gem.c | |
| parent | drm/i915: Include the last semaphore sync point in the error-state (diff) | |
| download | kernel-qcow2-linux-7b01e260a6cad9152eefb44ce64f3a2073af1e6b.tar.gz kernel-qcow2-linux-7b01e260a6cad9152eefb44ce64f3a2073af1e6b.tar.xz kernel-qcow2-linux-7b01e260a6cad9152eefb44ce64f3a2073af1e6b.zip | |
drm/i915: Set sync_seqno properly after seqno wrap
i915_gem_handle_seqno_wrap() will zero all sync_seqnos but as the
wrap can happen inside ring->sync_to(), pre wrap seqno was
carried over and overwrote the zeroed sync_seqno.
When wrap is handled, all outstanding requests will be retired and
objects moved to inactive queue, causing their last_read_seqno to be zero.
Use this to update the sync_seqno correctly.
RING_SYNC registers after wrap will contain pre wrap values which
are >= seqno. So injecting the semaphore wait into ring completes
immediately.
Original idea for using last_read_seqno from Chris Wilson.
Signed-off-by: Mika Kuoppala <mika.kuoppala@intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm/i915/i915_gem.c')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_gem.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c index 85a09482c2a9..4ef8b5714337 100644 --- a/drivers/gpu/drm/i915/i915_gem.c +++ b/drivers/gpu/drm/i915/i915_gem.c @@ -2397,7 +2397,11 @@ i915_gem_object_sync(struct drm_i915_gem_object *obj, ret = to->sync_to(to, from, seqno); if (!ret) - from->sync_seqno[idx] = seqno; + /* We use last_read_seqno because sync_to() + * might have just caused seqno wrap under + * the radar. + */ + from->sync_seqno[idx] = obj->last_read_seqno; return ret; } |