From patchwork Wed Feb 2 17:53:19 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Deucher X-Patchwork-Id: 527381 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id p12KO3WJ016324 for ; Wed, 2 Feb 2011 20:24:25 GMT Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 1D4389E95A for ; Wed, 2 Feb 2011 09:54:10 -0800 (PST) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-vw0-f49.google.com (mail-vw0-f49.google.com [209.85.212.49]) by gabe.freedesktop.org (Postfix) with ESMTP id 3D4FA9E83E for ; Wed, 2 Feb 2011 09:53:33 -0800 (PST) Received: by vws5 with SMTP id 5so117716vws.36 for ; Wed, 02 Feb 2011 09:53:32 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:from:to:cc:subject:date:message-id:x-mailer; bh=RoPOMn0Dpm7YQAXWIGogVQb2Qgvtm/o8UZhSH1bDR8M=; b=I45n0W9m7Asw3OoAz5F0pJ3d3SSB7+whorT4jNpFn+hc6ifKUOYhCDY3hyI2fww68T +LRPoZIxYD8Q96w2Gt72ltVCSMMyUxkO+y2n2cR0mu/pnC3tscp+8CYFZOO4inaJh6bS tD1w5bSmtc1iUjH7oNvMVGclplF24ywBSe78U= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer; b=fExioM6+8LddSys2+96QBsqOEjn1WKwga8I9f7d8ap0THyWXlCKvwG3B46sWprm2B+ oUx2k0UUTk8XHfRFmFCAwpPEXuzzeUfTk4bj3BXmGldQi2heAf6Zldtjvs1AWisHKuP6 HBkVd0PtNFT5dTAIStKOuk4+VACFfDri1sPsQ= Received: by 10.220.75.20 with SMTP id w20mr2546404vcj.34.1296669211614; Wed, 02 Feb 2011 09:53:31 -0800 (PST) Received: from localhost.localdomain (static-74-96-105-7.washdc.fios.verizon.net [74.96.105.7]) by mx.google.com with ESMTPS id s6sm5503002vch.23.2011.02.02.09.53.30 (version=SSLv3 cipher=RC4-MD5); Wed, 02 Feb 2011 09:53:31 -0800 (PST) From: Alex Deucher To: airlied@gmail.com, dri-devel@lists.freedesktop.org Subject: [PATCH] drm/radeon/kms/NI: don't load if MC ucode is not available Date: Wed, 2 Feb 2011 12:53:19 -0500 Message-Id: <1296669199-1359-1-git-send-email-alexdeucher@gmail.com> X-Mailer: git-send-email 1.7.1.1 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.11 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: dri-devel-bounces+patchwork-dri-devel=patchwork.kernel.org@lists.freedesktop.org Errors-To: dri-devel-bounces+patchwork-dri-devel=patchwork.kernel.org@lists.freedesktop.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Wed, 02 Feb 2011 20:25:30 +0000 (UTC) diff --git a/drivers/gpu/drm/radeon/evergreen.c b/drivers/gpu/drm/radeon/evergreen.c index d404522..993a7cd 100644 --- a/drivers/gpu/drm/radeon/evergreen.c +++ b/drivers/gpu/drm/radeon/evergreen.c @@ -3132,6 +3132,18 @@ int evergreen_init(struct radeon_device *rdev) rdev->accel_working = false; } } + + /* Don't start up if the MC ucode is missing. + * The default clocks and voltages before the MC ucode + * is loaded are not suffient for advanced operations. + */ + if (ASIC_IS_DCE5(rdev)) { + if (!rdev->mc_fw) { + DRM_ERROR("radeon: MC ucode required for NI+.\n"); + return -EINVAL; + } + } + return 0; }