Author: rmh Date: Tue Feb 4 21:23:12 2014 New Revision: 261497 URL: http://svnweb.freebsd.org/changeset/base/261497
Log: Abort when firmware isn't present in R600+ models. More details at: http://anonscm.debian.org/viewvc/kernel/dists/trunk/linux/debian/patches/bugfix/all/radeon-firmware-is-required-for-drm-and-kms-on-r600-onward.patch?revision=20909&view=co Reviewed by: dumbbell MFC after: 1 week Modified: head/sys/dev/drm2/radeon/r600.c head/sys/dev/drm2/radeon/rv770.c Modified: head/sys/dev/drm2/radeon/r600.c ============================================================================== --- head/sys/dev/drm2/radeon/r600.c Tue Feb 4 21:15:15 2014 (r261496) +++ head/sys/dev/drm2/radeon/r600.c Tue Feb 4 21:23:12 2014 (r261497) @@ -3012,6 +3012,12 @@ int r600_init(struct radeon_device *rdev rdev->accel_working = false; } + /* Don't start up if the ucode is missing. */ + if (!rdev->me_fw || !rdev->pfp_fw || !rdev->rlc_fw) { + DRM_ERROR("radeon: ucode required for R600+.\n"); + return -EINVAL; + } + return 0; } Modified: head/sys/dev/drm2/radeon/rv770.c ============================================================================== --- head/sys/dev/drm2/radeon/rv770.c Tue Feb 4 21:15:15 2014 (r261496) +++ head/sys/dev/drm2/radeon/rv770.c Tue Feb 4 21:23:12 2014 (r261497) @@ -1186,6 +1186,12 @@ int rv770_init(struct radeon_device *rde rdev->accel_working = false; } + /* Don't start up if the ucode is missing. */ + if (!rdev->me_fw || !rdev->pfp_fw || !rdev->rlc_fw) { + DRM_ERROR("radeon: ucode required for R600+.\n"); + return -EINVAL; + } + return 0; } _______________________________________________ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
