2020-03-09 14:37:03

by xinhui pan

Subject: [PATCH] drm/amdgpu: Correct the condition of warning while bo release

Only kernel bo has kfd eviction fence.
This warning is to give a notice that kfd only remove eviction fence on
individual bos.

Signed-off-by: xinhui pan <[email protected]>
---
drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c
index 5766d20f29d8..e99f68af2bf7 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c
@@ -1308,7 +1308,8 @@ void amdgpu_bo_release_notify(struct ttm_buffer_object *bo)
amdgpu_amdkfd_unreserve_memory_limit(abo);

/* We only remove the fence if the resv has individualized. */
- WARN_ON_ONCE(bo->base.resv != &bo->base._resv);
+ WARN_ON_ONCE(bo->type == ttm_bo_type_kernel
+ && bo->base.resv != &bo->base._resv);
if (bo->base.resv == &bo->base._resv)
amdgpu_amdkfd_remove_fence_on_pt_pd_bos(abo);

--
2.17.1

2020-03-09 14:45:54

by Christian König

Subject: Re: [PATCH] drm/amdgpu: Correct the condition of warning while bo release

Am 09.03.20 um 15:34 schrieb xinhui pan:
> Only kernel bo has kfd eviction fence.
> This warning is to give a notice that kfd only remove eviction fence on
> individual bos.
>
> Signed-off-by: xinhui pan <[email protected]>

Reviewed-by: Christian König <[email protected]>

> ---
> drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c
> index 5766d20f29d8..e99f68af2bf7 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c
> @@ -1308,7 +1308,8 @@ void amdgpu_bo_release_notify(struct ttm_buffer_object *bo)
> amdgpu_amdkfd_unreserve_memory_limit(abo);
>
> /* We only remove the fence if the resv has individualized. */
> - WARN_ON_ONCE(bo->base.resv != &bo->base._resv);
> + WARN_ON_ONCE(bo->type == ttm_bo_type_kernel
> + && bo->base.resv != &bo->base._resv);
> if (bo->base.resv == &bo->base._resv)
> amdgpu_amdkfd_remove_fence_on_pt_pd_bos(abo);
>

2020-03-09 16:04:39

by Nicholas Johnson

Subject: Re: [PATCH] drm/amdgpu: Correct the condition of warning while bo release

On Mon, Mar 09, 2020 at 03:45:04PM +0100, Christian K?nig wrote:
> Am 09.03.20 um 15:34 schrieb xinhui pan:
> > Only kernel bo has kfd eviction fence.
> > This warning is to give a notice that kfd only remove eviction fence on
> > individual bos.
> >
> > Signed-off-by: xinhui pan <[email protected]>
>
> Reviewed-by: Christian K?nig <[email protected]>
If applicable (I reported but was not the first to report / you were
already aware):

Tested-by: Nicholas Johnson <[email protected]>

The warning went away when applied.

Cheers!
>
> > ---
> > drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 3 ++-
> > 1 file changed, 2 insertions(+), 1 deletion(-)
> >
> > diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c
> > index 5766d20f29d8..e99f68af2bf7 100644
> > --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c
> > +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c
> > @@ -1308,7 +1308,8 @@ void amdgpu_bo_release_notify(struct ttm_buffer_object *bo)
> > amdgpu_amdkfd_unreserve_memory_limit(abo);
> > /* We only remove the fence if the resv has individualized. */
> > - WARN_ON_ONCE(bo->base.resv != &bo->base._resv);
> > + WARN_ON_ONCE(bo->type == ttm_bo_type_kernel
> > + && bo->base.resv != &bo->base._resv);
> > if (bo->base.resv == &bo->base._resv)
> > amdgpu_amdkfd_remove_fence_on_pt_pd_bos(abo);
>