diff options
| author | Christian König <christian.koenig@amd.com> | 2015-07-09 12:23:51 +0200 |
|---|---|---|
| committer | Christian König <christian.koenig@amd.com> | 2015-07-09 14:32:02 +0200 |
| commit | 2a9ab75914500b4d06b5133932521ce5edbf415c (patch) | |
| tree | 2dc1a296c980e3cbb9b381e086551f3cc6326e12 | |
| parent | 0fa9bd4c6097ab5051c878b89be437dc4824f388 (diff) | |
| download | mesa-amdgpu.tar.gz | |
winsys/amdgpu: handle fence and dependencies mergeamdgpu
Signed-off-by: Christian König <christian.koenig@amd.com>
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Reviewed-by: Jammy Zhou <Jammy.Zhou@amd.com>
| -rw-r--r-- | src/gallium/winsys/amdgpu/drm/amdgpu_cs.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/gallium/winsys/amdgpu/drm/amdgpu_cs.c b/src/gallium/winsys/amdgpu/drm/amdgpu_cs.c index fa5744faf00..51ec0d93fd5 100644 --- a/src/gallium/winsys/amdgpu/drm/amdgpu_cs.c +++ b/src/gallium/winsys/amdgpu/drm/amdgpu_cs.c @@ -74,7 +74,7 @@ bool amdgpu_fence_wait(struct pipe_fence_handle *fence, uint64_t timeout, bool absolute) { struct amdgpu_fence *rfence = (struct amdgpu_fence*)fence; - struct amdgpu_cs_query_fence query = {0}; + struct amdgpu_cs_fence query = {0}; uint32_t expired; int64_t abs_timeout; int r; @@ -510,7 +510,7 @@ void amdgpu_cs_emit_ioctl_oneshot(struct amdgpu_cs *cs, struct amdgpu_cs_context pipe_mutex_lock(ws->bo_fence_lock); for (i = 0; i < csc->num_buffers; i++) { for (j = 0; j < RING_LAST; j++) { - struct amdgpu_cs_dep_info *dep; + struct amdgpu_cs_fence *dep; unsigned idx; struct amdgpu_fence *bo_fence = (void *)csc->buffers[i].bo->fence[j]; @@ -531,7 +531,7 @@ void amdgpu_cs_emit_ioctl_oneshot(struct amdgpu_cs *cs, struct amdgpu_cs_context unsigned size; csc->max_dependencies = idx + 8; - size = csc->max_dependencies * sizeof(struct amdgpu_cs_dep_info); + size = csc->max_dependencies * sizeof(struct amdgpu_cs_fence); csc->request.dependencies = realloc(csc->request.dependencies, size); } |