[PATCH 1/1] drm/amdgpu: make BO type check less restrictive

[StDenis, Tom]

[AMD Official Use Only - Internal Distribution Only]

FWIW the patch seems to fix the issue I was seeing :-)

Tom

________________________________________
From: Koenig, Christian <Christian.Koenig at amd.com>
Sent: Monday, March 15, 2021 11:22
To: Das, Nirmoy
Cc: amd-gfx at lists.freedesktop.org; StDenis, Tom
Subject: Re: [PATCH 1/1] drm/amdgpu: make BO type check less restrictive

Am 15.03.21 um 16:14 schrieb Nirmoy Das:
> BO with ttm_bo_type_sg type can also have tiling_flag and metadata.
> So so BO type check for only ttm_bo_type_kernel.
>
> Signed-off-by: Nirmoy Das <nirmoy.das at amd.com>
> Reported-by: Tom StDenis <Tom.StDenis at amd.com>

At some point we should probably add a amdgpu_bo_is_user() helper
function, but for now that should work.

Reviewed-by: Christian König <christian.koenig at amd.com>

> ---
>   drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 8 ++++----
>   1 file changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c
> index ac0e1cd83858..fdf23e439b42 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c
> @@ -1167,7 +1167,7 @@ int amdgpu_bo_set_tiling_flags(struct amdgpu_bo *bo, u64 tiling_flags)
>       struct amdgpu_device *adev = amdgpu_ttm_adev(bo->tbo.bdev);
>       struct amdgpu_bo_user *ubo;
>
> -     BUG_ON(bo->tbo.type != ttm_bo_type_device);
> +     BUG_ON(bo->tbo.type == ttm_bo_type_kernel);
>       if (adev->family <= AMDGPU_FAMILY_CZ &&
>           AMDGPU_TILING_GET(tiling_flags, TILE_SPLIT) > 6)
>               return -EINVAL;
> @@ -1189,7 +1189,7 @@ void amdgpu_bo_get_tiling_flags(struct amdgpu_bo *bo, u64 *tiling_flags)
>   {
>       struct amdgpu_bo_user *ubo;
>
> -     BUG_ON(bo->tbo.type != ttm_bo_type_device);
> +     BUG_ON(bo->tbo.type == ttm_bo_type_kernel);
>       dma_resv_assert_held(bo->tbo.base.resv);
>       ubo = to_amdgpu_bo_user(bo);
>
> @@ -1216,7 +1216,7 @@ int amdgpu_bo_set_metadata (struct amdgpu_bo *bo, void *metadata,
>       struct amdgpu_bo_user *ubo;
>       void *buffer;
>
> -     BUG_ON(bo->tbo.type != ttm_bo_type_device);
> +     BUG_ON(bo->tbo.type == ttm_bo_type_kernel);
>       ubo = to_amdgpu_bo_user(bo);
>       if (!metadata_size) {
>               if (ubo->metadata_size) {
> @@ -1266,7 +1266,7 @@ int amdgpu_bo_get_metadata(struct amdgpu_bo *bo, void *buffer,
>       if (!buffer && !metadata_size)
>               return -EINVAL;
>
> -     BUG_ON(bo->tbo.type != ttm_bo_type_device);
> +     BUG_ON(bo->tbo.type == ttm_bo_type_kernel);
>       ubo = to_amdgpu_bo_user(bo);
>       if (buffer) {
>               if (buffer_size < ubo->metadata_size)