From owner-svn-src-head@FreeBSD.ORG  Fri Feb 27 23:50:56 2009
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 46C2B1065742;
	Fri, 27 Feb 2009 23:50:56 +0000 (UTC)
	(envelope-from rnoland@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 34A7D8FC1D;
	Fri, 27 Feb 2009 23:50:56 +0000 (UTC)
	(envelope-from rnoland@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n1RNouNW087242;
	Fri, 27 Feb 2009 23:50:56 GMT (envelope-from rnoland@svn.freebsd.org)
Received: (from rnoland@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n1RNouSm087241;
	Fri, 27 Feb 2009 23:50:56 GMT (envelope-from rnoland@svn.freebsd.org)
Message-Id: <200902272350.n1RNouSm087241@svn.freebsd.org>
From: Robert Noland <rnoland@FreeBSD.org>
Date: Fri, 27 Feb 2009 23:50:56 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r189128 - head/sys/dev/drm
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 27 Feb 2009 23:50:56 -0000

Author: rnoland
Date: Fri Feb 27 23:50:55 2009
New Revision: 189128
URL: http://svn.freebsd.org/changeset/base/189128

Log:
  Add a tuneable to allow disabling msi on drm at runtime.
  
  Suggested by:	jhb@
  
  MFC after:	2 weeks

Modified:
  head/sys/dev/drm/drm_drv.c

Modified: head/sys/dev/drm/drm_drv.c
==============================================================================
--- head/sys/dev/drm/drm_drv.c	Fri Feb 27 23:49:26 2009	(r189127)
+++ head/sys/dev/drm/drm_drv.c	Fri Feb 27 23:50:55 2009	(r189128)
@@ -134,6 +134,9 @@ static struct cdevsw drm_cdevsw = {
 	.d_flags =	D_TRACKCLOSE
 };
 
+int drm_msi = 1;	/* Enable by default. */
+TUNABLE_INT("hw.drm.msi", &drm_msi);
+
 static struct drm_msi_blacklist_entry drm_msi_blacklist[] = {
 	{0x8086, 0x2772}, /* Intel i945G	*/ \
 	{0x8086, 0x27A2}, /* Intel i945GM	*/ \
@@ -222,7 +225,8 @@ int drm_attach(device_t nbdev, drm_pci_i
 	dev->pci_vendor = pci_get_vendor(dev->device);
 	dev->pci_device = pci_get_device(dev->device);
 
-	if (!drm_msi_is_blacklisted(dev->pci_vendor, dev->pci_device)) {
+	if (drm_msi &&
+	    !drm_msi_is_blacklisted(dev->pci_vendor, dev->pci_device)) {
 		msicount = pci_msi_count(dev->device);
 		DRM_DEBUG("MSI count = %d\n", msicount);
 		if (msicount > 1)