From 15c86904706cbb29b1ca20a37ab0d8757e872e4b Mon Sep 17 00:00:00 2001 From: Francisco Jerez Date: Sun, 4 Jul 2010 12:54:23 +0200 Subject: [PATCH] --- yaml --- r: 205059 b: refs/heads/master c: 311ab6943fad769a1435bb375d3c821f3b41cdde h: refs/heads/master i: 205057: 4ce47a3a26373aac1a12ece1505a9e067f5dd190 205055: 2780ae2201aaceda77b3215ecf2363a7bd91706f v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/nouveau/nouveau_bo.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 9f3bf1e25513..2de5db61b140 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d3f12da1c5effa7853bdde31f0ea02f6c604dd04 +refs/heads/master: 311ab6943fad769a1435bb375d3c821f3b41cdde diff --git a/trunk/drivers/gpu/drm/nouveau/nouveau_bo.c b/trunk/drivers/gpu/drm/nouveau/nouveau_bo.c index 9f5ab4677758..1371c77295f2 100644 --- a/trunk/drivers/gpu/drm/nouveau/nouveau_bo.c +++ b/trunk/drivers/gpu/drm/nouveau/nouveau_bo.c @@ -461,9 +461,9 @@ nouveau_bo_move_accel_cleanup(struct nouveau_channel *chan, return ret; ret = ttm_bo_move_accel_cleanup(&nvbo->bo, fence, NULL, - evict, no_wait_reserve, no_wait_gpu, new_mem); - if (nvbo->channel && nvbo->channel != chan) - ret = nouveau_fence_wait(fence, NULL, false, false); + evict || (nvbo->channel && + nvbo->channel != chan), + no_wait_reserve, no_wait_gpu, new_mem); nouveau_fence_unref((void *)&fence); return ret; }