[PATCH 1/2] drm/radeon/si: make sure mc ucode is loaded before checking the size

[Christian König]

Added both patches to my 3.15 queue.

Thanks,
Christian.

Am 16.04.2014 15:42, schrieb Alex Deucher:
> Avoid a possible segfault.
>
> Noticed-by: Dan Carpenter <dan.carpenter at oracle.com>
> Signed-off-by: Alex Deucher <alexander.deucher at amd.com>
> Cc: stable at vger.kernel.org
> ---
>   drivers/gpu/drm/radeon/si.c | 4 +++-
>   1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/radeon/si.c b/drivers/gpu/drm/radeon/si.c
> index 86f8c9c..ac708e0 100644
> --- 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;