From ba78b7ee4ceab26b300fecf3a7561e953ba095a4 Mon Sep 17 00:00:00 2001 From: Thomas Hellstrom Date: Mon, 22 Oct 2012 12:51:25 +0000 Subject: [PATCH] --- yaml --- r: 334727 b: refs/heads/master c: 7bc17a7837bf4ec8fd2d63438c0b6b0160c454c1 h: refs/heads/master i: 334725: 08082c06fdeb6744987e2316c7089f9d0c053fe2 334723: 8fe4662da69ee7eac04d969f374cc66a4126eb95 334719: f093f316ff32eb575a29a0c723cfc74cf3b0982c v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/ttm/ttm_bo.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 1ddd0a9d441d..ab674d06209e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a16d4f86019a72b3e8cbb89abff769b25b53ab69 +refs/heads/master: 7bc17a7837bf4ec8fd2d63438c0b6b0160c454c1 diff --git a/trunk/drivers/gpu/drm/ttm/ttm_bo.c b/trunk/drivers/gpu/drm/ttm/ttm_bo.c index 402ab69f9f99..d42631cade5a 100644 --- a/trunk/drivers/gpu/drm/ttm/ttm_bo.c +++ b/trunk/drivers/gpu/drm/ttm/ttm_bo.c @@ -817,11 +817,11 @@ static int ttm_mem_evict_first(struct ttm_bo_device *bdev, goto retry; } - ret = ttm_bo_reserve_locked(bo, false, no_wait_reserve, false, 0); + ret = ttm_bo_reserve_locked(bo, false, true, false, 0); if (unlikely(ret == -EBUSY)) { spin_unlock(&glob->lru_lock); - if (likely(!no_wait_gpu)) + if (likely(!no_wait_reserve)) ret = ttm_bo_wait_unreserved(bo, interruptible); kref_put(&bo->list_kref, ttm_bo_release_list);