1 files changed, 20 insertions, 0 deletions

diff --git a/amdgpu/amdgpu_device.c b/amdgpu/amdgpu_device.c
index c6bbae81..e16cd24b 100644
--- a/amdgpu/amdgpu_device.c
+++ b/amdgpu/amdgpu_device.c
@@ -43,6 +43,7 @@
 #include "amdgpu_drm.h"
 #include "amdgpu_internal.h"
 #include "util_hash_table.h"
+#include "util_math.h"
 
 #define PTR_TO_UINT(x) ((unsigned)((intptr_t)(x)))
 #define UINT_TO_PTR(x) ((void *)((intptr_t)(x)))
@@ -173,6 +174,7 @@ int amdgpu_device_initialize(int fd,
         int flag_auth = 0;
         int flag_authexist=0;
         uint32_t accel_working = 0;
+        uint64_t start, max;
 
         *device_handle = NULL;
 
@@ -251,6 +253,19 @@ int amdgpu_device_initialize(int fd,
 
         dev->vamgr = amdgpu_vamgr_get_global(dev);
 
+        max = MIN2(dev->dev_info.virtual_address_max, 0xffffffff);
+        start = amdgpu_vamgr_find_va(dev->vamgr,
+                                     max - dev->dev_info.virtual_address_offset,
+                                     dev->dev_info.virtual_address_alignment, 0);
+        if (start > 0xffffffff)
+                goto free_va; /* shouldn't get here */
+
+        dev->vamgr_32 =  calloc(1, sizeof(struct amdgpu_bo_va_mgr));
+        if (dev->vamgr_32 == NULL)
+                goto free_va;
+        amdgpu_vamgr_init(dev->vamgr_32, start, max,
+                          dev->dev_info.virtual_address_alignment);
+
         *major_version = dev->major_version;
         *minor_version = dev->minor_version;
         *device_handle = dev;
@@ -259,6 +274,11 @@ int amdgpu_device_initialize(int fd,
 
         return 0;
 
+free_va:
+        r = -ENOMEM;
+        amdgpu_vamgr_free_va(dev->vamgr, start,
+                             max - dev->dev_info.virtual_address_offset);
+
 cleanup:
         if (dev->fd >= 0)
                 close(dev->fd);