amdgpu: vamgr can be a struct instead of a pointer
PATCH 3/3 amdgpu: vamgr can be a struct instead of a pointer
From: Alex Xie <[email protected]>
vamgr is an integral part of amdgpu_device. We don't need to calloc and free it. This can save CPU time, reduce heap fragmentation.
Signed-off-by Alex Xie <[email protected]>
Reviewed-by Christian König <[email protected]>
[Grazvydas Ignotas: rebase, correct a typo in commit message]
--- amdgpu/amdgpu_device.c | 16 +++++----------- amdgpu/amdgpu_internal.h | 2 +- amdgpu/amdgpu_vamgr.c | 2 +- 3 files changed, 7 insertions(+), 13 deletions(-)
amdgpu/amdgpu_device.c +5 -11
@@ -132,8 +132,7 @@ static int amdgpu_get_auth(int fd, int *auth)static void amdgpu_device_free_internal (amdgpu_device_handle dev) {amdgpu_vamgr_deinit (&dev->vamgr_32); -amdgpu_vamgr_deinit (dev->vamgr); -free (dev->vamgr); +amdgpu_vamgr_deinit (&dev->vamgr);util_hash_table_destroy (dev->bo_flink_names);util_hash_table_destroy (dev->bo_handles);pthread_mutex_destroy (&dev->bo_table_mutex);
@@ -254,16 +253,12 @@ int amdgpu_device_initialize(int fd,if (r) goto cleanup; - dev->vamgr =calloc (1 ,sizeof (struct amdgpu_bo_va_mgr )); -if (dev->vamgr ==NULL ) - goto cleanup; - -amdgpu_vamgr_init (dev->vamgr, dev->dev_info.virtual_address_offset, +amdgpu_vamgr_init (&dev->vamgr, dev->dev_info.virtual_address_offset, dev->dev_info.virtual_address_max, dev->dev_info.virtual_address_alignment); max =MIN2 (dev->dev_info.virtual_address_max,0xffffffff ); - start =amdgpu_vamgr_find_va (dev->vamgr, + start =amdgpu_vamgr_find_va (&dev->vamgr, max - dev->dev_info.virtual_address_offset, dev->dev_info.virtual_address_alignment,0 );if (start >0xffffffff )
@@ -282,10 +277,9 @@ int amdgpu_device_initialize(int fd, free_va: r = -ENOMEM ; -amdgpu_vamgr_free_va (dev->vamgr, start, +amdgpu_vamgr_free_va (&dev->vamgr, start, max - dev->dev_info.virtual_address_offset); -amdgpu_vamgr_deinit (dev->vamgr); -free (dev->vamgr); +amdgpu_vamgr_deinit (&dev->vamgr); cleanup:if (dev->fd >=0 )
amdgpu/amdgpu_internal.h +1 -1
@@ -85,7 +85,7 @@ struct amdgpu_device {struct drm_amdgpu_info_device dev_info;struct amdgpu_gpu_info info;/** The global VA manager for the whole virtual address space */ -struct amdgpu_bo_va_mgr *vamgr; +struct amdgpu_bo_va_mgr vamgr;/** The VA manager for the 32bit address space */ struct amdgpu_bo_va_mgr vamgr_32; };
amdgpu/amdgpu_vamgr.c +1 -1
@@ -238,7 +238,7 @@ int amdgpu_va_range_alloc(amdgpu_device_handle dev,if (flags &AMDGPU_VA_RANGE_32_BIT ) vamgr = &dev->vamgr_32;else - vamgr = dev->vamgr; + vamgr = &dev->vamgr; va_base_alignment =MAX2 (va_base_alignment, vamgr->va_alignment); size =ALIGN (size, vamgr->va_alignment);
Signature · 6 lines
2.7.4 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel