Skip to content

Commit

Permalink
drm/radeon/r600: use fence->timeout directly
Browse files Browse the repository at this point in the history
Fixes fence timeouts on r6xx/r7xx.  Noticed by
taiu on IRC.

Signed-off-by: Alex Deucher <alexdeucher@gmail.com>
  • Loading branch information
Alex Deucher authored and Dave Airlie committed Sep 8, 2009
1 parent 60d15f5 commit cecc6b6
Showing 1 changed file with 1 addition and 10 deletions.
11 changes: 1 addition & 10 deletions drivers/gpu/drm/radeon/radeon_fence.c
Original file line number Diff line number Diff line change
Expand Up @@ -171,17 +171,8 @@ bool radeon_fence_signaled(struct radeon_fence *fence)
int r600_fence_wait(struct radeon_fence *fence, bool intr, bool lazy)
{
struct radeon_device *rdev;
unsigned long cur_jiffies;
unsigned long timeout;
int ret = 0;

cur_jiffies = jiffies;
timeout = HZ / 100;

if (time_after(fence->timeout, cur_jiffies)) {
timeout = fence->timeout - cur_jiffies;
}

rdev = fence->rdev;

__set_current_state(intr ? TASK_INTERRUPTIBLE : TASK_UNINTERRUPTIBLE);
Expand All @@ -190,7 +181,7 @@ int r600_fence_wait(struct radeon_fence *fence, bool intr, bool lazy)
if (radeon_fence_signaled(fence))
break;

if (time_after_eq(jiffies, timeout)) {
if (time_after_eq(jiffies, fence->timeout)) {
ret = -EBUSY;
break;
}
Expand Down

0 comments on commit cecc6b6

Please sign in to comment.