From patchwork Fri Jan 7 02:19:34 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Deucher X-Patchwork-Id: 462211 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 p072a8Sm018049 for ; Fri, 7 Jan 2011 02:36:29 GMT Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 794369EB55 for ; Thu, 6 Jan 2011 18:36:08 -0800 (PST) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-qy0-f177.google.com (mail-qy0-f177.google.com [209.85.216.177]) by gabe.freedesktop.org (Postfix) with ESMTP id 662919E908 for ; Thu, 6 Jan 2011 18:20:26 -0800 (PST) Received: by mail-qy0-f177.google.com with SMTP id 27so19874417qyk.15 for ; Thu, 06 Jan 2011 18:20:26 -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=RcRHgmE31fn86Yk1AEf56XdR+FvSFU2+Yi8wvhYnUbI=; b=qQtjtAFPI55YYmk1pnmCWwo8++ujaI1XOsn6Ec8Zkx19RrMTBTr/YA9ve5pjxb8Ggq nueDhpo3aICtE8DIFzPimTFIHQtsfwBAArvdPVEnHZxGXD8Jtb8jmEPWQ+hOEEwmJVOw GZkHO2yjPGkXP98CLFA2s4spG/L+eK/mqlRIU= 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=ofJC5djLP5moT7aGhnxQ4X0avIJRme9qyuQizdLm82MoAnB/OOAMeG/FpyZxeZGkl3 c9rSpG6o+diEPmj1f2mAx0uSqmSDi/cH4KJp3zG4kkXHhukcMhkkLs43SS2gkUes7w3B /DUZ24aBwMq6VpwTLODea49PIXrQdLIXemeLQ= Received: by 10.224.2.200 with SMTP id 8mr23369259qak.203.1294366826231; Thu, 06 Jan 2011 18:20:26 -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 g28sm14822039qck.25.2011.01.06.18.20.24 (version=SSLv3 cipher=RC4-MD5); Thu, 06 Jan 2011 18:20:25 -0800 (PST) From: Alex Deucher To: airlied@gmail.com, dri-devel@lists.freedesktop.org Subject: [PATCH 24/25] drm/radeon/kms: don't enable pcie gen2 on NI yet Date: Thu, 6 Jan 2011 21:19:34 -0500 Message-Id: <1294366775-1605-25-git-send-email-alexdeucher@gmail.com> X-Mailer: git-send-email 1.7.1.1 In-Reply-To: <1294366775-1605-1-git-send-email-alexdeucher@gmail.com> References: <1294366775-1605-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.6 (demeter1.kernel.org [140.211.167.41]); Fri, 07 Jan 2011 02:36:29 +0000 (UTC) diff --git a/drivers/gpu/drm/radeon/evergreen.c b/drivers/gpu/drm/radeon/evergreen.c index 4fb2101..7fe8ebd 100644 --- a/drivers/gpu/drm/radeon/evergreen.c +++ b/drivers/gpu/drm/radeon/evergreen.c @@ -2853,7 +2853,8 @@ static int evergreen_startup(struct radeon_device *rdev) int r; /* enable pcie gen2 link */ - evergreen_pcie_gen2_enable(rdev); + if (!ASIC_IS_DCE5(rdev)) + evergreen_pcie_gen2_enable(rdev); if (ASIC_IS_DCE5(rdev)) { if (!rdev->me_fw || !rdev->pfp_fw || !rdev->rlc_fw || !rdev->mc_fw) {