On Die, 2012-06-12 at 15:33 -0400, alexdeucher@xxxxxxxxx wrote: > From: Alex Deucher <alexander.deucher@xxxxxxx> > > Fixes possible segfault if the CE ucode is missing. > > Signed-off-by: Alex Deucher <alexander.deucher@xxxxxxx> Reviewed-by: Michel Dänzer <michel.daenzer@xxxxxxx> > Cc: stable@xxxxxxxxxxxxxxx > --- > 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); -- Earthling Michel Dänzer | http://www.amd.com Libre software enthusiast | Debian, X and DRI developer _______________________________________________ dri-devel mailing list dri-devel@xxxxxxxxxxxxxxxxxxxxx http://lists.freedesktop.org/mailman/listinfo/dri-devel
