diff options
author | Christian König <christian.koenig@amd.com> | 2015-08-19 09:00:55 -0400 |
---|---|---|
committer | Alex Deucher <alexander.deucher@amd.com> | 2015-08-25 10:39:16 -0400 |
commit | ce882e6dc241ab8dded0eeeb33a86482d44a5689 (patch) | |
tree | 68d6186455e22e552efb3b5f46214e6d37540e07 /drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c | |
parent | 4ce9891ee17c6e064cc334e3297f7e992d47f3a6 (diff) |
drm/amdgpu: remove v_seq handling from the scheduler v2
Simply not used any more. Only keep 32bit atomic for fence sequence numbering.
v2: trivial rebase
Signed-off-by: Christian König <christian.koenig@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com> (v1)
Reviewed-by: Jammy Zhou <Jammy.Zhou@amd.com> (v1)
Reviewed-by: Chunming Zhou <david1.zhou@amd.com> (v1)
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c')
-rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c index 13c5978ac69b..737c8e3e3a74 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c | |||
@@ -126,7 +126,6 @@ int amdgpu_ib_schedule(struct amdgpu_device *adev, unsigned num_ibs, | |||
126 | struct amdgpu_ring *ring; | 126 | struct amdgpu_ring *ring; |
127 | struct amdgpu_ctx *ctx, *old_ctx; | 127 | struct amdgpu_ctx *ctx, *old_ctx; |
128 | struct amdgpu_vm *vm; | 128 | struct amdgpu_vm *vm; |
129 | uint64_t sequence; | ||
130 | unsigned i; | 129 | unsigned i; |
131 | int r = 0; | 130 | int r = 0; |
132 | 131 | ||
@@ -199,12 +198,9 @@ int amdgpu_ib_schedule(struct amdgpu_device *adev, unsigned num_ibs, | |||
199 | return r; | 198 | return r; |
200 | } | 199 | } |
201 | 200 | ||
202 | sequence = amdgpu_enable_scheduler ? ib->sequence : 0; | ||
203 | |||
204 | if (!amdgpu_enable_scheduler && ib->ctx) | 201 | if (!amdgpu_enable_scheduler && ib->ctx) |
205 | ib->sequence = amdgpu_ctx_add_fence(ib->ctx, ring, | 202 | ib->sequence = amdgpu_ctx_add_fence(ib->ctx, ring, |
206 | &ib->fence->base, | 203 | &ib->fence->base); |
207 | sequence); | ||
208 | 204 | ||
209 | /* wrap the last IB with fence */ | 205 | /* wrap the last IB with fence */ |
210 | if (ib->user) { | 206 | if (ib->user) { |