diff options
| author | Christian König <christian.koenig@amd.com> | 2016-06-06 10:17:54 +0200 |
|---|---|---|
| committer | Alex Deucher <alexander.deucher@amd.com> | 2016-07-07 14:54:35 -0400 |
| commit | 77dfc28bad2c75493125ba8660e4c27c2dcdab57 (patch) | |
| tree | 9507a0390a013f019196ee211cb4e14ca5f887b2 /include/drm | |
| parent | 88932a7be27d892aef21ff05428a55fefa091716 (diff) | |
| download | linux-stable-77dfc28bad2c75493125ba8660e4c27c2dcdab57.tar.gz linux-stable-77dfc28bad2c75493125ba8660e4c27c2dcdab57.tar.bz2 linux-stable-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 'include/drm')
| -rw-r--r-- | include/drm/ttm/ttm_bo_driver.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/include/drm/ttm/ttm_bo_driver.h b/include/drm/ttm/ttm_bo_driver.h index da6ee17d7c0b..0d1d9d78c650 100644 --- a/include/drm/ttm/ttm_bo_driver.h +++ b/include/drm/ttm/ttm_bo_driver.h @@ -970,6 +970,7 @@ extern int ttm_bo_move_ttm(struct ttm_buffer_object *bo, * * @bo: A pointer to a struct ttm_buffer_object. * @evict: 1: This is an eviction. Don't try to pipeline. + * @interruptible: Sleep interruptible if waiting. * @no_wait_gpu: Return immediately if the GPU is busy. * @new_mem: struct ttm_mem_reg indicating where to move. * @@ -984,7 +985,8 @@ extern int ttm_bo_move_ttm(struct ttm_buffer_object *bo, */ extern int ttm_bo_move_memcpy(struct ttm_buffer_object *bo, - bool evict, bool no_wait_gpu, + bool evict, bool interruptible, + bool no_wait_gpu, struct ttm_mem_reg *new_mem); /** |