drm/amdgpu: use amdgpu_bo_[create|free]_kernel for wb
Subsystems (2)
PATCH 1/1 drm/amdgpu: use amdgpu_bo_[create|free]_kernel for wb
Rather than open coding it.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 37 ++++++------------------------ 1 file changed, 7 insertions(+), 30 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +7 -30
@@ -443,13 +443,9 @@ void amdgpu_doorbell_get_kfd_info(struct amdgpu_device *adev,static void amdgpu_wb_fini (struct amdgpu_device *adev) {if (adev->wb.wb_obj) { -if (!amdgpu_bo_reserve (adev->wb.wb_obj, false)) { -amdgpu_bo_kunmap (adev->wb.wb_obj); -amdgpu_bo_unpin (adev->wb.wb_obj); -amdgpu_bo_unreserve (adev->wb.wb_obj); - } -amdgpu_bo_unref (&adev->wb.wb_obj); - adev->wb.wb =NULL ; +amdgpu_bo_free_kernel (&adev->wb.wb_obj, + &adev->wb.gpu_addr, + (void **)&adev->wb.wb); adev->wb.wb_obj =NULL ; } }
@@ -468,33 +464,14 @@ static int amdgpu_wb_init(struct amdgpu_device *adev)int r;if (adev->wb.wb_obj ==NULL ) { - r =amdgpu_bo_create (adev,AMDGPU_MAX_WB *4 ,PAGE_SIZE , true, -AMDGPU_GEM_DOMAIN_GTT ,0 ,NULL ,NULL , - &adev->wb.wb_obj); + r =amdgpu_bo_create_kernel (adev,AMDGPU_MAX_WB *4 , +PAGE_SIZE ,AMDGPU_GEM_DOMAIN_GTT , + &adev->wb.wb_obj, &adev->wb.gpu_addr, + (void **)&adev->wb.wb);if (r) {dev_warn (adev->dev,"(%d) create WB bo failed\n" , r);return r; } - r =amdgpu_bo_reserve (adev->wb.wb_obj, false); -if (unlikely (r !=0 )) { -amdgpu_wb_fini (adev); -return r; - } - r =amdgpu_bo_pin (adev->wb.wb_obj,AMDGPU_GEM_DOMAIN_GTT , - &adev->wb.gpu_addr); -if (r) { -amdgpu_bo_unreserve (adev->wb.wb_obj); -dev_warn (adev->dev,"(%d) pin WB bo failed\n" , r); -amdgpu_wb_fini (adev); -return r; - } - r =amdgpu_bo_kmap (adev->wb.wb_obj, (void **)&adev->wb.wb); -amdgpu_bo_unreserve (adev->wb.wb_obj); -if (r) { -dev_warn (adev->dev,"(%d) map WB bo failed\n" , r); -amdgpu_wb_fini (adev); -return r; - } adev->wb.num_wb =AMDGPU_MAX_WB ;memset (&adev->wb.used,0 ,sizeof (adev->wb.used));
Signature · 6 lines
2.5.5 _______________________________________________ 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): 1477078293-23098-1-git-send-email-alexander.deucher-5C7GfCeVMHo@public.gmane.org
Edward O'Callaghan
Acked-byQuoted 57 lines · Alex Deucher
Rather than open coding it.
Signed-off-by Alex Deucher <[email protected]>--- drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 37 ++++++------------------------ 1 file changed, 7 insertions(+), 30 deletions(-)drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +7
-23@@ -443,13 +443,9 @@ void amdgpu_doorbell_get_kfd_info(struct amdgpu_device *adev,static void amdgpu_wb_fini (struct amdgpu_device *adev) {if (adev->wb.wb_obj) { -if (!amdgpu_bo_reserve (adev->wb.wb_obj, false)) { -amdgpu_bo_kunmap (adev->wb.wb_obj); -amdgpu_bo_unpin (adev->wb.wb_obj); -amdgpu_bo_unreserve (adev->wb.wb_obj); - } -amdgpu_bo_unref (&adev->wb.wb_obj); - adev->wb.wb =NULL ; +amdgpu_bo_free_kernel (&adev->wb.wb_obj, + &adev->wb.gpu_addr, + (void **)&adev->wb.wb); adev->wb.wb_obj =NULL ; } }@@ -468,33 +464,14 @@ static int amdgpu_wb_init(struct amdgpu_device *adev)int r;if (adev->wb.wb_obj ==NULL ) { - r =amdgpu_bo_create (adev,AMDGPU_MAX_WB *4 ,PAGE_SIZE , true, -AMDGPU_GEM_DOMAIN_GTT ,0 ,NULL ,NULL , - &adev->wb.wb_obj); + r =amdgpu_bo_create_kernel (adev,AMDGPU_MAX_WB *4 , +PAGE_SIZE ,AMDGPU_GEM_DOMAIN_GTT , + &adev->wb.wb_obj, &adev->wb.gpu_addr, + (void **)&adev->wb.wb);if (r) {dev_warn (adev->dev,"(%d) create WB bo failed\n" , r);return r; } - r =amdgpu_bo_reserve (adev->wb.wb_obj, false); -if (unlikely (r !=0 )) { -amdgpu_wb_fini (adev); -return r; - } - r =amdgpu_bo_pin (adev->wb.wb_obj,AMDGPU_GEM_DOMAIN_GTT , - &adev->wb.gpu_addr); -if (r) { -amdgpu_bo_unreserve (adev->wb.wb_obj); -dev_warn (adev->dev,"(%d) pin WB bo failed\n" , r); -amdgpu_wb_fini (adev); -return r; - }
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c static int amdgpu_wb_init(struct amdgpu_device *adev) · line 477
Quoted 10 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +0
-7- r =amdgpu_bo_kmap (adev->wb.wb_obj, (void **)&adev->wb.wb); -amdgpu_bo_unreserve (adev->wb.wb_obj); -if (r) { -dev_warn (adev->dev,"(%d) map WB bo failed\n" , r); -amdgpu_wb_fini (adev); -return r; - } adev->wb.num_wb =AMDGPU_MAX_WB ;memset (&adev->wb.used,0 ,sizeof (adev->wb.used));
_______________________________________________
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): 0851af1f-0e53-b0aa-10a7-432f6fad68dd-dczkZgxz+BNUPWh3PAxdjQ@public.gmane.org
Christian König
Reviewed-byAm 22.10.2016 um 10:20 schrieb Edward O'Callaghan:
Quoted 67 lines
Quoted 64 lines · Alex Deucher
Rather than open coding it.
Signed-off-by Alex Deucher <[email protected]>--- drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 37 ++++++------------------------ 1 file changed, 7 insertions(+), 30 deletions(-)drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +7
-30@@ -443,13 +443,9 @@ void amdgpu_doorbell_get_kfd_info(struct amdgpu_device *adev,static void amdgpu_wb_fini (struct amdgpu_device *adev) {if (adev->wb.wb_obj) { -if (!amdgpu_bo_reserve (adev->wb.wb_obj, false)) { -amdgpu_bo_kunmap (adev->wb.wb_obj); -amdgpu_bo_unpin (adev->wb.wb_obj); -amdgpu_bo_unreserve (adev->wb.wb_obj); - } -amdgpu_bo_unref (&adev->wb.wb_obj); - adev->wb.wb =NULL ; +amdgpu_bo_free_kernel (&adev->wb.wb_obj, + &adev->wb.gpu_addr, + (void **)&adev->wb.wb); adev->wb.wb_obj =NULL ; } }@@ -468,33 +464,14 @@ static int amdgpu_wb_init(struct amdgpu_device *adev)int r;if (adev->wb.wb_obj ==NULL ) { - r =amdgpu_bo_create (adev,AMDGPU_MAX_WB *4 ,PAGE_SIZE , true, -AMDGPU_GEM_DOMAIN_GTT ,0 ,NULL ,NULL , - &adev->wb.wb_obj); + r =amdgpu_bo_create_kernel (adev,AMDGPU_MAX_WB *4 , +PAGE_SIZE ,AMDGPU_GEM_DOMAIN_GTT , + &adev->wb.wb_obj, &adev->wb.gpu_addr, + (void **)&adev->wb.wb);if (r) {dev_warn (adev->dev,"(%d) create WB bo failed\n" , r);return r; } - r =amdgpu_bo_reserve (adev->wb.wb_obj, false); -if (unlikely (r !=0 )) { -amdgpu_wb_fini (adev); -return r; - } - r =amdgpu_bo_pin (adev->wb.wb_obj,AMDGPU_GEM_DOMAIN_GTT , - &adev->wb.gpu_addr); -if (r) { -amdgpu_bo_unreserve (adev->wb.wb_obj); -dev_warn (adev->dev,"(%d) pin WB bo failed\n" , r); -amdgpu_wb_fini (adev); -return r; - } - r =amdgpu_bo_kmap (adev->wb.wb_obj, (void **)&adev->wb.wb); -amdgpu_bo_unreserve (adev->wb.wb_obj); -if (r) { -dev_warn (adev->dev,"(%d) map WB bo failed\n" , r); -amdgpu_wb_fini (adev); -return r; - }
Quoted 9 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c static int amdgpu_wb_init(struct amdgpu_device *adev) · line 477
Quoted 3 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +0
-0adev->wb.num_wb =AMDGPU_MAX_WB ;memset (&adev->wb.used,0 ,sizeof (adev->wb.used));_______________________________________________
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