diff options
| author | Thomas Hellstrom <thomas-at-tungstengraphics-dot-com> | 2006-09-12 12:01:00 +0200 |
|---|---|---|
| committer | Thomas Hellstrom <thomas-at-tungstengraphics-dot-com> | 2006-09-12 12:01:00 +0200 |
| commit | 191e284709ee792a32124e96e43d5876406b93dc (patch) | |
| tree | e6fdf405683aab861f1daa82a403062681d6875c /linux-core/drm_fence.c | |
| parent | 99acb7936660843090ea8a9f22d2d50d9433e0de (diff) | |
More bugfixes.
Disable the i915 IRQ turnoff for now since it seems to be causing problems.
Diffstat (limited to 'linux-core/drm_fence.c')
| -rw-r--r-- | linux-core/drm_fence.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/linux-core/drm_fence.c b/linux-core/drm_fence.c index eaaf7f40..df5db702 100644 --- a/linux-core/drm_fence.c +++ b/linux-core/drm_fence.c @@ -359,12 +359,11 @@ int drm_fence_object_wait(drm_device_t * dev, drm_fence_object_t * fence, fence_signaled(dev, fence, mask, 1)); if (time_after_eq(jiffies, _end)) break; - } while (ret == -EINTR && ignore_signals); - + } while (ret == -EINTR && ignore_signals); if (time_after_eq(jiffies, _end) && (ret != 0)) ret = -EBUSY; - return ret; - + if (ret) + return ((ret == -EINTR) ? -EAGAIN : ret); } else { int signaled; do { |