drm/amdgpu: return early for preempt type BOs
Subsystems (2)
PATCH 1/2 drm/amdgpu: return early for preempt type BOs
Return early for AMDGPU_PL_PREEMPT BOs so that we don't pass wrong pointer to amdgpu_gtt_mgr_has_gart_addr() which assumes ttm_resource argument to be TTM_PL_TT type BO's.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 5 +++++ 1 file changed, 5 insertions(+)
drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c +5 -0
@@ -926,6 +926,11 @@ static int amdgpu_ttm_backend_bind(struct ttm_device *bdev, bo_mem->mem_type == AMDGPU_PL_OA)return -EINVAL ; +if (bo_mem->mem_type ==AMDGPU_PL_PREEMPT ) { + gtt->offset =AMDGPU_BO_INVALID_OFFSET ; +return 0 ; + } +if (!amdgpu_gtt_mgr_has_gart_addr (bo_mem)) { gtt->offset =AMDGPU_BO_INVALID_OFFSET ;return 0 ;
Signature · 6 lines
2.32.0 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 2/2 drm/amdgpu: raise error on incorrect mem_type
Be more defensive and raise error on wrong mem_type argument in amdgpu_gtt_mgr_has_gart_addr().
--- drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c +5 -1
@@ -107,8 +107,12 @@ const struct attribute_group amdgpu_gtt_mgr_attr_group = {*/ bool amdgpu_gtt_mgr_has_gart_addr (struct ttm_resource *res) { -struct amdgpu_gtt_node *node =to_amdgpu_gtt_node (res); +struct amdgpu_gtt_node *node; + +if (WARN_ON (res->mem_type !=TTM_PL_TT )) +return false; + node =to_amdgpu_gtt_node (res);return drm_mm_node_allocated (&node->base.mm_nodes[0 ]); }
Signature · 6 lines
2.32.0 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Am 25.06.21 um 19:28 schrieb Nirmoy Das:
Quoted 14 lines
Return early for
AMDGPU_PL_PREEMPTBOs so that we don't pass wrong pointer toamdgpu_gtt_mgr_has_gart_addr()which assumesttm_resourceargument to beTTM_PL_TTtype BO's.Signed-off-by Nirmoy Das <[email protected]>--- drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 5 +++++ 1 file changed, 5 insertions(+)drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c +0
-0
drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c static int amdgpu_ttm_backend_bind(struct ttm_device *bdev, · line 929
Quoted 4 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c +1
-0@@ -926,6 +926,11 @@ static int amdgpu_ttm_backend_bind(struct ttm_device *bdev, bo_mem->mem_type == AMDGPU_PL_OA)return -EINVAL ; +if (bo_mem->mem_type ==AMDGPU_PL_PREEMPT ) {
Probably better to merge that into the if below.
E.g. if bo_mem->mem_type != TTM_PL_TT || .....
Christian.
Quoted 7 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c +4
-0+ gtt->offset =AMDGPU_BO_INVALID_OFFSET ; +return 0 ; + } +if (!amdgpu_gtt_mgr_has_gart_addr (bo_mem)) { gtt->offset =AMDGPU_BO_INVALID_OFFSET ;return 0 ;