From patchwork Mon Nov 22 22:56:31 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Deucher X-Patchwork-Id: 348451 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 oAMNHFOb001407 for ; Mon, 22 Nov 2010 23:20:36 GMT Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id CE41AA15FC for ; Mon, 22 Nov 2010 15:11:30 -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 DC76D9F3A3 for ; Mon, 22 Nov 2010 14:57:31 -0800 (PST) Received: by mail-vw0-f49.google.com with SMTP id 1so3779545vws.36 for ; Mon, 22 Nov 2010 14:57:31 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:from:to:cc:subject:date :message-id:x-mailer:in-reply-to:references; bh=uRTvAN//B4VoNjzQiCihfWa4/Bugi34wD/dGRXypCNI=; b=drvveVAbWOz2lucfGShEynZnXo+a8tQlKen+Oin3vLy4ZpIBEqt+R+8nwi+mgg23Z+ fi+zTmiAJRFBoSuBzBLP4d8IJPhwC59X119aGiyLSj2nlaUVhTCCe0PkQKGesrHRG1GA NRIR30oy/xHC0fytUbLBv/TzraoJUR+xdkuEw= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; b=UfzvR29bxAkyu533+bIgBsACAZJFU0U7I7FwFXomQu/wEKInEBSL1CWQxSx1YCbQoX uYl1/ewYEwrJkx2CPAnLEsv0gVS06bCIdLTJGxQhBB9XXlznqB0h35GTjuyAM/kJB61o EhTkB3Xo6SfQgNjYDKOmuPwlLbf52tPA53vFI= Received: by 10.220.188.135 with SMTP id da7mr1780621vcb.2.1290466633787; Mon, 22 Nov 2010 14:57:13 -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 j7sm1158369vcr.15.2010.11.22.14.57.12 (version=SSLv3 cipher=RC4-MD5); Mon, 22 Nov 2010 14:57:13 -0800 (PST) From: Alex Deucher To: airlied@gmail.com, dri-devel@lists.freedesktop.org Subject: [PATCH 14/20] drm/radeon/kms: add Ontario APU ucode loading support Date: Mon, 22 Nov 2010 17:56:31 -0500 Message-Id: <1290466597-30596-14-git-send-email-alexdeucher@gmail.com> X-Mailer: git-send-email 1.7.1.1 In-Reply-To: <1290466597-30596-1-git-send-email-alexdeucher@gmail.com> References: <1290466597-30596-1-git-send-email-alexdeucher@gmail.com> 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.3 (demeter1.kernel.org [140.211.167.41]); Mon, 22 Nov 2010 23:20:47 +0000 (UTC) diff --git a/drivers/gpu/drm/radeon/r600.c b/drivers/gpu/drm/radeon/r600.c index 93b1c68..b37361b 100644 --- a/drivers/gpu/drm/radeon/r600.c +++ b/drivers/gpu/drm/radeon/r600.c @@ -83,6 +83,9 @@ MODULE_FIRMWARE("radeon/JUNIPER_rlc.bin"); MODULE_FIRMWARE("radeon/CYPRESS_pfp.bin"); MODULE_FIRMWARE("radeon/CYPRESS_me.bin"); MODULE_FIRMWARE("radeon/CYPRESS_rlc.bin"); +MODULE_FIRMWARE("radeon/PALM_pfp.bin"); +MODULE_FIRMWARE("radeon/PALM_me.bin"); +MODULE_FIRMWARE("radeon/SUMO_rlc.bin"); int r600_debugfs_mc_info_init(struct radeon_device *rdev); @@ -1998,6 +2001,10 @@ int r600_init_microcode(struct radeon_device *rdev) chip_name = "CYPRESS"; rlc_chip_name = "CYPRESS"; break; + case CHIP_PALM: + chip_name = "PALM"; + rlc_chip_name = "SUMO"; + break; default: BUG(); }