diff options
Diffstat (limited to 'drivers/gpu/drm/mgag200/mgag200_ttm.c')
| -rw-r--r-- | drivers/gpu/drm/mgag200/mgag200_ttm.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/gpu/drm/mgag200/mgag200_ttm.c b/drivers/gpu/drm/mgag200/mgag200_ttm.c index 1504699666c4..8fc9d9201945 100644 --- a/drivers/gpu/drm/mgag200/mgag200_ttm.c +++ b/drivers/gpu/drm/mgag200/mgag200_ttm.c | |||
| @@ -186,11 +186,11 @@ static void mgag200_ttm_io_mem_free(struct ttm_bo_device *bdev, struct ttm_mem_r | |||
| 186 | 186 | ||
| 187 | static int mgag200_bo_move(struct ttm_buffer_object *bo, | 187 | static int mgag200_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 | ||
| @@ -355,7 +355,7 @@ int mgag200_bo_create(struct drm_device *dev, int size, int align, | |||
| 355 | 355 | ||
| 356 | ret = ttm_bo_init(&mdev->ttm.bdev, &mgabo->bo, size, | 356 | ret = ttm_bo_init(&mdev->ttm.bdev, &mgabo->bo, size, |
| 357 | ttm_bo_type_device, &mgabo->placement, | 357 | ttm_bo_type_device, &mgabo->placement, |
| 358 | align >> PAGE_SHIFT, 0, false, NULL, acc_size, | 358 | align >> PAGE_SHIFT, false, NULL, acc_size, |
| 359 | NULL, mgag200_bo_ttm_destroy); | 359 | NULL, mgag200_bo_ttm_destroy); |
| 360 | if (ret) | 360 | if (ret) |
| 361 | return ret; | 361 | return ret; |
| @@ -382,7 +382,7 @@ int mgag200_bo_pin(struct mgag200_bo *bo, u32 pl_flag, u64 *gpu_addr) | |||
| 382 | mgag200_ttm_placement(bo, pl_flag); | 382 | mgag200_ttm_placement(bo, pl_flag); |
| 383 | for (i = 0; i < bo->placement.num_placement; i++) | 383 | for (i = 0; i < bo->placement.num_placement; i++) |
| 384 | bo->placements[i] |= TTM_PL_FLAG_NO_EVICT; | 384 | bo->placements[i] |= TTM_PL_FLAG_NO_EVICT; |
| 385 | ret = ttm_bo_validate(&bo->bo, &bo->placement, false, false, false); | 385 | ret = ttm_bo_validate(&bo->bo, &bo->placement, false, false); |
| 386 | if (ret) | 386 | if (ret) |
| 387 | return ret; | 387 | return ret; |
| 388 | 388 | ||
| @@ -405,7 +405,7 @@ int mgag200_bo_unpin(struct mgag200_bo *bo) | |||
| 405 | 405 | ||
| 406 | for (i = 0; i < bo->placement.num_placement ; i++) | 406 | for (i = 0; i < bo->placement.num_placement ; i++) |
| 407 | bo->placements[i] &= ~TTM_PL_FLAG_NO_EVICT; | 407 | bo->placements[i] &= ~TTM_PL_FLAG_NO_EVICT; |
| 408 | ret = ttm_bo_validate(&bo->bo, &bo->placement, false, false, false); | 408 | ret = ttm_bo_validate(&bo->bo, &bo->placement, false, false); |
| 409 | if (ret) | 409 | if (ret) |
| 410 | return ret; | 410 | return ret; |
| 411 | 411 | ||
| @@ -430,7 +430,7 @@ int mgag200_bo_push_sysram(struct mgag200_bo *bo) | |||
| 430 | for (i = 0; i < bo->placement.num_placement ; i++) | 430 | for (i = 0; i < bo->placement.num_placement ; i++) |
| 431 | bo->placements[i] |= TTM_PL_FLAG_NO_EVICT; | 431 | bo->placements[i] |= TTM_PL_FLAG_NO_EVICT; |
| 432 | 432 | ||
| 433 | ret = ttm_bo_validate(&bo->bo, &bo->placement, false, false, false); | 433 | ret = ttm_bo_validate(&bo->bo, &bo->placement, false, false); |
| 434 | if (ret) { | 434 | if (ret) { |
| 435 | DRM_ERROR("pushing to VRAM failed\n"); | 435 | DRM_ERROR("pushing to VRAM failed\n"); |
| 436 | return ret; | 436 | return ret; |
