Skip to content

Commit 60ecaaf

Browse files
sukrutbalexdeucher
authored andcommitted
drm:amd:amdgpu: Fix missing buffer object unlock in failure path
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: Sukrut Bellary <sukrut.bellary@linux.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
1 parent 79ef1c9 commit 60ecaaf

2 files changed

Lines changed: 6 additions & 2 deletions

File tree

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6892,8 +6892,10 @@ static int gfx_v10_0_kiq_resume(struct amdgpu_device *adev)
68926892
return r;
68936893

68946894
r = amdgpu_bo_kmap(ring->mqd_obj, (void **)&ring->mqd_ptr);
6895-
if (unlikely(r != 0))
6895+
if (unlikely(r != 0)) {
6896+
amdgpu_bo_unreserve(ring->mqd_obj);
68966897
return r;
6898+
}
68976899

68986900
gfx_v10_0_kiq_init_queue(ring);
68996901
amdgpu_bo_kunmap(ring->mqd_obj);

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3617,8 +3617,10 @@ static int gfx_v9_0_kiq_resume(struct amdgpu_device *adev)
36173617
return r;
36183618

36193619
r = amdgpu_bo_kmap(ring->mqd_obj, (void **)&ring->mqd_ptr);
3620-
if (unlikely(r != 0))
3620+
if (unlikely(r != 0)) {
3621+
amdgpu_bo_unreserve(ring->mqd_obj);
36213622
return r;
3623+
}
36223624

36233625
gfx_v9_0_kiq_init_queue(ring);
36243626
amdgpu_bo_kunmap(ring->mqd_obj);

0 commit comments

Comments
 (0)