From owner-svn-src-stable-10@FreeBSD.ORG Wed Feb 12 13:55:31 2014 Return-Path: Delivered-To: svn-src-stable-10@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 12E8FA00; Wed, 12 Feb 2014 13:55:31 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id F208C1510; Wed, 12 Feb 2014 13:55:30 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s1CDtUit013688; Wed, 12 Feb 2014 13:55:30 GMT (envelope-from rmh@svn.freebsd.org) Received: (from rmh@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s1CDtUBA013686; Wed, 12 Feb 2014 13:55:30 GMT (envelope-from rmh@svn.freebsd.org) Message-Id: <201402121355.s1CDtUBA013686@svn.freebsd.org> From: Robert Millan Date: Wed, 12 Feb 2014 13:55:30 +0000 (UTC) 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 X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-10@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for only the 10-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 12 Feb 2014 13:55:31 -0000 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; }