diff options
| author | Dave Airlie <airlied@linux.ie> | 2009-09-08 08:38:45 +0400 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2009-09-08 08:43:27 +0400 |
| commit | c746e205f2fb6f74b4a622382607f065eca5eb49 (patch) | |
| tree | f8eb3b1bd8dc09109aacf4f64d05aaf158c26392 /drivers/gpu | |
| parent | 620f37811dcc9e0f97ee79fbf8908fcc097deaee (diff) | |
| download | linux-c746e205f2fb6f74b4a622382607f065eca5eb49.tar.xz | |
drm/radeon/kms: don't allow ERESTART to hit userspace.
the pre-r600 fence code returns ebusy if we get hit by a signal
so we should continue to do that.
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu')
| -rw-r--r-- | drivers/gpu/drm/radeon/radeon_fence.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/drivers/gpu/drm/radeon/radeon_fence.c b/drivers/gpu/drm/radeon/radeon_fence.c index 506dd4dd3a24..01a89633e265 100644 --- a/drivers/gpu/drm/radeon/radeon_fence.c +++ b/drivers/gpu/drm/radeon/radeon_fence.c @@ -199,7 +199,7 @@ int r600_fence_wait(struct radeon_fence *fence, bool intr, bool lazy) schedule_timeout(1); if (intr && signal_pending(current)) { - ret = -ERESTART; + ret = -ERESTARTSYS; break; } } @@ -225,8 +225,12 @@ int radeon_fence_wait(struct radeon_fence *fence, bool intr) return 0; } - if (rdev->family >= CHIP_R600) - return r600_fence_wait(fence, intr, 0); + if (rdev->family >= CHIP_R600) { + r = r600_fence_wait(fence, intr, 0); + if (r == -ERESTARTSYS) + return -EBUSY; + return r; + } retry: cur_jiffies = jiffies; |