diff options
author | Christian König <christian.koenig@amd.com> | 2016-07-25 11:56:18 -0400 |
---|---|---|
committer | Alex Deucher <alexander.deucher@amd.com> | 2016-08-08 11:32:17 -0400 |
commit | cdb7e8f2733579e35ec2883bde7b594d07ad67e9 (patch) | |
tree | ef1b244bae983088efd5c62e9fdb1447121916c2 /drivers/gpu/drm/amd/amdgpu/amdgpu_object.h | |
parent | 78bbbd9c0fcde51b56c5bec99dd286cbad698712 (diff) |
drm/amdgpu: add more warning to amdgpu_bo_offset
Warn when we try to get the address and the BO isn't locked or reserved.
Signed-off-by: Christian König <christian.koenig@amd.com>
Reviewed-by: Chunming Zhou <david1.zhou@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
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, 1 insertions, 15 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.h index ae188a88082d..d650b42279e5 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.h +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.h | |||
@@ -85,21 +85,6 @@ static inline void amdgpu_bo_unreserve(struct amdgpu_bo *bo) | |||
85 | ttm_bo_unreserve(&bo->tbo); | 85 | ttm_bo_unreserve(&bo->tbo); |
86 | } | 86 | } |
87 | 87 | ||
88 | /** | ||
89 | * amdgpu_bo_gpu_offset - return GPU offset of bo | ||
90 | * @bo: amdgpu object for which we query the offset | ||
91 | * | ||
92 | * Returns current GPU offset of the object. | ||
93 | * | ||
94 | * Note: object should either be pinned or reserved when calling this | ||
95 | * function, it might be useful to add check for this for debugging. | ||
96 | */ | ||
97 | static inline u64 amdgpu_bo_gpu_offset(struct amdgpu_bo *bo) | ||
98 | { | ||
99 | WARN_ON_ONCE(bo->tbo.mem.mem_type == TTM_PL_SYSTEM); | ||
100 | return bo->tbo.offset; | ||
101 | } | ||
102 | |||
103 | static inline unsigned long amdgpu_bo_size(struct amdgpu_bo *bo) | 88 | static inline unsigned long amdgpu_bo_size(struct amdgpu_bo *bo) |
104 | { | 89 | { |
105 | return bo->tbo.num_pages << PAGE_SHIFT; | 90 | return bo->tbo.num_pages << PAGE_SHIFT; |
@@ -169,6 +154,7 @@ void amdgpu_bo_move_notify(struct ttm_buffer_object *bo, | |||
169 | int amdgpu_bo_fault_reserve_notify(struct ttm_buffer_object *bo); | 154 | int amdgpu_bo_fault_reserve_notify(struct ttm_buffer_object *bo); |
170 | void amdgpu_bo_fence(struct amdgpu_bo *bo, struct fence *fence, | 155 | void amdgpu_bo_fence(struct amdgpu_bo *bo, struct fence *fence, |
171 | bool shared); | 156 | bool shared); |
157 | u64 amdgpu_bo_gpu_offset(struct amdgpu_bo *bo); | ||
172 | 158 | ||
173 | /* | 159 | /* |
174 | * sub allocation | 160 | * sub allocation |