diff options
| author | Dave Airlie <airlied@redhat.com> | 2024-08-02 14:38:28 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2024-08-02 14:38:28 +1000 |
| commit | 27ce65f65258cf2f2855162cbeef59659a81fac4 (patch) | |
| tree | 4750777712e1f414b2f5b635bd47cd8bd499d50d /drivers/gpu/drm/nouveau/nouveau_bo.c | |
| parent | 4eb399741ff67452eeaf099f366045042401cf3c (diff) | |
Revert "nouveau: rip out busy fence waits"
This reverts commit d45bb9c5f7a6f7b6e47939856b28cb1da0cdc119.
Just got a report that this causes some suspend/resume issues,
so back it out and I'll investigate it later.
Reported-by: Mike Galbraith <efault@gmx.de>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/nouveau_bo.c')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nouveau_bo.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_bo.c b/drivers/gpu/drm/nouveau/nouveau_bo.c index 0712d0b15170..70fb003a6666 100644 --- a/drivers/gpu/drm/nouveau/nouveau_bo.c +++ b/drivers/gpu/drm/nouveau/nouveau_bo.c @@ -898,7 +898,7 @@ nouveau_bo_move_m2mf(struct ttm_buffer_object *bo, int evict, * Without this the operation can timeout and we'll fallback to a * software copy, which might take several minutes to finish. */ - nouveau_fence_wait(fence, false); + nouveau_fence_wait(fence, false, false); ret = ttm_bo_move_accel_cleanup(bo, &fence->base, evict, false, new_reg); nouveau_fence_unref(&fence); |