Date: Wed, 12 Feb 2014 13:55:30 +0000 (UTC) From: Robert Millan <rmh@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r261798 - stable/10/sys/dev/drm2/radeon Message-ID: <201402121355.s1CDtUBA013686@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: rmh Date: Wed Feb 12 13:55:30 2014 New Revision: 261798 URL: http://svnweb.freebsd.org/changeset/base/261798 Log: MFC r261497: 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 Modified: stable/10/sys/dev/drm2/radeon/r600.c stable/10/sys/dev/drm2/radeon/rv770.c Directory Properties: stable/10/ (props changed) Modified: stable/10/sys/dev/drm2/radeon/r600.c ============================================================================== --- stable/10/sys/dev/drm2/radeon/r600.c Wed Feb 12 09:59:48 2014 (r261797) +++ stable/10/sys/dev/drm2/radeon/r600.c Wed Feb 12 13:55:30 2014 (r261798) @@ -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: stable/10/sys/dev/drm2/radeon/rv770.c ============================================================================== --- stable/10/sys/dev/drm2/radeon/rv770.c Wed Feb 12 09:59:48 2014 (r261797) +++ stable/10/sys/dev/drm2/radeon/rv770.c Wed Feb 12 13:55:30 2014 (r261798) @@ -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; }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201402121355.s1CDtUBA013686>