amdgpu: vamgr can be a struct instead of a pointer

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.

Reviewed-by: Edward O'Callaghan <funfunctor@folklore1984.net>
Reviewed-by: Emil Velikov <emil.l.velikov@gmail.com>
Signed-off-by: Alex Xie <AlexBin.Xie@amd.com>
Reviewed-by: Christian König <christian.koenig@amd.com>
[Grazvydas Ignotas: rebase, correct a typo in commit message]
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/amdgpu/amdgpu_device.c b/amdgpu/amdgpu_device.c
index 11714e4..f473d2d 100644 (file)
--- a/amdgpu/amdgpu_device.c
+++ b/amdgpu/amdgpu_device.c
@@ -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)

diff --git a/amdgpu/amdgpu_internal.h b/amdgpu/amdgpu_internal.h
index 7e237ac..cf119a5 100644 (file)
--- a/amdgpu/amdgpu_internal.h
+++ b/amdgpu/amdgpu_internal.h
@@ -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;
 };

diff --git a/amdgpu/amdgpu_vamgr.c b/amdgpu/amdgpu_vamgr.c
index 4dc4253..2b1388e 100644 (file)
--- a/amdgpu/amdgpu_vamgr.c
+++ b/amdgpu/amdgpu_vamgr.c
@@ -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);