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

amdgpu: remove pointer arithmetic from command submission 

Signed-off-by: Christian König <christian.koenig@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
main
Christian König 2015-06-24 14:13:00 +02:00 committed by Alex Deucher
parent bef8b6097c
commit 69827cd1f6
1 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
amdgpu/amdgpu_cs.c
View File

@ -182,12 +182,12 @@ static int amdgpu_cs_submit_one(amdgpu_context_handle context,
struct amdgpu_cs_request *ibs_request, struct amdgpu_cs_request *ibs_request,
uint64_t *fence) uint64_t *fence)
{ {
int r = 0;
uint32_t i, size;
union drm_amdgpu_cs cs; union drm_amdgpu_cs cs;
uint64_t *chunk_array; uint64_t *chunk_array;
struct drm_amdgpu_cs_chunk *chunks; struct drm_amdgpu_cs_chunk *chunks;
struct drm_amdgpu_cs_chunk_data *chunk_data; struct drm_amdgpu_cs_chunk_data *chunk_data;
uint32_t i, size;
int r = 0;
if (ibs_request->ip_type >= AMDGPU_HW_IP_NUM) if (ibs_request->ip_type >= AMDGPU_HW_IP_NUM)
return -EINVAL; return -EINVAL;
@ -196,17 +196,11 @@ static int amdgpu_cs_submit_one(amdgpu_context_handle context,
if (ibs_request->number_of_ibs > AMDGPU_CS_MAX_IBS_PER_SUBMIT) if (ibs_request->number_of_ibs > AMDGPU_CS_MAX_IBS_PER_SUBMIT)
return -EINVAL; return -EINVAL;
size = (ibs_request->number_of_ibs + 1) * ( size = ibs_request->number_of_ibs + 1;
sizeof(uint64_t) +
sizeof(struct drm_amdgpu_cs_chunk) +
sizeof(struct drm_amdgpu_cs_chunk_data));
chunk_array = alloca(size); chunk_array = alloca(sizeof(uint64_t) * size);
if (!chunk_array) chunks = alloca(sizeof(struct drm_amdgpu_cs_chunk) * size);
return -ENOMEM; chunk_data = alloca(sizeof(struct drm_amdgpu_cs_chunk_data) * size);
chunks = (struct drm_amdgpu_cs_chunk *)(chunk_array + ibs_request->number_of_ibs + 1);
chunk_data = (struct drm_amdgpu_cs_chunk_data *)(chunks + ibs_request->number_of_ibs + 1);
memset(&cs, 0, sizeof(cs)); memset(&cs, 0, sizeof(cs));
cs.in.chunks = (uint64_t)(uintptr_t)chunk_array; cs.in.chunks = (uint64_t)(uintptr_t)chunk_array;