From patchwork Mon Nov 22 22:56:36 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Deucher X-Patchwork-Id: 348501 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 oAMNL5iS003160 for ; Mon, 22 Nov 2010 23:21:51 GMT Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id AB4D9A16A5 for ; Mon, 22 Nov 2010 15:10:01 -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 F3BFFA1027 for ; Mon, 22 Nov 2010 14:57:20 -0800 (PST) Received: by mail-vw0-f49.google.com with SMTP id 1so3779545vws.36 for ; Mon, 22 Nov 2010 14:57:20 -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=LuFR7uy8+DCVHsa2kDms199B7Eb7EhlHfaAzyRwalck=; b=wH6FVrRLKnh02W4z5n2u8nFp2dzAf9ncc/VrAgCRn4z/8/+7DX5sbHHT1yg7WZd70y VMlsVg86eVJI8x8BW5DXN/QNMk1Hc+HJe+qE0tqOV66v77ISH1YYqNVTX2mv7Uatt9ix urWrcrf7tK76MkhxHcAeGW+h7qp54+3sWP7Sw= 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=sDvCW3t51Nu9Z9XIM1jNA0xtRfbZigjV1RvntJTZHL5hY2HGQs5LRV1COmqLz1R6j5 2bRYMushX7g3u7cQO1scKI4X/vEi3E7m91DDK31hDCd8mQMlJwfxoFdFVakRUFQ/eD7a rs4A3wQ5TDGVMzc+CAMs3GMuQTYHglIcCd3iw= Received: by 10.220.200.204 with SMTP id ex12mr1711299vcb.84.1290466640631; Mon, 22 Nov 2010 14:57:20 -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.19 (version=SSLv3 cipher=RC4-MD5); Mon, 22 Nov 2010 14:57:20 -0800 (PST) From: Alex Deucher To: airlied@gmail.com, dri-devel@lists.freedesktop.org Subject: [PATCH 19/20] drm/radeon/kms: enable MSIs on fusion APUs Date: Mon, 22 Nov 2010 17:56:36 -0500 Message-Id: <1290466597-30596-19-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:22:06 +0000 (UTC) diff --git a/drivers/gpu/drm/radeon/radeon_irq_kms.c b/drivers/gpu/drm/radeon/radeon_irq_kms.c index a108c7e..b492b7d 100644 --- a/drivers/gpu/drm/radeon/radeon_irq_kms.c +++ b/drivers/gpu/drm/radeon/radeon_irq_kms.c @@ -121,7 +121,7 @@ int radeon_irq_kms_init(struct radeon_device *rdev) * chips. Disable MSI on them for now. */ if ((rdev->family >= CHIP_RV380) && - (!(rdev->flags & RADEON_IS_IGP)) && + ((!(rdev->flags & RADEON_IS_IGP)) || (rdev->family >= CHIP_PALM)) && (!(rdev->flags & RADEON_IS_AGP))) { int ret = pci_enable_msi(rdev->pdev); if (!ret) {