diff options
author | Christian König <christian.koenig@amd.com> | 2016-02-08 06:13:05 -0500 |
---|---|---|
committer | Alex Deucher <alexander.deucher@amd.com> | 2016-02-10 14:17:24 -0500 |
commit | e86f9ceee19ec028ae79a09fe1eaabf315d67969 (patch) | |
tree | 5f9863ae2b5d30ff4dc3579d0395ea486d735d92 /drivers/gpu/drm/amd/amdgpu/amdgpu.h | |
parent | 9f2ade33e659250a810e5bdab0c602085792d5b6 (diff) |
drm/amdgpu: move sync into job object
No need to keep that for every IB.
Signed-off-by: Christian König <christian.koenig@amd.com>
Acked-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu.h')
-rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu.h b/drivers/gpu/drm/amd/amdgpu/amdgpu.h index 6cefde4aab49..99e660fec190 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu.h +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu.h | |||
@@ -776,7 +776,6 @@ struct amdgpu_ib { | |||
776 | bool grabbed_vmid; | 776 | bool grabbed_vmid; |
777 | struct amdgpu_vm *vm; | 777 | struct amdgpu_vm *vm; |
778 | struct amdgpu_ctx *ctx; | 778 | struct amdgpu_ctx *ctx; |
779 | struct amdgpu_sync sync; | ||
780 | uint32_t gds_base, gds_size; | 779 | uint32_t gds_base, gds_size; |
781 | uint32_t gws_base, gws_size; | 780 | uint32_t gws_base, gws_size; |
782 | uint32_t oa_base, oa_size; | 781 | uint32_t oa_base, oa_size; |
@@ -1178,6 +1177,7 @@ int amdgpu_ib_get(struct amdgpu_device *adev, struct amdgpu_vm *vm, | |||
1178 | void amdgpu_ib_free(struct amdgpu_device *adev, struct amdgpu_ib *ib); | 1177 | void amdgpu_ib_free(struct amdgpu_device *adev, struct amdgpu_ib *ib); |
1179 | int amdgpu_ib_schedule(struct amdgpu_ring *ring, unsigned num_ibs, | 1178 | int amdgpu_ib_schedule(struct amdgpu_ring *ring, unsigned num_ibs, |
1180 | struct amdgpu_ib *ib, void *owner, | 1179 | struct amdgpu_ib *ib, void *owner, |
1180 | struct fence *last_vm_update, | ||
1181 | struct fence **f); | 1181 | struct fence **f); |
1182 | int amdgpu_ib_pool_init(struct amdgpu_device *adev); | 1182 | int amdgpu_ib_pool_init(struct amdgpu_device *adev); |
1183 | void amdgpu_ib_pool_fini(struct amdgpu_device *adev); | 1183 | void amdgpu_ib_pool_fini(struct amdgpu_device *adev); |
@@ -1236,6 +1236,7 @@ struct amdgpu_job { | |||
1236 | struct amd_sched_job base; | 1236 | struct amd_sched_job base; |
1237 | struct amdgpu_device *adev; | 1237 | struct amdgpu_device *adev; |
1238 | struct amdgpu_ring *ring; | 1238 | struct amdgpu_ring *ring; |
1239 | struct amdgpu_sync sync; | ||
1239 | struct amdgpu_ib *ibs; | 1240 | struct amdgpu_ib *ibs; |
1240 | uint32_t num_ibs; | 1241 | uint32_t num_ibs; |
1241 | void *owner; | 1242 | void *owner; |