提交 53766e5a 编写于 作者: C Christian König 提交者: Alex Deucher

drm/amdgpu: improve amdgpu_bo_create_kernel

Make allocating the new BO optional.
Signed-off-by: NChristian König <christian.koenig@amd.com>
Reviewed-by: NAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: NAlex Deucher <alexander.deucher@amd.com>
上级 ed5b89c6
...@@ -239,15 +239,20 @@ int amdgpu_bo_create_kernel(struct amdgpu_device *adev, ...@@ -239,15 +239,20 @@ int amdgpu_bo_create_kernel(struct amdgpu_device *adev,
u32 domain, struct amdgpu_bo **bo_ptr, u32 domain, struct amdgpu_bo **bo_ptr,
u64 *gpu_addr, void **cpu_addr) u64 *gpu_addr, void **cpu_addr)
{ {
bool free = false;
int r; int r;
r = amdgpu_bo_create(adev, size, align, true, domain, if (!*bo_ptr) {
AMDGPU_GEM_CREATE_CPU_ACCESS_REQUIRED | r = amdgpu_bo_create(adev, size, align, true, domain,
AMDGPU_GEM_CREATE_VRAM_CONTIGUOUS, AMDGPU_GEM_CREATE_CPU_ACCESS_REQUIRED |
NULL, NULL, bo_ptr); AMDGPU_GEM_CREATE_VRAM_CONTIGUOUS,
if (r) { NULL, NULL, bo_ptr);
dev_err(adev->dev, "(%d) failed to allocate kernel bo\n", r); if (r) {
return r; dev_err(adev->dev, "(%d) failed to allocate kernel bo\n",
r);
return r;
}
free = true;
} }
r = amdgpu_bo_reserve(*bo_ptr, false); r = amdgpu_bo_reserve(*bo_ptr, false);
...@@ -278,7 +283,8 @@ int amdgpu_bo_create_kernel(struct amdgpu_device *adev, ...@@ -278,7 +283,8 @@ int amdgpu_bo_create_kernel(struct amdgpu_device *adev,
amdgpu_bo_unreserve(*bo_ptr); amdgpu_bo_unreserve(*bo_ptr);
error_free: error_free:
amdgpu_bo_unref(bo_ptr); if (free)
amdgpu_bo_unref(bo_ptr);
return r; return r;
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册