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

amdgpu: Clean up amdgpu_parse_asic_ids error handling 

* Move error message printing into amdgpu_parse_asic_ids and make it
  return void
* Print only "Invalid format" error message if parse_one_line returns
  -EINVAL
* Use strerror instead of printing the (negative) error code in hex

Acked-by: Slava Abramov <slava.abramov@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
main
Michel Dänzer 2017-11-30 18:28:01 +01:00 committed by Michel Dänzer
parent bc21168fa9
commit 85c6b0b00a
3 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
amdgpu/amdgpu_asic_id.c
View File

@ -109,7 +109,7 @@ out:
return r;
}
int amdgpu_parse_asic_ids(struct amdgpu_asic_id **p_asic_id_table)
void amdgpu_parse_asic_ids(struct amdgpu_asic_id **p_asic_id_table)
{
struct amdgpu_asic_id *asic_id_table;
struct amdgpu_asic_id *id;
@ -126,7 +126,7 @@ int amdgpu_parse_asic_ids(struct amdgpu_asic_id **p_asic_id_table)
if (!fp) {
fprintf(stderr, "%s: %s\n", AMDGPU_ASIC_ID_TABLE,
strerror(errno));
return -EINVAL;
return;
}
asic_id_table = calloc(table_max_size + 1,
@ -177,8 +177,6 @@ int amdgpu_parse_asic_ids(struct amdgpu_asic_id **p_asic_id_table)
line_num++;
continue;
}
fprintf(stderr, "Invalid format: %s: line %d: %s\n",
AMDGPU_ASIC_ID_TABLE, line_num, line);
goto free;
}
@ -201,6 +199,14 @@ int amdgpu_parse_asic_ids(struct amdgpu_asic_id **p_asic_id_table)
memset(id, 0, sizeof(struct amdgpu_asic_id));
free:
if (r == -EINVAL) {
fprintf(stderr, "Invalid format: %s: line %d: %s\n",
AMDGPU_ASIC_ID_TABLE, line_num, line);
} else if (r) {
fprintf(stderr, "%s: Cannot parse ASIC IDs: %s\n",
__func__, strerror(-r));
}
free(line);
if (r && asic_id_table) {
@ -215,6 +221,4 @@ close:
fclose(fp);
*p_asic_id_table = asic_id_table;
return r;
}

6
amdgpu/amdgpu_device.c
View File

@ -280,11 +280,7 @@ int amdgpu_device_initialize(int fd,
amdgpu_vamgr_init(&dev->vamgr, start, max,
dev->dev_info.virtual_address_alignment);
r = amdgpu_parse_asic_ids(&dev->asic_ids);
if (r) {
fprintf(stderr, "%s: Cannot parse ASIC IDs, 0x%x.",
__func__, r);
}
amdgpu_parse_asic_ids(&dev->asic_ids);
*major_version = dev->major_version;
*minor_version = dev->minor_version;

2
amdgpu/amdgpu_internal.h
View File

@ -148,7 +148,7 @@ drm_private void amdgpu_vamgr_init(struct amdgpu_bo_va_mgr *mgr, uint64_t start,
drm_private void amdgpu_vamgr_deinit(struct amdgpu_bo_va_mgr *mgr);
drm_private int amdgpu_parse_asic_ids(struct amdgpu_asic_id **asic_ids);
drm_private void amdgpu_parse_asic_ids(struct amdgpu_asic_id **asic_ids);
drm_private int amdgpu_query_gpu_info_init(amdgpu_device_handle dev);