diff options
| author | Dave Airlie <airlied@redhat.com> | 2007-10-05 12:11:43 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2007-10-05 12:11:43 +1000 |
| commit | 19b7cc34443889fc73de2e10462e1c0f9fa38041 (patch) | |
| tree | 1cd73a2ef2aaed132cbc766e4ad4a8d2e3dde4e6 /linux-core/i915_fence.c | |
| parent | d351601899e5814d809b8e86ab6f0d6e7676f585 (diff) | |
| parent | 495bbbaadc93c574eb98dd2ad64bdca4d91d4152 (diff) | |
Merge branch 'pre-superioctl-branch'
Diffstat (limited to 'linux-core/i915_fence.c')
| -rw-r--r-- | linux-core/i915_fence.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/linux-core/i915_fence.c b/linux-core/i915_fence.c index 89830333..a0f22785 100644 --- a/linux-core/i915_fence.c +++ b/linux-core/i915_fence.c @@ -63,7 +63,8 @@ static void i915_perform_flush(struct drm_device * dev) 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); + drm_fence_handler(dev, 0, sequence, + DRM_FENCE_TYPE_EXE, 0); } if (dev_priv->fence_irq_on && !fc->pending_exe_flush) { @@ -82,7 +83,7 @@ static void i915_perform_flush(struct drm_device * dev) flush_flags = dev_priv->flush_flags; flush_sequence = dev_priv->flush_sequence; dev_priv->flush_pending = 0; - drm_fence_handler(dev, 0, flush_sequence, flush_flags); + drm_fence_handler(dev, 0, flush_sequence, flush_flags, 0); } } @@ -103,7 +104,7 @@ static void i915_perform_flush(struct drm_device * dev) flush_flags = dev_priv->flush_flags; flush_sequence = dev_priv->flush_sequence; dev_priv->flush_pending = 0; - drm_fence_handler(dev, 0, flush_sequence, flush_flags); + drm_fence_handler(dev, 0, flush_sequence, flush_flags, 0); } } |