[PATCH] drm/radeon/si: check for CE ucode as well when loading ucode

alexdeucher at gmail.com alexdeucher at gmail.com
Tue Jun 12 12:33:35 PDT 2012


From: Alex Deucher <alexander.deucher at amd.com>

Fixes possible segfault if the CE ucode is missing.

Signed-off-by: Alex Deucher <alexander.deucher at amd.com>
Cc: stable at vger.kernel.org
---
 drivers/gpu/drm/radeon/si.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/gpu/drm/radeon/si.c b/drivers/gpu/drm/radeon/si.c
index 9248a91..d500911 100644
--- a/drivers/gpu/drm/radeon/si.c
+++ b/drivers/gpu/drm/radeon/si.c
@@ -1825,7 +1825,7 @@ static int si_cp_load_microcode(struct radeon_device *rdev)
 	const __be32 *fw_data;
 	int i;
 
-	if (!rdev->me_fw || !rdev->pfp_fw)
+	if (!rdev->me_fw || !rdev->pfp_fw || !rdev->ce_fw)
 		return -EINVAL;
 
 	si_cp_enable(rdev, false);
-- 
1.7.7.5



More information about the dri-devel mailing list