hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

drm/nouveau: Move the fence wait before migration resource clean-up. 

Avoids an oops in the fence wait failure path (bug 26521).

Signed-off-by: Francisco Jerez <currojerez@riseup.net>
Tested-by: Marcin Slusarz <marcin.slusarz@gmail.com>
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
This commit is contained in:
Francisco Jerez 2010-07-04 12:54:23 +02:00 committed by Ben Skeggs
parent d3f12da1c5
commit 311ab6943f
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/gpu/drm/nouveau/nouveau_bo.c
View File

@ -461,9 +461,9 @@ nouveau_bo_move_accel_cleanup(struct nouveau_channel *chan,
return ret; return ret;
ret = ttm_bo_move_accel_cleanup(&nvbo->bo, fence, NULL, ret = ttm_bo_move_accel_cleanup(&nvbo->bo, fence, NULL,
evict, no_wait_reserve, no_wait_gpu, new_mem); evict || (nvbo->channel &&
if (nvbo->channel && nvbo->channel != chan) nvbo->channel != chan),
ret = nouveau_fence_wait(fence, NULL, false, false); no_wait_reserve, no_wait_gpu, new_mem);
nouveau_fence_unref((void *)&fence); nouveau_fence_unref((void *)&fence);
return ret; return ret;
} }