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

amdgpu: fix for submition with no ibs 

Avoid a crash if no IBs are specified.

Signed-off-by: Ken Wang <Qingqing.Wang@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
main
Ken Wang 2016-02-04 13:52:22 +08:00 committed by Alex Deucher
parent 6950af4e84
commit f884af9b57
2 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
amdgpu/amdgpu_cs.c
View File

@ -190,6 +190,10 @@ static int amdgpu_cs_submit_one(amdgpu_context_handle context,
return -EINVAL; return -EINVAL;
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;
if (ibs_request->number_of_ibs == 0) {
ibs_request->seq_no = AMDGPU_NULL_SUBMIT_SEQ;
return 0;
}
user_fence = (ibs_request->fence_info.handle != NULL); user_fence = (ibs_request->fence_info.handle != NULL);
size = ibs_request->number_of_ibs + (user_fence ? 2 : 1) + 1; size = ibs_request->number_of_ibs + (user_fence ? 2 : 1) + 1;
@ -422,6 +426,10 @@ int amdgpu_cs_query_fence_status(struct amdgpu_cs_fence *fence,
return -EINVAL; return -EINVAL;
if (fence->ring >= AMDGPU_CS_MAX_RINGS) if (fence->ring >= AMDGPU_CS_MAX_RINGS)
return -EINVAL; return -EINVAL;
if (fence->fence == AMDGPU_NULL_SUBMIT_SEQ) {
*expired = true;
return 0;
}
*expired = false; *expired = false;

1
amdgpu/amdgpu_internal.h
View File

@ -44,6 +44,7 @@
#define ROUND_DOWN(x, y) ((x) & ~__round_mask(x, y)) #define ROUND_DOWN(x, y) ((x) & ~__round_mask(x, y))
#define AMDGPU_INVALID_VA_ADDRESS 0xffffffffffffffff #define AMDGPU_INVALID_VA_ADDRESS 0xffffffffffffffff
#define AMDGPU_NULL_SUBMIT_SEQ 0
struct amdgpu_bo_va_hole { struct amdgpu_bo_va_hole {
struct list_head list; struct list_head list;