[PATCH] drm/amdgpu: fix leftover drm_gem_object_put_unlocked call

[PATCH] drm/amdgpu: fix leftover drm_gem_object_put_unlocked call

[Simon Ser]

drm_gem_object_put_unlocked has been renamed to drm_gem_object_put.

Signed-off-by: Simon Ser <contact@emersion.fr>
Fixes: e07ddb0ce7cd ("drm/amd: remove _unlocked suffix in drm_gem_object_put_unlocked")
Cc: Alex Deucher <alexander.deucher@amd.com>
Cc: Christian König <christian.koenig@amd.com>
Cc: David (ChunMing) Zhou <David1.Zhou@amd.com>
Cc: Emil Velikov <emil.velikov@collabora.com>
---
 drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c
index da8b31a53291..c99fb92ae991 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c
@@ -1354,7 +1354,7 @@ int amdgpu_amdkfd_gpuvm_free_memory_of_gpu(
 	}
 
 	/* Free the BO*/
-	drm_gem_object_put_unlocked(&mem->bo->tbo.base);
+	drm_gem_object_put(&mem->bo->tbo.base);
 	mutex_destroy(&mem->lock);
 	kfree(mem);
 
-- 
2.26.2


_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

Re: [PATCH] drm/amdgpu: fix leftover drm_gem_object_put_unlocked call

[Emil Velikov]

On Fri, 22 May 2020 at 20:38, Simon Ser <contact@emersion.fr> wrote:
>
> drm_gem_object_put_unlocked has been renamed to drm_gem_object_put.
>
> Signed-off-by: Simon Ser <contact@emersion.fr>
> Fixes: e07ddb0ce7cd ("drm/amd: remove _unlocked suffix in drm_gem_object_put_unlocked")
Wrong tag it seems. At that commit, the amdgpu code uses it's own
wrapper - amdgpu_bo_unref()

-Emil
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

Re: [PATCH] drm/amdgpu: fix leftover drm_gem_object_put_unlocked call

[Felix Kuehling]

Am 2020-05-22 um 3:38 p.m. schrieb Simon Ser:
> drm_gem_object_put_unlocked has been renamed to drm_gem_object_put.

Alex, I guess you'll need to apply this patch when you include
e07ddb0ce7cd in a pull request to Dave Airlie. I don't think it makes
sense to apply this on amd-kfd-staging until the branch gets rebased again.

Regards,
  Felix


>
> Signed-off-by: Simon Ser <contact@emersion.fr>
> Fixes: e07ddb0ce7cd ("drm/amd: remove _unlocked suffix in drm_gem_object_put_unlocked")
> Cc: Alex Deucher <alexander.deucher@amd.com>
> Cc: Christian König <christian.koenig@amd.com>
> Cc: David (ChunMing) Zhou <David1.Zhou@amd.com>
> Cc: Emil Velikov <emil.velikov@collabora.com>
> ---
>  drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c
> index da8b31a53291..c99fb92ae991 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c
> @@ -1354,7 +1354,7 @@ int amdgpu_amdkfd_gpuvm_free_memory_of_gpu(
>  	}
>  
>  	/* Free the BO*/
> -	drm_gem_object_put_unlocked(&mem->bo->tbo.base);
> +	drm_gem_object_put(&mem->bo->tbo.base);
>  	mutex_destroy(&mem->lock);
>  	kfree(mem);
>  
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

Re: [PATCH] drm/amdgpu: fix leftover drm_gem_object_put_unlocked call

[Emil Velikov]

On Fri, 22 May 2020 at 20:43, Emil Velikov <emil.l.velikov@gmail.com> wrote:
>
> On Fri, 22 May 2020 at 20:38, Simon Ser <contact@emersion.fr> wrote:
> >
> > drm_gem_object_put_unlocked has been renamed to drm_gem_object_put.
> >
> > Signed-off-by: Simon Ser <contact@emersion.fr>
> > Fixes: e07ddb0ce7cd ("drm/amd: remove _unlocked suffix in drm_gem_object_put_unlocked")
> Wrong tag it seems. At that commit, the amdgpu code uses it's own
> wrapper - amdgpu_bo_unref()
>
Alex, team, this seems like merge clash.

With the Fixes tag dropped, the patch is:
Reviewed-by: Emil Velikov <emil.l.velikov@gmail.com>

-Emil
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx