summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
diff options
context:
space:
mode:
authorChristian König2015-08-20 17:28:36 +0200
committerAlex Deucher2015-08-25 16:40:25 +0200
commiteb98d1c54d1e058f406f3f4acf15684ad26f9676 (patch)
tree1afee6b06965dd65d5c51ea23cd5009948b56b3b /drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
parentdrm/amdgpu: fix fence wait in sync_fence, instead should be in sync_rings (diff)
downloadkernel-qcow2-linux-eb98d1c54d1e058f406f3f4acf15684ad26f9676.tar.gz
kernel-qcow2-linux-eb98d1c54d1e058f406f3f4acf15684ad26f9676.tar.xz
kernel-qcow2-linux-eb98d1c54d1e058f406f3f4acf15684ad26f9676.zip
drm/amdgpu: fix user fences when scheduler is enabled
Signed-off-by: Christian König <christian.koenig@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.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
index f91849b12a0f..5d335522625e 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
@@ -869,6 +869,8 @@ int amdgpu_cs_ioctl(struct drm_device *dev, void *data, struct drm_file *filp)
cs->out.handle =
amdgpu_ctx_add_fence(job->ctx, ring,
&job->base.s_fence->base);
+ parser->ibs[parser->num_ibs - 1].sequence = cs->out.handle;
+
list_sort(NULL, &parser->validated, cmp_size_smaller_first);
ttm_eu_fence_buffer_objects(&parser->ticket,
&parser->validated,