aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlex Deucher <alexdeucher@gmail.com>2014-04-16 09:42:23 -0400
committerChristian König <christian.koenig@amd.com>2014-04-17 08:14:43 -0400
commitbcddee29b0b87af3aeda953840f97b356b24dc5e (patch)
treed06ada61b523d46d77d3f48c4bfafb711c1adbaf
parent8c79bae6a30f606b7a4e17c994bc5f72f8fdaf11 (diff)
drm/radeon/ci: make sure mc ucode is loaded before checking the size
Avoid a possible segfault. Noticed-by: Dan Carpenter <dan.carpenter@oracle.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com> Cc: stable@vger.kernel.org
-rw-r--r--drivers/gpu/drm/radeon/cik.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/gpu/drm/radeon/cik.c b/drivers/gpu/drm/radeon/cik.c
index 7e430450bac0..199eb194716f 100644
--- a/drivers/gpu/drm/radeon/cik.c
+++ b/drivers/gpu/drm/radeon/cik.c
@@ -1705,11 +1705,13 @@ int ci_mc_load_microcode(struct radeon_device *rdev)
1705 const __be32 *fw_data; 1705 const __be32 *fw_data;
1706 u32 running, blackout = 0; 1706 u32 running, blackout = 0;
1707 u32 *io_mc_regs; 1707 u32 *io_mc_regs;
1708 int i, regs_size, ucode_size = rdev->mc_fw->size / 4; 1708 int i, regs_size, ucode_size;
1709 1709
1710 if (!rdev->mc_fw) 1710 if (!rdev->mc_fw)
1711 return -EINVAL; 1711 return -EINVAL;
1712 1712
1713 ucode_size = rdev->mc_fw->size / 4;
1714
1713 switch (rdev->family) { 1715 switch (rdev->family) {
1714 case CHIP_BONAIRE: 1716 case CHIP_BONAIRE:
1715 io_mc_regs = (u32 *)&bonaire_io_mc_regs; 1717 io_mc_regs = (u32 *)&bonaire_io_mc_regs;