Commit e3a5a225 authored by Ben Widawsky's avatar Ben Widawsky Committed by Daniel Vetter

drm/i915: fix for when semaphore updates fail

This fixes a long standing issue where emitting the semaphore updates
may have failed, but we've already updated our internal data structure.
Reported-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: default avatarBen Widawsky <benjamin.widawsky@intel.com>
Reviewed-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 5816d648
...@@ -2001,10 +2001,12 @@ i915_gem_object_sync(struct drm_i915_gem_object *obj, ...@@ -2001,10 +2001,12 @@ i915_gem_object_sync(struct drm_i915_gem_object *obj,
seqno = request->seqno; seqno = request->seqno;
} }
from->sync_seqno[idx] = seqno;
return to->sync_to(to, from, seqno - 1); ret = to->sync_to(to, from, seqno - 1);
if (!ret)
from->sync_seqno[idx] = seqno;
return ret;
} }
static void i915_gem_object_finish_gtt(struct drm_i915_gem_object *obj) static void i915_gem_object_finish_gtt(struct drm_i915_gem_object *obj)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment