aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c
diff options
context:
space:
mode:
authorChunming Zhou <david1.zhou@amd.com>2015-08-01 23:18:04 -0400
committerAlex Deucher <alexander.deucher@amd.com>2015-08-17 16:51:07 -0400
commitf556cb0caeec1ba9b8e5e2aa85b47e76277f5d4b (patch)
tree1325c1eb049a5a85901437743ea0c3f499f73f2d /drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c
parent4af9f07ccdac96e16f7a0ddaf983891a29ebd11a (diff)
drm/amd: add scheduler fence implementation (v2)
scheduler fence is based on kernel fence framework. v2: squash in Christian's build fix Signed-off-by: Chunming Zhou <david1.zhou@amd.com> Reviewed-by: Christian K?nig <christian.koenig@amd.com>
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c')
-rw-r--r--drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c10
1 files changed, 0 insertions, 10 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c
index 232e800eea56..1833f05c7e0b 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c
@@ -268,16 +268,6 @@ struct fence *amdgpu_ctx_get_fence(struct amdgpu_ctx *ctx,
268 struct amdgpu_ctx_ring *cring = & ctx->rings[ring->idx]; 268 struct amdgpu_ctx_ring *cring = & ctx->rings[ring->idx];
269 struct fence *fence; 269 struct fence *fence;
270 uint64_t queued_seq; 270 uint64_t queued_seq;
271 int r;
272
273 if (amdgpu_enable_scheduler) {
274 r = amd_sched_wait_emit(&cring->entity,
275 seq,
276 false,
277 -1);
278 if (r)
279 return NULL;
280 }
281 271
282 spin_lock(&ctx->ring_lock); 272 spin_lock(&ctx->ring_lock);
283 if (amdgpu_enable_scheduler) 273 if (amdgpu_enable_scheduler)