aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_object.c')
-rw-r--r--drivers/gpu/drm/amd/amdgpu/amdgpu_object.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c
index 6efa8d73b394..f0a0513ef4c2 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c
@@ -391,7 +391,7 @@ int amdgpu_bo_create_restricted(struct amdgpu_device *adev,
391 391
392 if (flags & AMDGPU_GEM_CREATE_VRAM_CLEARED && 392 if (flags & AMDGPU_GEM_CREATE_VRAM_CLEARED &&
393 bo->tbo.mem.placement & TTM_PL_FLAG_VRAM) { 393 bo->tbo.mem.placement & TTM_PL_FLAG_VRAM) {
394 struct fence *fence; 394 struct dma_fence *fence;
395 395
396 if (adev->mman.buffer_funcs_ring == NULL || 396 if (adev->mman.buffer_funcs_ring == NULL ||
397 !adev->mman.buffer_funcs_ring->ready) { 397 !adev->mman.buffer_funcs_ring->ready) {
@@ -411,9 +411,9 @@ int amdgpu_bo_create_restricted(struct amdgpu_device *adev,
411 amdgpu_fill_buffer(bo, 0, bo->tbo.resv, &fence); 411 amdgpu_fill_buffer(bo, 0, bo->tbo.resv, &fence);
412 amdgpu_bo_fence(bo, fence, false); 412 amdgpu_bo_fence(bo, fence, false);
413 amdgpu_bo_unreserve(bo); 413 amdgpu_bo_unreserve(bo);
414 fence_put(bo->tbo.moving); 414 dma_fence_put(bo->tbo.moving);
415 bo->tbo.moving = fence_get(fence); 415 bo->tbo.moving = dma_fence_get(fence);
416 fence_put(fence); 416 dma_fence_put(fence);
417 } 417 }
418 *bo_ptr = bo; 418 *bo_ptr = bo;
419 419
@@ -499,7 +499,7 @@ int amdgpu_bo_backup_to_shadow(struct amdgpu_device *adev,
499 struct amdgpu_ring *ring, 499 struct amdgpu_ring *ring,
500 struct amdgpu_bo *bo, 500 struct amdgpu_bo *bo,
501 struct reservation_object *resv, 501 struct reservation_object *resv,
502 struct fence **fence, 502 struct dma_fence **fence,
503 bool direct) 503 bool direct)
504 504
505{ 505{
@@ -531,7 +531,7 @@ int amdgpu_bo_restore_from_shadow(struct amdgpu_device *adev,
531 struct amdgpu_ring *ring, 531 struct amdgpu_ring *ring,
532 struct amdgpu_bo *bo, 532 struct amdgpu_bo *bo,
533 struct reservation_object *resv, 533 struct reservation_object *resv,
534 struct fence **fence, 534 struct dma_fence **fence,
535 bool direct) 535 bool direct)
536 536
537{ 537{
@@ -941,7 +941,7 @@ int amdgpu_bo_fault_reserve_notify(struct ttm_buffer_object *bo)
941 * @shared: true if fence should be added shared 941 * @shared: true if fence should be added shared
942 * 942 *
943 */ 943 */
944void amdgpu_bo_fence(struct amdgpu_bo *bo, struct fence *fence, 944void amdgpu_bo_fence(struct amdgpu_bo *bo, struct dma_fence *fence,
945 bool shared) 945 bool shared)
946{ 946{
947 struct reservation_object *resv = bo->tbo.resv; 947 struct reservation_object *resv = bo->tbo.resv;