From 0cb1c916e9469a072ac8da9f092740eb8b1b401a Mon Sep 17 00:00:00 2001 From: Mika Kuoppala Date: Wed, 28 Nov 2012 17:18:45 +0200 Subject: [PATCH] --- yaml --- r: 345645 b: refs/heads/master c: 7b01e260a6cad9152eefb44ce64f3a2073af1e6b h: refs/heads/master i: 345643: 5f670f23d12cbc1fface3ef41f84fdd62ada5c18 v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/i915/i915_gem.c | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 90e929a1a5e1..dcb92cee8d8d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: df2b23d97919601218e9229ff517afea83fe5520 +refs/heads/master: 7b01e260a6cad9152eefb44ce64f3a2073af1e6b diff --git a/trunk/drivers/gpu/drm/i915/i915_gem.c b/trunk/drivers/gpu/drm/i915/i915_gem.c index 85a09482c2a9..4ef8b5714337 100644 --- a/trunk/drivers/gpu/drm/i915/i915_gem.c +++ b/trunk/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; }