From patchwork Thu Apr  1 01:13:32 2010
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Rafael Wysocki <rjw@sisk.pl>
X-Patchwork-Id: 90041
Received: from vger.kernel.org (vger.kernel.org [209.132.180.67])
	by demeter.kernel.org (8.14.3/8.14.3) with ESMTP id o311An0Y013904
	for <patchwork-pci@patchwork.kernel.org>; Thu, 1 Apr 2010 01:10:49 GMT
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1758329Ab0DABKt (ORCPT
	<rfc822;patchwork-pci@patchwork.kernel.org>);
	Wed, 31 Mar 2010 21:10:49 -0400
Received: from ogre.sisk.pl ([217.79.144.158]:46346 "EHLO ogre.sisk.pl"
	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
	id S1758169Ab0DABKs (ORCPT <rfc822;linux-pci@vger.kernel.org>);
	Wed, 31 Mar 2010 21:10:48 -0400
Received: from localhost (localhost.localdomain [127.0.0.1])
	by ogre.sisk.pl (Postfix) with ESMTP id 1C08017964E;
	Thu,  1 Apr 2010 02:37:28 +0200 (CEST)
Received: from ogre.sisk.pl ([127.0.0.1])
	by localhost (ogre.sisk.pl [127.0.0.1]) (amavisd-new,
	port 10024) with ESMTP
	id 30729-02; Thu,  1 Apr 2010 02:37:20 +0200 (CEST)
Received: from tosh.localnet (220-bem-13.acn.waw.pl [82.210.184.220])
	(using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by ogre.sisk.pl (Postfix) with ESMTP id C194A17D963;
	Thu,  1 Apr 2010 02:37:20 +0200 (CEST)
From: "Rafael J. Wysocki" <rjw@sisk.pl>
To: Linus Torvalds <torvalds@linux-foundation.org>
Subject: Re: [Regression,
	post-rc2] Commit a5ee4eb7541 breaks OpenGL on RS780 (was: Re: Linux
	2.6.34-rc3)
Date: Thu, 1 Apr 2010 03:13:32 +0200
User-Agent: KMail/1.12.4 (Linux/2.6.34-rc3-rjw; KDE/4.3.5; x86_64; ; )
Cc: Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
	Dave Airlie <airlied@gmail.com>, dri-devel@lists.sourceforge.net,
	Jesse Barnes <jbarnes@virtuousgeek.org>,
	Linux PCI <linux-pci@vger.kernel.org>,
	Clemens Ladisch <clemens@ladisch.de>,
	Alex Deucher <alexdeucher@gamil.com>, stable@kernel.org,
	Greg KH <gregkh@suse.de>
References: <alpine.LFD.2.00.1003301029250.3707@i5.linux-foundation.org>
	<201003302316.45651.rjw@sisk.pl>
In-Reply-To: <201003302316.45651.rjw@sisk.pl>
MIME-Version: 1.0
Message-Id: <201004010313.32920.rjw@sisk.pl>
X-Virus-Scanned: amavisd-new at ogre.sisk.pl using MkS_Vir for Linux
Sender: linux-pci-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-pci.vger.kernel.org>
X-Mailing-List: linux-pci@vger.kernel.org
X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by
	milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]);
	Thu, 01 Apr 2010 01:10:49 +0000 (UTC)


Index: linux-2.6/drivers/gpu/drm/radeon/radeon_irq_kms.c
===================================================================
--- linux-2.6.orig/drivers/gpu/drm/radeon/radeon_irq_kms.c
+++ linux-2.6/drivers/gpu/drm/radeon/radeon_irq_kms.c
@@ -116,7 +116,13 @@ int radeon_irq_kms_init(struct radeon_de
 	}
 	/* enable msi */
 	rdev->msi_enabled = 0;
-	if (rdev->family >= CHIP_RV380) {
+       /* MSIs don't seem to work on my rs780;
+        * not sure about rs880 or other rs780s.
+        * Needs more investigation.
+        */
+       if ((rdev->family >= CHIP_RV380) &&
+           (rdev->family != CHIP_RS780) &&
+           (rdev->family != CHIP_RS880)) {
 		int ret = pci_enable_msi(rdev->pdev);
 		if (!ret) {
 			rdev->msi_enabled = 1;