drm/amdgpu: fix coding style in amdgpu_object.c
Subsystems (2)
PATCH 1/1 drm/amdgpu: fix coding style in amdgpu_object.c
From: Christian König <[email protected]>
Just a few 80 chars problems.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 86 +++++++++++++++++------------- 1 file changed, 49 insertions(+), 37 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_object.c +49 -37
@@ -44,14 +44,13 @@ void amdgpu_ttm_fini(struct amdgpu_device *adev);static u64 amdgpu_get_vis_part_size (struct amdgpu_device *adev,struct ttm_mem_reg *mem) { -u64 ret =0 ; -if (mem->start <<PAGE_SHIFT < adev->mc.visible_vram_size) { - ret = (u64)((mem->start <<PAGE_SHIFT ) + mem->size) > - adev->mc.visible_vram_size ? - adev->mc.visible_vram_size - (mem->start <<PAGE_SHIFT ) : - mem->size; - } -return ret; +if (mem->start <<PAGE_SHIFT >= adev->mc.visible_vram_size) +return 0 ; + +return ((mem->start <<PAGE_SHIFT ) + mem->size) > + adev->mc.visible_vram_size ? + adev->mc.visible_vram_size - (mem->start <<PAGE_SHIFT ) : + mem->size; } static void amdgpu_update_memory_usage(struct amdgpu_device *adev,
@@ -125,8 +124,9 @@ static void amdgpu_ttm_placement_init(struct amdgpu_device *adev, adev->mc.visible_vram_size < adev->mc.real_vram_size) { placements[c].fpfn = adev->mc.visible_vram_size >>PAGE_SHIFT ; - placements[c++].flags =TTM_PL_FLAG_WC |TTM_PL_FLAG_UNCACHED | -TTM_PL_FLAG_VRAM |TTM_PL_FLAG_TOPDOWN ; + placements[c++].flags =TTM_PL_FLAG_WC | +TTM_PL_FLAG_UNCACHED |TTM_PL_FLAG_VRAM | +TTM_PL_FLAG_TOPDOWN ; } placements[c].fpfn =0 ; placements[c++].flags = TTM_PL_FLAG_WC | TTM_PL_FLAG_UNCACHED |
@@ -138,22 +138,24 @@ static void amdgpu_ttm_placement_init(struct amdgpu_device *adev,if (domain &AMDGPU_GEM_DOMAIN_GTT ) {if (flags &AMDGPU_GEM_CREATE_CPU_GTT_USWC ) { placements[c].fpfn =0 ; - placements[c++].flags =TTM_PL_FLAG_WC |TTM_PL_FLAG_TT | -TTM_PL_FLAG_UNCACHED ; + placements[c++].flags =TTM_PL_FLAG_WC | +TTM_PL_FLAG_TT |TTM_PL_FLAG_UNCACHED ; }else { placements[c].fpfn =0 ; - placements[c++].flags =TTM_PL_FLAG_CACHED |TTM_PL_FLAG_TT ; + placements[c++].flags =TTM_PL_FLAG_CACHED | +TTM_PL_FLAG_TT ; } }if (domain &AMDGPU_GEM_DOMAIN_CPU ) {if (flags &AMDGPU_GEM_CREATE_CPU_GTT_USWC ) { placements[c].fpfn =0 ; - placements[c++].flags =TTM_PL_FLAG_WC |TTM_PL_FLAG_SYSTEM | -TTM_PL_FLAG_UNCACHED ; + placements[c++].flags =TTM_PL_FLAG_WC | +TTM_PL_FLAG_SYSTEM |TTM_PL_FLAG_UNCACHED ; }else { placements[c].fpfn =0 ; - placements[c++].flags =TTM_PL_FLAG_CACHED |TTM_PL_FLAG_SYSTEM ; + placements[c++].flags =TTM_PL_FLAG_CACHED | +TTM_PL_FLAG_SYSTEM ; } }
@@ -539,7 +541,8 @@ int amdgpu_bo_pin_restricted(struct amdgpu_bo *bo, u32 domain,/* force to pin into visible video ram */ if ((bo->placements[i].flags &TTM_PL_FLAG_VRAM ) && !(bo->flags &AMDGPU_GEM_CREATE_NO_CPU_ACCESS ) && - (!max_offset || max_offset > bo->adev->mc.visible_vram_size)) { + (!max_offset || max_offset > + bo->adev->mc.visible_vram_size)) {if (WARN_ON_ONCE (min_offset > bo->adev->mc.visible_vram_size))return -EINVAL ;
@@ -558,19 +561,23 @@ int amdgpu_bo_pin_restricted(struct amdgpu_bo *bo, u32 domain, } r =ttm_bo_validate (&bo->tbo, &bo->placement, false, false); -if (likely (r ==0 )) { - bo->pin_count =1 ; -if (gpu_addr !=NULL ) - *gpu_addr =amdgpu_bo_gpu_offset (bo); -if (domain ==AMDGPU_GEM_DOMAIN_VRAM ) { - bo->adev->vram_pin_size +=amdgpu_bo_size (bo); -if (bo->flags &AMDGPU_GEM_CREATE_NO_CPU_ACCESS ) - bo->adev->invisible_pin_size +=amdgpu_bo_size (bo); - }else - bo->adev->gart_pin_size +=amdgpu_bo_size (bo); - }else { +if (unlikely (r)) {dev_err (bo->adev->dev,"%p pin failed\n" , bo); + goto error; + } + + bo->pin_count =1 ; +if (gpu_addr !=NULL ) + *gpu_addr =amdgpu_bo_gpu_offset (bo); +if (domain ==AMDGPU_GEM_DOMAIN_VRAM ) { + bo->adev->vram_pin_size +=amdgpu_bo_size (bo); +if (bo->flags &AMDGPU_GEM_CREATE_NO_CPU_ACCESS ) + bo->adev->invisible_pin_size +=amdgpu_bo_size (bo); + }else { + bo->adev->gart_pin_size +=amdgpu_bo_size (bo); } + +error:return r; }
@@ -595,16 +602,20 @@ int amdgpu_bo_unpin(struct amdgpu_bo *bo) bo->placements[i].flags &= ~TTM_PL_FLAG_NO_EVICT ; } r =ttm_bo_validate (&bo->tbo, &bo->placement, false, false); -if (likely (r ==0 )) { -if (bo->tbo.mem.mem_type ==TTM_PL_VRAM ) { - bo->adev->vram_pin_size -=amdgpu_bo_size (bo); -if (bo->flags &AMDGPU_GEM_CREATE_NO_CPU_ACCESS ) - bo->adev->invisible_pin_size -=amdgpu_bo_size (bo); - }else - bo->adev->gart_pin_size -=amdgpu_bo_size (bo); - }else { +if (unlikely (r)) {dev_err (bo->adev->dev,"%p validate failed for unpin\n" , bo); + goto error; } + +if (bo->tbo.mem.mem_type ==TTM_PL_VRAM ) { + bo->adev->vram_pin_size -=amdgpu_bo_size (bo); +if (bo->flags &AMDGPU_GEM_CREATE_NO_CPU_ACCESS ) + bo->adev->invisible_pin_size -=amdgpu_bo_size (bo); + }else { + bo->adev->gart_pin_size -=amdgpu_bo_size (bo); + } + +error:return r; }
@@ -775,7 +786,8 @@ int amdgpu_bo_fault_reserve_notify(struct ttm_buffer_object *bo)for (i =0 ; i < abo->placement.num_placement; i++) {/* Force into visible VRAM */ if ((abo->placements[i].flags &TTM_PL_FLAG_VRAM ) && - (!abo->placements[i].lpfn || abo->placements[i].lpfn > lpfn)) + (!abo->placements[i].lpfn || + abo->placements[i].lpfn > lpfn)) abo->placements[i].lpfn = lpfn; } r =ttm_bo_validate (bo, &abo->placement, false, false);
Signature · 6 lines
2.5.0 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
A message that is not in the archive (sent off-list or not yet received): 1471021136-5942-1-git-send-email-deathsimple-ANTagKRnAhcb1SvskN2V4Q@public.gmane.org
Deucher, Alexander
Reviewed-by Alex DeucherQuoted 7 lines
-----Original Message-----
From: amd-gfx [mailto:[email protected]] On Behalf Of Christian König
Sent: Friday, August 12, 2016 12:59 PM
To: [email protected]
Subject: [PATCH] drm/amdgpu: fix coding style inamdgpu_object.c
Quoted 5 lines
From: Christian König <[email protected]>
Just a few 80 chars problems.
Signed-off-by Christian König <[email protected]>
Quoted 189 lines
--- drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 86 +++++++++++++++++------------- 1 file changed, 49 insertions(+), 37 deletions(-)drivers/gpu/drm/amd/amdgpu/amdgpu_object.c +0
-5@@ -44,14 +44,13 @@ void amdgpu_ttm_fini(struct amdgpu_device *adev);static u64 amdgpu_get_vis_part_size (struct amdgpu_device *adev,struct ttm_mem_reg *mem) { -u64 ret =0 ; -if (mem->start <<PAGE_SHIFT < adev->mc.visible_vram_size) { - ret = (u64)((mem->start <<PAGE_SHIFT ) + mem->size) > - adev->mc.visible_vram_size ? - adev->mc.visible_vram_size - (mem->start <<
PAGE_SHIFT) :drivers/gpu/drm/amd/amdgpu/amdgpu_object.c +7
-4- mem->size; - } -return ret; +if (mem->start <<PAGE_SHIFT >= adev->mc.visible_vram_size) +return 0 ; + +return ((mem->start <<PAGE_SHIFT ) + mem->size) > + adev->mc.visible_vram_size ? + adev->mc.visible_vram_size - (mem->start <<PAGE_SHIFT ) : + mem->size; } static void amdgpu_update_memory_usage(struct amdgpu_device *adev,@@ -125,8 +124,9 @@ static void amdgpu_ttm_placement_init(struct amdgpu_device *adev, adev->mc.visible_vram_size < adev- >mc.real_vram_size) { placements[c].fpfn = adev->mc.visible_vram_size >>PAGE_SHIFT ; - placements[c++].flags = TTM_PL_FLAG_WC |
TTM_PL_FLAG_UNCACHED|drivers/gpu/drm/amd/amdgpu/amdgpu_object.c +0
-1- TTM_PL_FLAG_VRAM |
TTM_PL_FLAG_TOPDOWN;drivers/gpu/drm/amd/amdgpu/amdgpu_object.c +2
-0+ placements[c++].flags =TTM_PL_FLAG_WC | + TTM_PL_FLAG_UNCACHED |
TTM_PL_FLAG_VRAM|drivers/gpu/drm/amd/amdgpu/amdgpu_object.c +1
-0+TTM_PL_FLAG_TOPDOWN ; } placements[c].fpfn =0 ; placements[c++].flags = TTM_PL_FLAG_WC |
TTM_PL_FLAG_UNCACHED|drivers/gpu/drm/amd/amdgpu/amdgpu_object.c +0
-1@@ -138,22 +138,24 @@ static void amdgpu_ttm_placement_init(struct amdgpu_device *adev, if (domain & AMDGPU_GEM_DOMAIN_GTT) {if (flags &AMDGPU_GEM_CREATE_CPU_GTT_USWC ) { placements[c].fpfn =0 ; - placements[c++].flags = TTM_PL_FLAG_WC |
TTM_PL_FLAG_TT|drivers/gpu/drm/amd/amdgpu/amdgpu_object.c +2
-1-TTM_PL_FLAG_UNCACHED ; + placements[c++].flags =TTM_PL_FLAG_WC | + TTM_PL_FLAG_TT |
TTM_PL_FLAG_UNCACHED;drivers/gpu/drm/amd/amdgpu/amdgpu_object.c +0
-1}else { placements[c].fpfn =0 ; - placements[c++].flags = TTM_PL_FLAG_CACHED |
TTM_PL_FLAG_TT;drivers/gpu/drm/amd/amdgpu/amdgpu_object.c +2
-1+ placements[c++].flags =TTM_PL_FLAG_CACHED | +TTM_PL_FLAG_TT ; } }if (domain &AMDGPU_GEM_DOMAIN_CPU ) {if (flags &AMDGPU_GEM_CREATE_CPU_GTT_USWC ) { placements[c].fpfn =0 ; - placements[c++].flags = TTM_PL_FLAG_WC |
TTM_PL_FLAG_SYSTEM|drivers/gpu/drm/amd/amdgpu/amdgpu_object.c +2
-1-TTM_PL_FLAG_UNCACHED ; + placements[c++].flags =TTM_PL_FLAG_WC | + TTM_PL_FLAG_SYSTEM |
TTM_PL_FLAG_UNCACHED;drivers/gpu/drm/amd/amdgpu/amdgpu_object.c +0
-1}else { placements[c].fpfn =0 ; - placements[c++].flags = TTM_PL_FLAG_CACHED |
TTM_PL_FLAG_SYSTEM;drivers/gpu/drm/amd/amdgpu/amdgpu_object.c +2
-0+ placements[c++].flags =TTM_PL_FLAG_CACHED | +TTM_PL_FLAG_SYSTEM ; } }@@ -539,7 +541,8 @@ int amdgpu_bo_pin_restricted(struct amdgpu_bo *bo, u32 domain,/* force to pin into visible video ram */ if ((bo->placements[i].flags & TTM_PL_FLAG_VRAM) && !(bo->flags & AMDGPU_GEM_CREATE_NO_CPU_ACCESS)&&
drivers/gpu/drm/amd/amdgpu/amdgpu_object.c +0
-1- (!max_offset || max_offset > bo->adev-Quoted 1 line
mc.visible_vram_size)) {
drivers/gpu/drm/amd/amdgpu/amdgpu_object.c +24
-19+ (!max_offset || max_offset > + bo->adev->mc.visible_vram_size)) {if (WARN_ON_ONCE (min_offset > bo->adev->mc.visible_vram_size))return -EINVAL ;@@ -558,19 +561,23 @@ int amdgpu_bo_pin_restricted(struct amdgpu_bo *bo, u32 domain, } r =ttm_bo_validate (&bo->tbo, &bo->placement, false, false); -if (likely (r ==0 )) { - bo->pin_count =1 ; -if (gpu_addr !=NULL ) - *gpu_addr =amdgpu_bo_gpu_offset (bo); -if (domain ==AMDGPU_GEM_DOMAIN_VRAM ) { - bo->adev->vram_pin_size +=amdgpu_bo_size (bo); -if (bo->flags & AMDGPU_GEM_CREATE_NO_CPU_ACCESS) - bo->adev->invisible_pin_size +=amdgpu_bo_size (bo ); - }else - bo->adev->gart_pin_size +=amdgpu_bo_size (bo); - }else { +if (unlikely (r)) {dev_err (bo->adev->dev,"%p pin failed\n" , bo); + goto error; + } + + bo->pin_count =1 ; +if (gpu_addr !=NULL ) + *gpu_addr =amdgpu_bo_gpu_offset (bo); +if (domain ==AMDGPU_GEM_DOMAIN_VRAM ) { + bo->adev->vram_pin_size +=amdgpu_bo_size (bo); +if (bo->flags &AMDGPU_GEM_CREATE_NO_CPU_ACCESS ) + bo->adev->invisible_pin_size +=amdgpu_bo_size (bo); + }else { + bo->adev->gart_pin_size +=amdgpu_bo_size (bo); } + +error:return r; }@@ -595,16 +602,20 @@ int amdgpu_bo_unpin(struct amdgpu_bo *bo) bo->placements[i].flags &= ~TTM_PL_FLAG_NO_EVICT ; } r =ttm_bo_validate (&bo->tbo, &bo->placement, false, false); -if (likely (r ==0 )) { -if (bo->tbo.mem.mem_type ==TTM_PL_VRAM ) { - bo->adev->vram_pin_size -=amdgpu_bo_size (bo); -if (bo->flags & AMDGPU_GEM_CREATE_NO_CPU_ACCESS) - bo->adev->invisible_pin_size -=amdgpu_bo_size (bo ); - }else - bo->adev->gart_pin_size -=amdgpu_bo_size (bo); - }else { +if (unlikely (r)) {dev_err (bo->adev->dev,"%p validate failed for unpin\n" , bo); + goto error; } + +if (bo->tbo.mem.mem_type ==TTM_PL_VRAM ) { + bo->adev->vram_pin_size -=amdgpu_bo_size (bo); +if (bo->flags &AMDGPU_GEM_CREATE_NO_CPU_ACCESS ) + bo->adev->invisible_pin_size -=
amdgpu_bo_size(bo);drivers/gpu/drm/amd/amdgpu/amdgpu_object.c +7
-1+ }else { + bo->adev->gart_pin_size -=amdgpu_bo_size (bo); + } + +error:return r; }@@ -775,7 +786,8 @@ int amdgpu_bo_fault_reserve_notify(struct ttm_buffer_object *bo)for (i =0 ; i < abo->placement.num_placement; i++) {/* Force into visible VRAM */ if ((abo->placements[i].flags &TTM_PL_FLAG_VRAM ) && - (!abo->placements[i].lpfn || abo->placements[i].lpfn > lpfn)) + (!abo->placements[i].lpfn || + abo->placements[i].lpfn > lpfn)) abo->placements[i].lpfn = lpfn;drivers/gpu/drm/amd/amdgpu/amdgpu_object.c +0
-1} r =ttm_bo_validate (bo, &abo->placement, false, false); --2.5.0
Quoted 4 lines
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx