| From efd677c0dc9fd6b3facdadad2c725eea4409e7db Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Fri, 15 May 2020 10:50:47 +0100 |
| Subject: drm/amdgpu: use the unlocked drm_gem_object_put |
| MIME-Version: 1.0 |
| Content-Type: text/plain; charset=UTF-8 |
| Content-Transfer-Encoding: 8bit |
| |
| From: Emil Velikov <emil.velikov@collabora.com> |
| |
| [ Upstream commit 1a87f67a66de4ad0c0d79fd86b6c5273143387c3 ] |
| |
| The driver does not hold struct_mutex, thus using the locked version of |
| the helper is incorrect. |
| |
| Cc: Alex Deucher <alexander.deucher@amd.com> |
| Cc: Christian König <christian.koenig@amd.com> |
| Cc: amd-gfx@lists.freedesktop.org |
| Fixes: a39414716ca0 ("drm/amdgpu: add independent DMA-buf import v9") |
| Signed-off-by: Emil Velikov <emil.velikov@collabora.com> |
| Acked-by: Sam Ravnborg <sam@ravnborg.org> |
| Reviewed-by: Christian König <christian.koenig@amd.com> |
| Acked-by: Thomas Zimmermann <tzimmermann@suse.de> |
| Link: https://patchwork.freedesktop.org/patch/msgid/20200515095118.2743122-8-emil.l.velikov@gmail.com |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.c | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.c |
| index ffeb20f11c07c..728f76cc536ee 100644 |
| --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.c |
| +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.c |
| @@ -552,7 +552,7 @@ struct drm_gem_object *amdgpu_gem_prime_import(struct drm_device *dev, |
| attach = dma_buf_dynamic_attach(dma_buf, dev->dev, |
| &amdgpu_dma_buf_attach_ops, obj); |
| if (IS_ERR(attach)) { |
| - drm_gem_object_put(obj); |
| + drm_gem_object_put_unlocked(obj); |
| return ERR_CAST(attach); |
| } |
| |
| -- |
| 2.25.1 |
| |