diff options
| author | Alan Hourihane <alanh@fairlite.demon.co.uk> | 2007-06-29 20:09:44 +0100 |
|---|---|---|
| committer | Alan Hourihane <alanh@fairlite.demon.co.uk> | 2007-06-29 20:09:44 +0100 |
| commit | 8a78dead291ffdb5a8774419cdca369a1e27cad9 (patch) | |
| tree | 399b8378e32036bdc7dadc10c639465a8fb21681 /linux-core/i915_fence.c | |
| parent | e79e2a58161d44754fd55507e155b7e12a09c4d2 (diff) | |
| parent | a27af4c4a665864df09123f177ca7269e48f6171 (diff) | |
Merge branch 'master' of git+ssh://git.freedesktop.org/git/mesa/drm into modesetting-101
Conflicts:
linux-core/drm_drv.c
linux-core/drm_fops.c
linux-core/drm_objects.h
linux-core/drm_stub.c
shared-core/i915_dma.c
Diffstat (limited to 'linux-core/i915_fence.c')
| -rw-r--r-- | linux-core/i915_fence.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/linux-core/i915_fence.c b/linux-core/i915_fence.c index 88daa57c..00873485 100644 --- a/linux-core/i915_fence.c +++ b/linux-core/i915_fence.c @@ -61,7 +61,7 @@ static void i915_perform_flush(drm_device_t * dev) * First update fences with the current breadcrumb. */ - diff = sequence - fc->last_exe_flush; + diff = (sequence - fc->last_exe_flush) & BREADCRUMB_MASK; if (diff < driver->wrap_diff && diff != 0) { drm_fence_handler(dev, 0, sequence, DRM_FENCE_TYPE_EXE); } |