diff options
author | Francisco Jerez <currojerez@riseup.net> | 2010-11-25 18:37:17 +0300 |
---|---|---|
committer | Francisco Jerez <currojerez@riseup.net> | 2010-12-08 05:00:33 +0300 |
commit | 395a31ec7ed9b02c5412f4405acbd6fceacca0fc (patch) | |
tree | 4c423c5a98aa6b361bb6b6022d0d03f3c6e71438 /drivers/gpu/drm/nouveau/nouveau_fence.c | |
parent | a3d487ea5463a9c091b7f9b836b860cf3d82e641 (diff) | |
download | linux-395a31ec7ed9b02c5412f4405acbd6fceacca0fc.tar.xz |
drm/nouveau: Spin for a bit in nouveau_fence_wait() before yielding the CPU.
Sleeping doesn't pay off for very short delays in comparison with the
minimum granularity of schedule_timeout().
Signed-off-by: Francisco Jerez <currojerez@riseup.net>
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/nouveau_fence.c')
-rw-r--r-- | drivers/gpu/drm/nouveau/nouveau_fence.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_fence.c b/drivers/gpu/drm/nouveau/nouveau_fence.c index 2579fc69d182..abfeff19488e 100644 --- a/drivers/gpu/drm/nouveau/nouveau_fence.c +++ b/drivers/gpu/drm/nouveau/nouveau_fence.c @@ -218,6 +218,7 @@ int __nouveau_fence_wait(void *sync_obj, void *sync_arg, bool lazy, bool intr) { unsigned long timeout = jiffies + (3 * DRM_HZ); + unsigned long sleep_time = jiffies + 1; int ret = 0; while (1) { @@ -231,7 +232,7 @@ __nouveau_fence_wait(void *sync_obj, void *sync_arg, bool lazy, bool intr) __set_current_state(intr ? TASK_INTERRUPTIBLE : TASK_UNINTERRUPTIBLE); - if (lazy) + if (lazy && time_after_eq(jiffies, sleep_time)) schedule_timeout(1); if (intr && signal_pending(current)) { |