aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/amd/amdgpu/amdgpu.h
diff options
context:
space:
mode:
authorChunming Zhou <david1.zhou@amd.com>2015-07-30 05:59:43 -0400
committerAlex Deucher <alexander.deucher@amd.com>2015-08-17 16:50:43 -0400
commitd1ff9086c1b8e67390161599006a34056b437a72 (patch)
treeaaaf8b04c136fb05fd9d863f501450974ac5cfcf /drivers/gpu/drm/amd/amdgpu/amdgpu.h
parent51b9db27d07869cf565ba135e97e2ed5f858612e (diff)
drm/amdgpu: fix seq in ctx_add_fence
if enabling scheduler, then the queued seq is assigned when pushing job before emitting job. 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.h')
-rw-r--r--drivers/gpu/drm/amd/amdgpu/amdgpu.h3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu.h b/drivers/gpu/drm/amd/amdgpu/amdgpu.h
index 6e1fea473a66..2619c78ec303 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu.h
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu.h
@@ -419,7 +419,6 @@ struct amdgpu_user_fence {
419 struct amdgpu_bo *bo; 419 struct amdgpu_bo *bo;
420 /* write-back address offset to bo start */ 420 /* write-back address offset to bo start */
421 uint32_t offset; 421 uint32_t offset;
422 uint64_t sequence;
423}; 422};
424 423
425int amdgpu_fence_driver_init(struct amdgpu_device *adev); 424int amdgpu_fence_driver_init(struct amdgpu_device *adev);
@@ -1031,7 +1030,7 @@ struct amdgpu_ctx *amdgpu_ctx_get(struct amdgpu_fpriv *fpriv, uint32_t id);
1031int amdgpu_ctx_put(struct amdgpu_ctx *ctx); 1030int amdgpu_ctx_put(struct amdgpu_ctx *ctx);
1032 1031
1033uint64_t amdgpu_ctx_add_fence(struct amdgpu_ctx *ctx, struct amdgpu_ring *ring, 1032uint64_t amdgpu_ctx_add_fence(struct amdgpu_ctx *ctx, struct amdgpu_ring *ring,
1034 struct fence *fence); 1033 struct fence *fence, uint64_t queued_seq);
1035struct fence *amdgpu_ctx_get_fence(struct amdgpu_ctx *ctx, 1034struct fence *amdgpu_ctx_get_fence(struct amdgpu_ctx *ctx,
1036 struct amdgpu_ring *ring, uint64_t seq); 1035 struct amdgpu_ring *ring, uint64_t seq);
1037 1036