projects
/
sdk
/
emulator
/
emulator-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
f8a2645
)
drm/radeon/si: make sure mc ucode is loaded before checking the size
author
Alex Deucher
<alexdeucher@gmail.com>
Wed, 16 Apr 2014 13:42:22 +0000
(09:42 -0400)
committer
Christian König
<christian.koenig@amd.com>
Thu, 17 Apr 2014 12:14:41 +0000
(14:14 +0200)
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
drivers/gpu/drm/radeon/si.c
patch
|
blob
|
history
diff --git
a/drivers/gpu/drm/radeon/si.c
b/drivers/gpu/drm/radeon/si.c
index 86f8c9c87f5cf951a14c89207238466c94efb556..ac708e006180d3467cfe0478c2484eeb64a2df68 100644
(file)
--- a/
drivers/gpu/drm/radeon/si.c
+++ b/
drivers/gpu/drm/radeon/si.c
@@
-1472,11
+1472,13
@@
int si_mc_load_microcode(struct radeon_device *rdev)
const __be32 *fw_data;
u32 running, blackout = 0;
u32 *io_mc_regs;
- int i, regs_size, ucode_size
= rdev->mc_fw->size / 4
;
+ int i, regs_size, ucode_size;
if (!rdev->mc_fw)
return -EINVAL;
+ ucode_size = rdev->mc_fw->size / 4;
+
switch (rdev->family) {
case CHIP_TAHITI:
io_mc_regs = (u32 *)&tahiti_io_mc_regs;