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

Commit 94aa8272 authored by Nikita Zhandarovich's avatar Nikita Zhandarovich Committed by Greg Kroah-Hartman
Browse files

drm/radeon: check return value of radeon_ring_lock() 



[ Upstream commit 71225e1c930942cb1e042fc08c5cc0c4ef30e95e ]

In the unlikely event of radeon_ring_lock() failing, its errno return
value should be processed. This patch checks said return value and
prints a debug message in case of an error.

Found by Linux Verification Center (linuxtesting.org) with static
analysis tool SVACE.

Fixes: 48c0c902 ("drm/radeon/kms: add support for CP setup on SI")
Signed-off-by: default avatarNikita Zhandarovich <n.zhandarovich@fintech.ru>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent bf48d891

drivers/gpu/drm/radeon/si.c

+4 −0
Original line number Diff line number Diff line
@@ -3616,6 +3616,10 @@ static int si_cp_start(struct radeon_device *rdev) 
	for (i = RADEON_RING_TYPE_GFX_INDEX; i <= CAYMAN_RING_TYPE_CP2_INDEX; ++i) {

		ring = &rdev->ring[i];

		r = radeon_ring_lock(rdev, ring, 2);

		if (r) {

			DRM_ERROR("radeon: cp failed to lock ring (%d).\n", r);

			return r;

		}



		/* clear the compute context state */

		radeon_ring_write(ring, PACKET3_COMPUTE(PACKET3_CLEAR_STATE, 0));