diff options
author | Christian König <christian.koenig@amd.com> | 2015-12-11 09:16:32 -0500 |
---|---|---|
committer | Alex Deucher <alexander.deucher@amd.com> | 2015-12-18 17:29:45 -0500 |
commit | 56467ebfb254836dc30eb45d4ac8a46a400bfad6 (patch) | |
tree | 19629224afdc3328ede08e60ea46f0666c2d5ffe /drivers/gpu/drm/amd/amdgpu/amdgpu.h | |
parent | 3c0eea6c35d932c4d25070868067dc9cd9ceab91 (diff) |
drm/amdgpu: split VM PD and PT handling during CS
This way we avoid the extra allocation for the page directory entry.
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 | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu.h b/drivers/gpu/drm/amd/amdgpu/amdgpu.h index dc3dab539e4c..40850afa763f 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu.h +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu.h | |||
@@ -980,10 +980,11 @@ struct amdgpu_vm_manager { | |||
980 | void amdgpu_vm_manager_fini(struct amdgpu_device *adev); | 980 | void amdgpu_vm_manager_fini(struct amdgpu_device *adev); |
981 | int amdgpu_vm_init(struct amdgpu_device *adev, struct amdgpu_vm *vm); | 981 | int amdgpu_vm_init(struct amdgpu_device *adev, struct amdgpu_vm *vm); |
982 | void amdgpu_vm_fini(struct amdgpu_device *adev, struct amdgpu_vm *vm); | 982 | void amdgpu_vm_fini(struct amdgpu_device *adev, struct amdgpu_vm *vm); |
983 | struct amdgpu_bo_list_entry *amdgpu_vm_get_bos(struct amdgpu_device *adev, | 983 | void amdgpu_vm_get_pd_bo(struct amdgpu_vm *vm, |
984 | struct amdgpu_vm *vm, | 984 | struct list_head *validated, |
985 | struct list_head *validated, | 985 | struct amdgpu_bo_list_entry *entry); |
986 | struct list_head *duplicates); | 986 | struct amdgpu_bo_list_entry *amdgpu_vm_get_pt_bos(struct amdgpu_vm *vm, |
987 | struct list_head *duplicates); | ||
987 | int amdgpu_vm_grab_id(struct amdgpu_vm *vm, struct amdgpu_ring *ring, | 988 | int amdgpu_vm_grab_id(struct amdgpu_vm *vm, struct amdgpu_ring *ring, |
988 | struct amdgpu_sync *sync); | 989 | struct amdgpu_sync *sync); |
989 | void amdgpu_vm_flush(struct amdgpu_ring *ring, | 990 | void amdgpu_vm_flush(struct amdgpu_ring *ring, |
@@ -1253,6 +1254,7 @@ struct amdgpu_cs_parser { | |||
1253 | unsigned nchunks; | 1254 | unsigned nchunks; |
1254 | struct amdgpu_cs_chunk *chunks; | 1255 | struct amdgpu_cs_chunk *chunks; |
1255 | /* relocations */ | 1256 | /* relocations */ |
1257 | struct amdgpu_bo_list_entry vm_pd; | ||
1256 | struct amdgpu_bo_list_entry *vm_bos; | 1258 | struct amdgpu_bo_list_entry *vm_bos; |
1257 | struct list_head validated; | 1259 | struct list_head validated; |
1258 | struct fence *fence; | 1260 | struct fence *fence; |