leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

drm/amdgpu: use amdgpu_bo_create_user() for when possible

Browse Source 
Use amdgpu_bo_create_user() for all the BO allocations for
ttm_bo_type_device type.

v2: include amdgpu_amdkfd_alloc_gws() as well it calls amdgpu_bo_create()
    for  ttm_bo_type_device

Signed-off-by: Nirmoy Das <nirmoy.das@amd.com>
Reviewed-by: Christian König <christian.koenig@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
This commit is contained in:
Nirmoy Das
2021-03-09 08:31:25 +01:00
committed by Alex Deucher
parent 9ad0d033ed
commit 22b40f7a3a
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c
View File

@@ -318,6 +318,7 @@ int amdgpu_amdkfd_alloc_gws(struct kgd_dev *kgd, size_t size,
{ {
struct amdgpu_device *adev = (struct amdgpu_device *)kgd; struct amdgpu_device *adev = (struct amdgpu_device *)kgd;
struct amdgpu_bo *bo = NULL; struct amdgpu_bo *bo = NULL;
struct amdgpu_bo_user *ubo;
struct amdgpu_bo_param bp; struct amdgpu_bo_param bp;
int r; int r;
@@ -330,13 +331,14 @@ int amdgpu_amdkfd_alloc_gws(struct kgd_dev *kgd, size_t size,
bp.resv = NULL; bp.resv = NULL;
bp.bo_ptr_size = sizeof(struct amdgpu_bo); bp.bo_ptr_size = sizeof(struct amdgpu_bo);
r = amdgpu_bo_create(adev, &bp, &bo); r = amdgpu_bo_create_user(adev, &bp, &ubo);
if (r) { if (r) {
dev_err(adev->dev, dev_err(adev->dev,
"failed to allocate gws BO for amdkfd (%d)\n", r); "failed to allocate gws BO for amdkfd (%d)\n", r);
return r; return r;
} }
bo = &ubo->bo;
*mem_obj = bo; *mem_obj = bo;
return 0; return 0;
} }

4
drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c
View File

@@ -58,6 +58,7 @@ int amdgpu_gem_object_create(struct amdgpu_device *adev, unsigned long size,
struct drm_gem_object **obj) struct drm_gem_object **obj)
{ {
struct amdgpu_bo *bo; struct amdgpu_bo *bo;
struct amdgpu_bo_user *ubo;
struct amdgpu_bo_param bp; struct amdgpu_bo_param bp;
int r; int r;
@@ -73,10 +74,11 @@ int amdgpu_gem_object_create(struct amdgpu_device *adev, unsigned long size,
bp.domain = initial_domain; bp.domain = initial_domain;
bp.bo_ptr_size = sizeof(struct amdgpu_bo); bp.bo_ptr_size = sizeof(struct amdgpu_bo);
r = amdgpu_bo_create(adev, &bp, &bo); r = amdgpu_bo_create_user(adev, &bp, &ubo);
if (r) if (r)
return r; return r;
bo = &ubo->bo;
*obj = &bo->tbo.base; *obj = &bo->tbo.base;
(*obj)->funcs = &amdgpu_gem_object_funcs; (*obj)->funcs = &amdgpu_gem_object_funcs;