summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/qxl
diff options
context:
space:
mode:
authorChristian König2016-06-06 10:17:54 +0200
committerAlex Deucher2016-07-07 20:54:35 +0200
commit77dfc28bad2c75493125ba8660e4c27c2dcdab57 (patch)
tree9507a0390a013f019196ee211cb4e14ca5f887b2 /drivers/gpu/drm/qxl
parentdrm/ttm: add wait for idle in all drivers bo_move functions (diff)
downloadkernel-qcow2-linux-77dfc28bad2c75493125ba8660e4c27c2dcdab57.tar.gz
kernel-qcow2-linux-77dfc28bad2c75493125ba8660e4c27c2dcdab57.tar.xz
kernel-qcow2-linux-77dfc28bad2c75493125ba8660e4c27c2dcdab57.zip
drm/ttm: wait for BO idle in ttm_bo_move_memcpy
When we want to pipeline accelerated moves we need to wait in the fallback path. Reviewed-by: Alex Deucher <alexander.deucher@amd.com> Signed-off-by: Christian König <christian.koenig@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers/gpu/drm/qxl')
-rw-r--r--drivers/gpu/drm/qxl/qxl_ttm.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpu/drm/qxl/qxl_ttm.c b/drivers/gpu/drm/qxl/qxl_ttm.c
index 89e8be944330..d50c9679e631 100644
--- a/drivers/gpu/drm/qxl/qxl_ttm.c
+++ b/drivers/gpu/drm/qxl/qxl_ttm.c
@@ -361,7 +361,8 @@ static int qxl_bo_move(struct ttm_buffer_object *bo,
qxl_move_null(bo, new_mem);
return 0;
}
- return ttm_bo_move_memcpy(bo, evict, no_wait_gpu, new_mem);
+ return ttm_bo_move_memcpy(bo, evict, interruptible,
+ no_wait_gpu, new_mem);
}
static void qxl_bo_move_notify(struct ttm_buffer_object *bo,