diff options
| author | Ben Widawsky | 2012-04-11 20:18:20 +0200 |
|---|---|---|
| committer | Daniel Vetter | 2012-04-12 21:14:13 +0200 |
| commit | e3a5a2250aa9e67d169f33e6c91dc7604cab513b (patch) | |
| tree | 36840e9d848133d78485cc149d323ec26bb36f81 /drivers/gpu | |
| parent | drm/i915: i915_gem_object_sync must handle NULL (diff) | |
| download | kernel-qcow2-linux-e3a5a2250aa9e67d169f33e6c91dc7604cab513b.tar.gz kernel-qcow2-linux-e3a5a2250aa9e67d169f33e6c91dc7604cab513b.tar.xz kernel-qcow2-linux-e3a5a2250aa9e67d169f33e6c91dc7604cab513b.zip | |
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: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Ben Widawsky <benjamin.widawsky@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')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_gem.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c index 9fcdc9a917eb..0115b12df573 100644 --- a/drivers/gpu/drm/i915/i915_gem.c +++ b/drivers/gpu/drm/i915/i915_gem.c @@ -2001,10 +2001,12 @@ i915_gem_object_sync(struct drm_i915_gem_object *obj, 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) |