diff options
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu.h')
-rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu.h | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu.h b/drivers/gpu/drm/amd/amdgpu/amdgpu.h index 9f70546594a8..7b923e6509af 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu.h +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu.h | |||
@@ -946,12 +946,8 @@ void amdgpu_vm_move_pt_bos_in_lru(struct amdgpu_device *adev, | |||
946 | struct amdgpu_vm *vm); | 946 | struct amdgpu_vm *vm); |
947 | int amdgpu_vm_grab_id(struct amdgpu_vm *vm, struct amdgpu_ring *ring, | 947 | int amdgpu_vm_grab_id(struct amdgpu_vm *vm, struct amdgpu_ring *ring, |
948 | struct amdgpu_sync *sync, struct fence *fence, | 948 | struct amdgpu_sync *sync, struct fence *fence, |
949 | unsigned *vm_id, uint64_t *vm_pd_addr); | 949 | struct amdgpu_job *job); |
950 | int amdgpu_vm_flush(struct amdgpu_ring *ring, | 950 | int amdgpu_vm_flush(struct amdgpu_ring *ring, struct amdgpu_job *job); |
951 | unsigned vm_id, uint64_t pd_addr, | ||
952 | uint32_t gds_base, uint32_t gds_size, | ||
953 | uint32_t gws_base, uint32_t gws_size, | ||
954 | uint32_t oa_base, uint32_t oa_size); | ||
955 | void amdgpu_vm_reset_id(struct amdgpu_device *adev, unsigned vm_id); | 951 | void amdgpu_vm_reset_id(struct amdgpu_device *adev, unsigned vm_id); |
956 | uint64_t amdgpu_vm_map_gart(const dma_addr_t *pages_addr, uint64_t addr); | 952 | uint64_t amdgpu_vm_map_gart(const dma_addr_t *pages_addr, uint64_t addr); |
957 | int amdgpu_vm_update_page_directory(struct amdgpu_device *adev, | 953 | int amdgpu_vm_update_page_directory(struct amdgpu_device *adev, |
@@ -1272,6 +1268,7 @@ struct amdgpu_job { | |||
1272 | uint32_t num_ibs; | 1268 | uint32_t num_ibs; |
1273 | void *owner; | 1269 | void *owner; |
1274 | uint64_t ctx; | 1270 | uint64_t ctx; |
1271 | bool vm_needs_flush; | ||
1275 | unsigned vm_id; | 1272 | unsigned vm_id; |
1276 | uint64_t vm_pd_addr; | 1273 | uint64_t vm_pd_addr; |
1277 | uint32_t gds_base, gds_size; | 1274 | uint32_t gds_base, gds_size; |