From patchwork Tue Apr 12 17:40:18 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Deucher X-Patchwork-Id: 701471 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 p3CHeYnt002021 for ; Tue, 12 Apr 2011 17:40:55 GMT Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 435EE9EF4F for ; Tue, 12 Apr 2011 10:40:34 -0700 (PDT) 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 710959E885 for ; Tue, 12 Apr 2011 10:40:25 -0700 (PDT) Received: by vws8 with SMTP id 8so6468364vws.36 for ; Tue, 12 Apr 2011 10:40:25 -0700 (PDT) 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=vfg1/eXDBTAoo5MaJpTXH/Xqb7uCaPk0lthaZKvk6BI=; b=HusFLU+unaZdyvnE3lFSP2R1Q5fpKUV7X/x+hfbiM2QtXJFIgIHwx3XOoXdULZE9GG 5STLKj79a2h8F2T86ob7aJV8EpRcMy6btC5qW8KGRW6aNN70E73dLAR8ItU0iFvns8Lx 5OZrx8zbT48lICorBZv3RzKdAvmdgAZ4E+GRo= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer; b=aYUhhsKe9ykNjmJWFrYtkKzRAPfxP5FMDFNpED854P5viC+Yyp8tkxaz/+i6U+cybX Ul/LO0s++tGOGwjuuDR22rrx45xtp1S6h0ZSQbNNKZjC5HYU5uJBW9KIZErj32Eb2KrX jUg+mtaUDfjUGcvmzIkBZnbd4ENrOKFNLn5Wg= Received: by 10.52.174.176 with SMTP id bt16mr1487598vdc.282.1302630024787; Tue, 12 Apr 2011 10:40:24 -0700 (PDT) Received: from localhost.localdomain (static-74-96-105-7.washdc.fios.verizon.net [74.96.105.7]) by mx.google.com with ESMTPS id u4sm1527498vch.12.2011.04.12.10.40.23 (version=SSLv3 cipher=OTHER); Tue, 12 Apr 2011 10:40:24 -0700 (PDT) From: Alex Deucher To: airlied@gmail.com, dri-devel@lists.freedesktop.org Subject: [PATCH] drm/radeon/kms: fix pcie_p callbacks on btc and cayman Date: Tue, 12 Apr 2011 13:40:18 -0400 Message-Id: <1302630018-16777-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]); Tue, 12 Apr 2011 17:40:55 +0000 (UTC) btc and cayman asics use the same callback for pcie port registers. Signed-off-by: Alex Deucher --- drivers/gpu/drm/radeon/radeon_asic.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/drivers/gpu/drm/radeon/radeon_asic.c b/drivers/gpu/drm/radeon/radeon_asic.c index eb888ee..ca57619 100644 --- a/drivers/gpu/drm/radeon/radeon_asic.c +++ b/drivers/gpu/drm/radeon/radeon_asic.c @@ -94,7 +94,7 @@ static void radeon_register_accessor_init(struct radeon_device *rdev) rdev->mc_rreg = &rs600_mc_rreg; rdev->mc_wreg = &rs600_mc_wreg; } - if ((rdev->family >= CHIP_R600) && (rdev->family <= CHIP_HEMLOCK)) { + if (rdev->family >= CHIP_R600) { rdev->pciep_rreg = &r600_pciep_rreg; rdev->pciep_wreg = &r600_pciep_wreg; }