Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 82173fde authored by Sukrut Bellary's avatar Sukrut Bellary Committed by Greg Kroah-Hartman
Browse files

drm:amd:amdgpu: Fix missing buffer object unlock in failure path 



[ Upstream commit 60ecaaf54886b0642d5c4744f7fbf1ff0d6b3e42 ]

smatch warning -
1) drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c:3615 gfx_v9_0_kiq_resume()
warn: inconsistent returns 'ring->mqd_obj->tbo.base.resv'.

2) drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c:6901 gfx_v10_0_kiq_resume()
warn: inconsistent returns 'ring->mqd_obj->tbo.base.resv'.

Signed-off-by: default avatarSukrut Bellary <sukrut.bellary@linux.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 63afd766

drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c

+3 −1
Original line number Diff line number Diff line
@@ -3527,8 +3527,10 @@ static int gfx_v10_0_kiq_resume(struct amdgpu_device *adev) 
		return r;



	r = amdgpu_bo_kmap(ring->mqd_obj, (void **)&ring->mqd_ptr);

	if (unlikely(r != 0))

	if (unlikely(r != 0)) {

		amdgpu_bo_unreserve(ring->mqd_obj);

		return r;

	}



	gfx_v10_0_kiq_init_queue(ring);

	amdgpu_bo_kunmap(ring->mqd_obj);

drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c

+3 −1
Original line number Diff line number Diff line
@@ -3748,8 +3748,10 @@ static int gfx_v9_0_kiq_resume(struct amdgpu_device *adev) 
		return r;



	r = amdgpu_bo_kmap(ring->mqd_obj, (void **)&ring->mqd_ptr);

	if (unlikely(r != 0))

	if (unlikely(r != 0)) {

		amdgpu_bo_unreserve(ring->mqd_obj);

		return r;

	}



	gfx_v9_0_kiq_init_queue(ring);

	amdgpu_bo_kunmap(ring->mqd_obj);