diff options
| author |   Maarten Lankhorst <maarten.lankhorst@canonical.com> | 2014-09-16 11:15:07 +0200 |
|---|---|---|
| committer | Maarten Lankhorst <maarten.lankhorst@canonical.com> | 2014-09-30 14:04:00 +0200 |
| commit | e3be4c230dfadf79567a245505a47a90db97f968 (patch) | |
| tree | 295bc183975875ae06e0bb6fb9920708a21f84cd /drivers/gpu/drm/nouveau/nouveau_bo.c | |
| parent | drm/nouveau: bump driver patchlevel to 1.2.1 (diff) | |
| download | linux-dev-e3be4c230dfadf79567a245505a47a90db97f968.tar.xz linux-dev-e3be4c230dfadf79567a245505a47a90db97f968.zip | |
drm/nouveau: specify if interruptible wait is desired in nouveau_fence_sync
Signed-off-by: Maarten Lankhorst <maarten.lankhorst@canonical.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 eea74b127b03..049f5de90928 100644 --- a/drivers/gpu/drm/nouveau/nouveau_bo.c +++ b/drivers/gpu/drm/nouveau/nouveau_bo.c @@ -970,7 +970,7 @@ nouveau_bo_move_m2mf(struct ttm_buffer_object *bo, int evict, bool intr, } mutex_lock_nested(&cli->mutex, SINGLE_DEPTH_NESTING); - ret = nouveau_fence_sync(nouveau_bo(bo), chan, true); + ret = nouveau_fence_sync(nouveau_bo(bo), chan, true, intr); if (ret == 0) { ret = drm->ttm.move(chan, bo, &bo->mem, new_mem); if (ret == 0) { |