diff options
author | Christian König <christian.koenig@amd.com> | 2016-06-06 04:17:53 -0400 |
---|---|---|
committer | Alex Deucher <alexander.deucher@amd.com> | 2016-07-07 14:54:35 -0400 |
commit | 88932a7be27d892aef21ff05428a55fefa091716 (patch) | |
tree | f7d422b1a2a541f6e5d9879c0106033b39ad730b /drivers/gpu/drm/qxl | |
parent | 1888577807ea4e7593d27582b02c5b4126a9a642 (diff) |
drm/ttm: add wait for idle in all drivers bo_move functions
Wait for idle before moving the BO in all drivers implementing
an accelerated move function.
This should keep the current behavior when removing the pre move wait.
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.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/gpu/drm/qxl/qxl_ttm.c b/drivers/gpu/drm/qxl/qxl_ttm.c index 0738d74c8d04..89e8be944330 100644 --- a/drivers/gpu/drm/qxl/qxl_ttm.c +++ b/drivers/gpu/drm/qxl/qxl_ttm.c | |||
@@ -350,6 +350,13 @@ static int qxl_bo_move(struct ttm_buffer_object *bo, | |||
350 | struct ttm_mem_reg *new_mem) | 350 | struct ttm_mem_reg *new_mem) |
351 | { | 351 | { |
352 | struct ttm_mem_reg *old_mem = &bo->mem; | 352 | struct ttm_mem_reg *old_mem = &bo->mem; |
353 | int ret; | ||
354 | |||
355 | ret = ttm_bo_wait(bo, interruptible, no_wait_gpu); | ||
356 | if (ret) | ||
357 | return ret; | ||
358 | |||
359 | |||
353 | if (old_mem->mem_type == TTM_PL_SYSTEM && bo->ttm == NULL) { | 360 | if (old_mem->mem_type == TTM_PL_SYSTEM && bo->ttm == NULL) { |
354 | qxl_move_null(bo, new_mem); | 361 | qxl_move_null(bo, new_mem); |
355 | return 0; | 362 | return 0; |