drm/amd: Simplify the bo size check funciton
Subsystems (2)
PATCH v2 1/1 drm/amd: Simplify the bo size check funciton
Simplify the code logic of size check function amdgpu_bo_validate_size
Signed-off-by Ma Jun <[email protected]>
--- drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 29 +++++++++------------- 1 file changed, 12 insertions(+), 17 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_object.c +12 -17
@@ -480,7 +480,7 @@ void amdgpu_bo_free_kernel(struct amdgpu_bo **bo, u64 *gpu_addr, *cpu_addr =NULL ; } -/* Validate bo size is bit bigger then the request domain */ +/* Validate bo size is bit bigger than the request domain */ static bool amdgpu_bo_validate_size (struct amdgpu_device *adev,unsigned long size,u32 domain) {
@@ -490,29 +490,24 @@ static bool amdgpu_bo_validate_size(struct amdgpu_device *adev,* If GTT is part of requested domains the check must succeed to * allow fall back to GTT. */ -if (domain &AMDGPU_GEM_DOMAIN_GTT ) { +if (domain &AMDGPU_GEM_DOMAIN_GTT ) man =ttm_manager_type (&adev->mman.bdev,TTM_PL_TT ); - -if (man && size < man->size) -return true; -else if (!man) -WARN_ON_ONCE ("GTT domain requested but GTT mem manager uninitialized" ); - goto fail; - }else if (domain &AMDGPU_GEM_DOMAIN_VRAM ) { +else if (domain &AMDGPU_GEM_DOMAIN_VRAM ) man =ttm_manager_type (&adev->mman.bdev,TTM_PL_VRAM ); +else +return true; -if (man && size < man->size) -return true; - goto fail; +if (!man) { +if (domain &AMDGPU_GEM_DOMAIN_GTT ) +WARN_ON_ONCE ("GTT domain requested but GTT mem manager uninitialized" ); +return false; }/* TODO add more domains checks, such as AMDGPU_GEM_DOMAIN_CPU, _DOMAIN_DOORBELL */ -return true; +if (size < man->size) +return true; -fail: -if (man) -DRM_DEBUG ("BO size %lu > total memory in domain: %llu\n" , size, - man->size); +DRM_DEBUG ("BO size %lu > total memory in domain: %llu\n" , size, man->size);return false; }
Signature · 1 line
2.34.1
Am 28.08.23 um 12:02 schrieb Ma Jun:
Quoted 3 lines
Simplify the code logic of size check function
amdgpu_bo_validate_sizeSigned-off-by Ma Jun <[email protected]>
Reviewed-by Christian König <[email protected]>
Quoted 58 lines
--- drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 29 +++++++++------------- 1 file changed, 12 insertions(+), 17 deletions(-)drivers/gpu/drm/amd/amdgpu/amdgpu_object.c +12
-17@@ -480,7 +480,7 @@ void amdgpu_bo_free_kernel(struct amdgpu_bo **bo, u64 *gpu_addr, *cpu_addr =NULL ; } -/* Validate bo size is bit bigger then the request domain */ +/* Validate bo size is bit bigger than the request domain */ static bool amdgpu_bo_validate_size (struct amdgpu_device *adev,unsigned long size,u32 domain) {@@ -490,29 +490,24 @@ static bool amdgpu_bo_validate_size(struct amdgpu_device *adev,* If GTT is part of requested domains the check must succeed to * allow fall back to GTT. */ -if (domain &AMDGPU_GEM_DOMAIN_GTT ) { +if (domain &AMDGPU_GEM_DOMAIN_GTT ) man =ttm_manager_type (&adev->mman.bdev,TTM_PL_TT ); - -if (man && size < man->size) -return true; -else if (!man) -WARN_ON_ONCE ("GTT domain requested but GTT mem manager uninitialized" ); - goto fail; - }else if (domain &AMDGPU_GEM_DOMAIN_VRAM ) { +else if (domain &AMDGPU_GEM_DOMAIN_VRAM ) man =ttm_manager_type (&adev->mman.bdev,TTM_PL_VRAM ); +else +return true; -if (man && size < man->size) -return true; - goto fail; +if (!man) { +if (domain &AMDGPU_GEM_DOMAIN_GTT ) +WARN_ON_ONCE ("GTT domain requested but GTT mem manager uninitialized" ); +return false; }/* TODO add more domains checks, such as AMDGPU_GEM_DOMAIN_CPU, _DOMAIN_DOORBELL */ -return true; +if (size < man->size) +return true; -fail: -if (man) -DRM_DEBUG ("BO size %lu > total memory in domain: %llu\n" , size, - man->size); +DRM_DEBUG ("BO size %lu > total memory in domain: %llu\n" , size, man->size);return false; }