diff options
author | Christian König <christian.koenig@amd.com> | 2016-03-01 07:34:49 -0500 |
---|---|---|
committer | Alex Deucher <alexander.deucher@amd.com> | 2016-03-08 11:01:48 -0500 |
commit | cffadc83c7016ba68721affe5da537ead279e2d2 (patch) | |
tree | a022cdc4d4dc83138e8bb3c2b621875c9ba4fc41 /drivers/gpu/drm/amd/amdgpu/amdgpu.h | |
parent | 364beb2cc45247e980a097e53d0932e143873333 (diff) |
drm/amdgpu: move the GDS switch into vm flush as well
After all it's an operation on the VMID.
Signed-off-by: Christian König <christian.koenig@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Reviewed-by: Chunming Zhou <david1.zhou@amd.com>
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu.h')
-rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu.h b/drivers/gpu/drm/amd/amdgpu/amdgpu.h index 128eba604f97..b6fae4b301d7 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu.h +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu.h | |||
@@ -957,8 +957,10 @@ int amdgpu_vm_grab_id(struct amdgpu_vm *vm, struct amdgpu_ring *ring, | |||
957 | struct amdgpu_sync *sync, struct fence *fence, | 957 | struct amdgpu_sync *sync, struct fence *fence, |
958 | unsigned *vm_id, uint64_t *vm_pd_addr); | 958 | unsigned *vm_id, uint64_t *vm_pd_addr); |
959 | void amdgpu_vm_flush(struct amdgpu_ring *ring, | 959 | void amdgpu_vm_flush(struct amdgpu_ring *ring, |
960 | unsigned vmid, | 960 | unsigned vm_id, uint64_t pd_addr, |
961 | uint64_t pd_addr); | 961 | uint32_t gds_base, uint32_t gds_size, |
962 | uint32_t gws_base, uint32_t gws_size, | ||
963 | uint32_t oa_base, uint32_t oa_size); | ||
962 | uint64_t amdgpu_vm_map_gart(const dma_addr_t *pages_addr, uint64_t addr); | 964 | uint64_t amdgpu_vm_map_gart(const dma_addr_t *pages_addr, uint64_t addr); |
963 | int amdgpu_vm_update_page_directory(struct amdgpu_device *adev, | 965 | int amdgpu_vm_update_page_directory(struct amdgpu_device *adev, |
964 | struct amdgpu_vm *vm); | 966 | struct amdgpu_vm *vm); |