geemili
/
drm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

amdgpu: print error messages when amdgpu_device_initialize is failing 

Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
main
Marek Olšák 2017-09-04 21:05:26 +02:00
parent 7c71188610
commit 1dd84e01a9
1 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
amdgpu/amdgpu_device.c
View File

@ -191,6 +191,8 @@ int amdgpu_device_initialize(int fd,
fd_tab = util_hash_table_create(fd_hash, fd_compare); fd_tab = util_hash_table_create(fd_hash, fd_compare);
r = amdgpu_get_auth(fd, &flag_auth); r = amdgpu_get_auth(fd, &flag_auth);
if (r) { if (r) {
fprintf(stderr, "%s: amdgpu_get_auth (1) failed (%i)\n",
__func__, r);
pthread_mutex_unlock(&fd_mutex); pthread_mutex_unlock(&fd_mutex);
return r; return r;
} }
@ -198,6 +200,8 @@ int amdgpu_device_initialize(int fd,
if (dev) { if (dev) {
r = amdgpu_get_auth(dev->fd, &flag_authexist); r = amdgpu_get_auth(dev->fd, &flag_authexist);
if (r) { if (r) {
fprintf(stderr, "%s: amdgpu_get_auth (2) failed (%i)\n",
__func__, r);
pthread_mutex_unlock(&fd_mutex); pthread_mutex_unlock(&fd_mutex);
return r; return r;
} }
@ -213,6 +217,7 @@ int amdgpu_device_initialize(int fd,
dev = calloc(1, sizeof(struct amdgpu_device)); dev = calloc(1, sizeof(struct amdgpu_device));
if (!dev) { if (!dev) {
fprintf(stderr, "%s: calloc failed\n", __func__);
pthread_mutex_unlock(&fd_mutex); pthread_mutex_unlock(&fd_mutex);
return -ENOMEM; return -ENOMEM;
} }
@ -248,16 +253,22 @@ int amdgpu_device_initialize(int fd,
/* Check if acceleration is working. */ /* Check if acceleration is working. */
r = amdgpu_query_info(dev, AMDGPU_INFO_ACCEL_WORKING, 4, &accel_working); r = amdgpu_query_info(dev, AMDGPU_INFO_ACCEL_WORKING, 4, &accel_working);
if (r) if (r) {
fprintf(stderr, "%s: amdgpu_query_info(ACCEL_WORKING) failed (%i)\n",
__func__, r);
goto cleanup; goto cleanup;
}
if (!accel_working) { if (!accel_working) {
fprintf(stderr, "%s: AMDGPU_INFO_ACCEL_WORKING = 0\n", __func__);
r = -EBADF; r = -EBADF;
goto cleanup; goto cleanup;
} }
r = amdgpu_query_gpu_info_init(dev); r = amdgpu_query_gpu_info_init(dev);
if (r) if (r) {
fprintf(stderr, "%s: amdgpu_query_gpu_info_init failed\n", __func__);
goto cleanup; 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_max,
@ -267,8 +278,10 @@ int amdgpu_device_initialize(int fd,
start = amdgpu_vamgr_find_va(&dev->vamgr, start = amdgpu_vamgr_find_va(&dev->vamgr,
max - dev->dev_info.virtual_address_offset, max - dev->dev_info.virtual_address_offset,
dev->dev_info.virtual_address_alignment, 0); dev->dev_info.virtual_address_alignment, 0);
if (start > 0xffffffff) if (start > 0xffffffff) {
fprintf(stderr, "%s: amdgpu_vamgr_find_va failed\n", __func__);
goto free_va; /* shouldn't get here */ goto free_va; /* shouldn't get here */
}
amdgpu_vamgr_init(&dev->vamgr_32, start, max, amdgpu_vamgr_init(&dev->vamgr_32, start, max,
dev->dev_info.virtual_address_alignment); dev->dev_info.virtual_address_alignment);