aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c
diff options
context:
space:
mode:
authorChristian König <christian.koenig@amd.com>2017-04-12 08:41:43 -0400
committerAlex Deucher <alexander.deucher@amd.com>2017-12-06 12:48:02 -0500
commit6fead44a4c5897c1524005ed3228b86120ff3ada (patch)
treee49962694f6e0d4ae3101965e93fdaa913dd3879 /drivers/gpu/drm/amd/amdgpu/amdgpu_object.c
parent19be5570107108fba772bc2e3a1eb22ec32fb021 (diff)
drm/ttm: use an operation ctx for ttm_bo_init_reserved
Instead of specifying if sleeping should be interruptible. Signed-off-by: Christian König <christian.koenig@amd.com> Reviewed-by: Michel Dänzer <michel.daenzer@amd.com> Reviewed-by: Chunming Zhou <david1.zhou@amd.com> Tested-by: Dieter Nützel <Dieter@nuetzel-hh.de> Tested-by: Michel Dänzer <michel.daenzer@amd.com> Acked-by: Felix Kuehling <Felix.Kuehling@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_object.c')
-rw-r--r--drivers/gpu/drm/amd/amdgpu/amdgpu_object.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c
index c2419bc6b3df..15027f751e07 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c
@@ -327,6 +327,7 @@ static int amdgpu_bo_do_create(struct amdgpu_device *adev,
327 uint64_t init_value, 327 uint64_t init_value,
328 struct amdgpu_bo **bo_ptr) 328 struct amdgpu_bo **bo_ptr)
329{ 329{
330 struct ttm_operation_ctx ctx = { !kernel, false };
330 struct amdgpu_bo *bo; 331 struct amdgpu_bo *bo;
331 enum ttm_bo_type type; 332 enum ttm_bo_type type;
332 unsigned long page_align; 333 unsigned long page_align;
@@ -408,7 +409,7 @@ static int amdgpu_bo_do_create(struct amdgpu_device *adev,
408 initial_bytes_moved = atomic64_read(&adev->num_bytes_moved); 409 initial_bytes_moved = atomic64_read(&adev->num_bytes_moved);
409 /* Kernel allocation are uninterruptible */ 410 /* Kernel allocation are uninterruptible */
410 r = ttm_bo_init_reserved(&adev->mman.bdev, &bo->tbo, size, type, 411 r = ttm_bo_init_reserved(&adev->mman.bdev, &bo->tbo, size, type,
411 &bo->placement, page_align, !kernel, NULL, 412 &bo->placement, page_align, &ctx, NULL,
412 acc_size, sg, resv, &amdgpu_ttm_bo_destroy); 413 acc_size, sg, resv, &amdgpu_ttm_bo_destroy);
413 if (unlikely(r != 0)) 414 if (unlikely(r != 0))
414 return r; 415 return r;