diff options
Diffstat (limited to 'drivers/gpu/drm/cirrus/cirrus_ttm.c')
-rw-r--r-- | drivers/gpu/drm/cirrus/cirrus_ttm.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/gpu/drm/cirrus/cirrus_ttm.c b/drivers/gpu/drm/cirrus/cirrus_ttm.c index bc83f835c830..1413a26e4905 100644 --- a/drivers/gpu/drm/cirrus/cirrus_ttm.c +++ b/drivers/gpu/drm/cirrus/cirrus_ttm.c | |||
@@ -186,11 +186,11 @@ static void cirrus_ttm_io_mem_free(struct ttm_bo_device *bdev, struct ttm_mem_re | |||
186 | 186 | ||
187 | static int cirrus_bo_move(struct ttm_buffer_object *bo, | 187 | static int cirrus_bo_move(struct ttm_buffer_object *bo, |
188 | bool evict, bool interruptible, | 188 | bool evict, bool interruptible, |
189 | bool no_wait_reserve, bool no_wait_gpu, | 189 | bool no_wait_gpu, |
190 | struct ttm_mem_reg *new_mem) | 190 | struct ttm_mem_reg *new_mem) |
191 | { | 191 | { |
192 | int r; | 192 | int r; |
193 | r = ttm_bo_move_memcpy(bo, evict, no_wait_reserve, no_wait_gpu, new_mem); | 193 | r = ttm_bo_move_memcpy(bo, evict, no_wait_gpu, new_mem); |
194 | return r; | 194 | return r; |
195 | } | 195 | } |
196 | 196 | ||
@@ -361,7 +361,7 @@ int cirrus_bo_create(struct drm_device *dev, int size, int align, | |||
361 | 361 | ||
362 | ret = ttm_bo_init(&cirrus->ttm.bdev, &cirrusbo->bo, size, | 362 | ret = ttm_bo_init(&cirrus->ttm.bdev, &cirrusbo->bo, size, |
363 | ttm_bo_type_device, &cirrusbo->placement, | 363 | ttm_bo_type_device, &cirrusbo->placement, |
364 | align >> PAGE_SHIFT, 0, false, NULL, acc_size, | 364 | align >> PAGE_SHIFT, false, NULL, acc_size, |
365 | NULL, cirrus_bo_ttm_destroy); | 365 | NULL, cirrus_bo_ttm_destroy); |
366 | if (ret) | 366 | if (ret) |
367 | return ret; | 367 | return ret; |
@@ -388,7 +388,7 @@ int cirrus_bo_pin(struct cirrus_bo *bo, u32 pl_flag, u64 *gpu_addr) | |||
388 | cirrus_ttm_placement(bo, pl_flag); | 388 | cirrus_ttm_placement(bo, pl_flag); |
389 | for (i = 0; i < bo->placement.num_placement; i++) | 389 | for (i = 0; i < bo->placement.num_placement; i++) |
390 | bo->placements[i] |= TTM_PL_FLAG_NO_EVICT; | 390 | bo->placements[i] |= TTM_PL_FLAG_NO_EVICT; |
391 | ret = ttm_bo_validate(&bo->bo, &bo->placement, false, false, false); | 391 | ret = ttm_bo_validate(&bo->bo, &bo->placement, false, false); |
392 | if (ret) | 392 | if (ret) |
393 | return ret; | 393 | return ret; |
394 | 394 | ||
@@ -411,7 +411,7 @@ int cirrus_bo_unpin(struct cirrus_bo *bo) | |||
411 | 411 | ||
412 | for (i = 0; i < bo->placement.num_placement ; i++) | 412 | for (i = 0; i < bo->placement.num_placement ; i++) |
413 | bo->placements[i] &= ~TTM_PL_FLAG_NO_EVICT; | 413 | bo->placements[i] &= ~TTM_PL_FLAG_NO_EVICT; |
414 | ret = ttm_bo_validate(&bo->bo, &bo->placement, false, false, false); | 414 | ret = ttm_bo_validate(&bo->bo, &bo->placement, false, false); |
415 | if (ret) | 415 | if (ret) |
416 | return ret; | 416 | return ret; |
417 | 417 | ||
@@ -436,7 +436,7 @@ int cirrus_bo_push_sysram(struct cirrus_bo *bo) | |||
436 | for (i = 0; i < bo->placement.num_placement ; i++) | 436 | for (i = 0; i < bo->placement.num_placement ; i++) |
437 | bo->placements[i] |= TTM_PL_FLAG_NO_EVICT; | 437 | bo->placements[i] |= TTM_PL_FLAG_NO_EVICT; |
438 | 438 | ||
439 | ret = ttm_bo_validate(&bo->bo, &bo->placement, false, false, false); | 439 | ret = ttm_bo_validate(&bo->bo, &bo->placement, false, false); |
440 | if (ret) { | 440 | if (ret) { |
441 | DRM_ERROR("pushing to VRAM failed\n"); | 441 | DRM_ERROR("pushing to VRAM failed\n"); |
442 | return ret; | 442 | return ret; |