diff options
| author | Christian König | 2015-06-19 17:00:19 +0200 |
|---|---|---|
| committer | Alex Deucher | 2015-06-29 21:52:49 +0200 |
| commit | 03507c4f2f63d8d98c2455cf4d192589fac553c7 (patch) | |
| tree | 866a2e509f2de7bf285e8a74be0b323028cb4f53 /drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | |
| parent | gpu/drm/amdgpu: Fix build when CONFIG_DEBUG_FS is not set (diff) | |
| download | kernel-qcow2-linux-03507c4f2f63d8d98c2455cf4d192589fac553c7.tar.gz kernel-qcow2-linux-03507c4f2f63d8d98c2455cf4d192589fac553c7.tar.xz kernel-qcow2-linux-03507c4f2f63d8d98c2455cf4d192589fac553c7.zip | |
drm/amdgpu: recreate fence from user seq
And use common fence infrastructure for the wait.
Signed-off-by: Christian König <christian.koenig@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Reviewed-by: Chunming Zhou <david1.zhou@amd.com>
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c')
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c index 86b78c799176..84ba1d1bf327 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c @@ -739,9 +739,9 @@ int amdgpu_cs_wait_ioctl(struct drm_device *dev, void *data, { union drm_amdgpu_wait_cs *wait = data; struct amdgpu_device *adev = dev->dev_private; - uint64_t seq[AMDGPU_MAX_RINGS] = {0}; - struct amdgpu_ring *ring = NULL; unsigned long timeout = amdgpu_gem_timeout(wait->in.timeout); + struct amdgpu_fence *fence = NULL; + struct amdgpu_ring *ring = NULL; struct amdgpu_ctx *ctx; long r; @@ -754,9 +754,12 @@ int amdgpu_cs_wait_ioctl(struct drm_device *dev, void *data, if (r) return r; - seq[ring->idx] = wait->in.handle; + r = amdgpu_fence_recreate(ring, filp, wait->in.handle, &fence); + if (r) + return r; - r = amdgpu_fence_wait_seq_timeout(adev, seq, true, timeout); + r = fence_wait_timeout(&fence->base, true, timeout); + amdgpu_fence_unref(&fence); amdgpu_ctx_put(ctx); if (r < 0) return r; |