diff options
| author | Dave Airlie <airlied@redhat.com> | 2020-09-17 16:36:14 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2020-09-18 06:23:06 +1000 |
| commit | e46f468fef953dea30e7a7c69ad7e0370af26855 (patch) | |
| tree | 582a5780c7a656f72ce34fba72b50118f961a0c0 /include/drm | |
| parent | 92afce9095300cb652ea74a617c6679c4c4d4429 (diff) | |
| download | linux-stable-e46f468fef953dea30e7a7c69ad7e0370af26855.tar.gz linux-stable-e46f468fef953dea30e7a7c69ad7e0370af26855.tar.bz2 linux-stable-e46f468fef953dea30e7a7c69ad7e0370af26855.zip | |
drm/ttm: drop special pipeline accel cleanup function.
The two accel cleanup paths were mostly the same once refactored.
Just pass a bool to say if the evictions are to be pipelined.
Signed-off-by: Dave Airlie <airlied@redhat.com>
Reviewed-by: Christian König <christian.koenig@amd.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200917064132.148521-2-airlied@gmail.com
Diffstat (limited to 'include/drm')
| -rw-r--r-- | include/drm/ttm/ttm_bo_driver.h | 17 |
1 files changed, 2 insertions, 15 deletions
diff --git a/include/drm/ttm/ttm_bo_driver.h b/include/drm/ttm/ttm_bo_driver.h index 25cc932d63f1..864afa8f6f18 100644 --- a/include/drm/ttm/ttm_bo_driver.h +++ b/include/drm/ttm/ttm_bo_driver.h @@ -642,6 +642,7 @@ void ttm_bo_free_old_node(struct ttm_buffer_object *bo); * @bo: A pointer to a struct ttm_buffer_object. * @fence: A fence object that signals when moving is complete. * @evict: This is an evict move. Don't return until the buffer is idle. + * @pipeline: evictions are to be pipelined. * @new_mem: struct ttm_resource indicating where to move. * * Accelerated move function to be called when an accelerated move @@ -653,24 +654,10 @@ void ttm_bo_free_old_node(struct ttm_buffer_object *bo); */ int ttm_bo_move_accel_cleanup(struct ttm_buffer_object *bo, struct dma_fence *fence, bool evict, + bool pipeline, struct ttm_resource *new_mem); /** - * ttm_bo_pipeline_move. - * - * @bo: A pointer to a struct ttm_buffer_object. - * @fence: A fence object that signals when moving is complete. - * @evict: This is an evict move. Don't return until the buffer is idle. - * @new_mem: struct ttm_resource indicating where to move. - * - * Function for pipelining accelerated moves. Either free the memory - * immediately or hang it on a temporary buffer object. - */ -int ttm_bo_pipeline_move(struct ttm_buffer_object *bo, - struct dma_fence *fence, bool evict, - struct ttm_resource *new_mem); - -/** * ttm_bo_pipeline_gutting. * * @bo: A pointer to a struct ttm_buffer_object. |