diff options
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu.h')
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu.h b/drivers/gpu/drm/amd/amdgpu/amdgpu.h index e72cf4518c30..959008ad65a8 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu.h +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu.h | |||
| @@ -740,7 +740,6 @@ struct amdgpu_ib { | |||
| 740 | uint64_t gpu_addr; | 740 | uint64_t gpu_addr; |
| 741 | uint32_t *ptr; | 741 | uint32_t *ptr; |
| 742 | struct amdgpu_user_fence *user; | 742 | struct amdgpu_user_fence *user; |
| 743 | struct amdgpu_vm *vm; | ||
| 744 | unsigned vm_id; | 743 | unsigned vm_id; |
| 745 | uint64_t vm_pd_addr; | 744 | uint64_t vm_pd_addr; |
| 746 | struct amdgpu_ctx *ctx; | 745 | struct amdgpu_ctx *ctx; |
| @@ -763,7 +762,7 @@ enum amdgpu_ring_type { | |||
| 763 | extern const struct amd_sched_backend_ops amdgpu_sched_ops; | 762 | extern const struct amd_sched_backend_ops amdgpu_sched_ops; |
| 764 | 763 | ||
| 765 | int amdgpu_job_alloc(struct amdgpu_device *adev, unsigned num_ibs, | 764 | int amdgpu_job_alloc(struct amdgpu_device *adev, unsigned num_ibs, |
| 766 | struct amdgpu_job **job); | 765 | struct amdgpu_job **job, struct amdgpu_vm *vm); |
| 767 | int amdgpu_job_alloc_with_ib(struct amdgpu_device *adev, unsigned size, | 766 | int amdgpu_job_alloc_with_ib(struct amdgpu_device *adev, unsigned size, |
| 768 | struct amdgpu_job **job); | 767 | struct amdgpu_job **job); |
| 769 | 768 | ||
| @@ -1191,7 +1190,7 @@ int amdgpu_ib_get(struct amdgpu_device *adev, struct amdgpu_vm *vm, | |||
| 1191 | void amdgpu_ib_free(struct amdgpu_device *adev, struct amdgpu_ib *ib, struct fence *f); | 1190 | void amdgpu_ib_free(struct amdgpu_device *adev, struct amdgpu_ib *ib, struct fence *f); |
| 1192 | int amdgpu_ib_schedule(struct amdgpu_ring *ring, unsigned num_ibs, | 1191 | int amdgpu_ib_schedule(struct amdgpu_ring *ring, unsigned num_ibs, |
| 1193 | struct amdgpu_ib *ib, struct fence *last_vm_update, | 1192 | struct amdgpu_ib *ib, struct fence *last_vm_update, |
| 1194 | struct fence **f); | 1193 | struct amdgpu_job *job, struct fence **f); |
| 1195 | int amdgpu_ib_pool_init(struct amdgpu_device *adev); | 1194 | int amdgpu_ib_pool_init(struct amdgpu_device *adev); |
| 1196 | void amdgpu_ib_pool_fini(struct amdgpu_device *adev); | 1195 | void amdgpu_ib_pool_fini(struct amdgpu_device *adev); |
| 1197 | int amdgpu_ib_ring_tests(struct amdgpu_device *adev); | 1196 | int amdgpu_ib_ring_tests(struct amdgpu_device *adev); |
| @@ -1247,6 +1246,7 @@ struct amdgpu_cs_parser { | |||
| 1247 | struct amdgpu_job { | 1246 | struct amdgpu_job { |
| 1248 | struct amd_sched_job base; | 1247 | struct amd_sched_job base; |
| 1249 | struct amdgpu_device *adev; | 1248 | struct amdgpu_device *adev; |
| 1249 | struct amdgpu_vm *vm; | ||
| 1250 | struct amdgpu_ring *ring; | 1250 | struct amdgpu_ring *ring; |
| 1251 | struct amdgpu_sync sync; | 1251 | struct amdgpu_sync sync; |
| 1252 | struct amdgpu_ib *ibs; | 1252 | struct amdgpu_ib *ibs; |
