diff options
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_object.h')
-rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_object.h | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.h index 33615e2ea2e6..546f77cb7882 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.h +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.h | |||
@@ -92,6 +92,8 @@ struct amdgpu_bo { | |||
92 | struct list_head mn_list; | 92 | struct list_head mn_list; |
93 | struct list_head shadow_list; | 93 | struct list_head shadow_list; |
94 | }; | 94 | }; |
95 | |||
96 | struct kgd_mem *kfd_bo; | ||
95 | }; | 97 | }; |
96 | 98 | ||
97 | static inline struct amdgpu_bo *ttm_to_amdgpu_bo(struct ttm_buffer_object *tbo) | 99 | static inline struct amdgpu_bo *ttm_to_amdgpu_bo(struct ttm_buffer_object *tbo) |
@@ -201,13 +203,11 @@ static inline bool amdgpu_bo_explicit_sync(struct amdgpu_bo *bo) | |||
201 | return bo->flags & AMDGPU_GEM_CREATE_EXPLICIT_SYNC; | 203 | return bo->flags & AMDGPU_GEM_CREATE_EXPLICIT_SYNC; |
202 | } | 204 | } |
203 | 205 | ||
204 | int amdgpu_bo_create(struct amdgpu_device *adev, | 206 | int amdgpu_bo_create(struct amdgpu_device *adev, unsigned long size, |
205 | unsigned long size, int byte_align, | 207 | int byte_align, u32 domain, |
206 | bool kernel, u32 domain, u64 flags, | 208 | u64 flags, enum ttm_bo_type type, |
207 | struct sg_table *sg, | 209 | struct reservation_object *resv, |
208 | struct reservation_object *resv, | 210 | struct amdgpu_bo **bo_ptr); |
209 | uint64_t init_value, | ||
210 | struct amdgpu_bo **bo_ptr); | ||
211 | int amdgpu_bo_create_reserved(struct amdgpu_device *adev, | 211 | int amdgpu_bo_create_reserved(struct amdgpu_device *adev, |
212 | unsigned long size, int align, | 212 | unsigned long size, int align, |
213 | u32 domain, struct amdgpu_bo **bo_ptr, | 213 | u32 domain, struct amdgpu_bo **bo_ptr, |
@@ -282,8 +282,6 @@ void amdgpu_sa_bo_manager_fini(struct amdgpu_device *adev, | |||
282 | struct amdgpu_sa_manager *sa_manager); | 282 | struct amdgpu_sa_manager *sa_manager); |
283 | int amdgpu_sa_bo_manager_start(struct amdgpu_device *adev, | 283 | int amdgpu_sa_bo_manager_start(struct amdgpu_device *adev, |
284 | struct amdgpu_sa_manager *sa_manager); | 284 | struct amdgpu_sa_manager *sa_manager); |
285 | int amdgpu_sa_bo_manager_suspend(struct amdgpu_device *adev, | ||
286 | struct amdgpu_sa_manager *sa_manager); | ||
287 | int amdgpu_sa_bo_new(struct amdgpu_sa_manager *sa_manager, | 285 | int amdgpu_sa_bo_new(struct amdgpu_sa_manager *sa_manager, |
288 | struct amdgpu_sa_bo **sa_bo, | 286 | struct amdgpu_sa_bo **sa_bo, |
289 | unsigned size, unsigned align); | 287 | unsigned size, unsigned align); |