[AMD Official Use Only - Internal Distribution Only]
Thanks for the comments! I'll separate it into two patches.
--Brs,
Morris Zhang
MLSE Linux ML SRDC
Ext. 25147
-----Original Message-----
From: Das, Nirmoy <Nirmoy.Das@xxxxxxx>
Sent: Tuesday, May 25, 2021 8:15 PM
To: Zhang, Morris <Shiwu.Zhang@xxxxxxx>; amd-gfx@xxxxxxxxxxxxxxxxxxxxx; Das, Nirmoy <Nirmoy.Das@xxxxxxx>
Subject: Re: [PATCH] drm/amdgpu: fix metadata_size for ubo ioctl queries
On 5/24/21 1:52 PM, Shiwu Zhang wrote:
> Although the kfd_ioctl_get_dmabuf_info() still fail it will indicate
> the caller right metadat_size useful for the same kfd ioctl next time.
>
> v2: free the metadata buffer for sg type when to destroy BOs.
>
> Signed-off-by: Shiwu Zhang <shiwu.zhang@xxxxxxx>
> ---
> drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 7 ++++---
> 1 file changed, 4 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c
> b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c
> index 3f85ba8222ef..e9f8701fd046 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c
> @@ -95,7 +95,7 @@ static void amdgpu_bo_destroy(struct ttm_buffer_object *tbo)
> }
> amdgpu_bo_unref(&bo->parent);
>
> - if (bo->tbo.type == ttm_bo_type_device) {
> + if (bo->tbo.type != ttm_bo_type_kernel) {
> ubo = to_amdgpu_bo_user(bo);
> kfree(ubo->metadata);
> }
This should be a separate patch, it is unrelated to the below hunk.
> @@ -1213,6 +1213,9 @@ int amdgpu_bo_get_metadata(struct amdgpu_bo *bo,
> void *buffer,
>
> BUG_ON(bo->tbo.type == ttm_bo_type_kernel);
> ubo = to_amdgpu_bo_user(bo);
> + if (metadata_size)
> + *metadata_size = ubo->metadata_size;
> +
> if (buffer) {
> if (buffer_size < ubo->metadata_size)
> return -EINVAL;
> @@ -1221,8 +1224,6 @@ int amdgpu_bo_get_metadata(struct amdgpu_bo *bo, void *buffer,
> memcpy(buffer, ubo->metadata, ubo->metadata_size);
> }
>
> - if (metadata_size)
> - *metadata_size = ubo->metadata_size;
> if (flags)
> *flags = ubo->metadata_flags;
>
_______________________________________________
amd-gfx mailing list
amd-gfx@xxxxxxxxxxxxxxxxxxxxx
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
