| Message ID | 20210629114413.3371-1-nirmoy.das@amd.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [v3,1/1] drm/amdgpu: return early for non-TTM_PL_TT type BOs | expand |
Hi Christian, Could you please pick this up for drm-misc-next or fixes ? Regards, Nirmoy On 6/29/2021 1:44 PM, Nirmoy Das wrote: > Return early for non-TTM_PL_TT 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. > > v3: remove extra braces. > v2: merge if-conditions. > > Signed-off-by: Nirmoy Das <nirmoy.das@amd.com> > Reviewed-by: Christian König <christian.koenig@amd.com> > --- > drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c > index b46726e47bce..7a82e7b9e18e 100644 > --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c > +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c > @@ -926,7 +926,8 @@ static int amdgpu_ttm_backend_bind(struct ttm_device *bdev, > bo_mem->mem_type == AMDGPU_PL_OA) > return -EINVAL; > > - if (!amdgpu_gtt_mgr_has_gart_addr(bo_mem)) { > + if (bo_mem->mem_type != TTM_PL_TT || > + !amdgpu_gtt_mgr_has_gart_addr(bo_mem)) { > gtt->offset = AMDGPU_BO_INVALID_OFFSET; > return 0; > } > -- > 2.32.0 >
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c index b46726e47bce..7a82e7b9e18e 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c @@ -926,7 +926,8 @@ static int amdgpu_ttm_backend_bind(struct ttm_device *bdev, bo_mem->mem_type == AMDGPU_PL_OA) return -EINVAL; - if (!amdgpu_gtt_mgr_has_gart_addr(bo_mem)) { + if (bo_mem->mem_type != TTM_PL_TT || + !amdgpu_gtt_mgr_has_gart_addr(bo_mem)) { gtt->offset = AMDGPU_BO_INVALID_OFFSET; return 0; }