kern/133554: commit references a PR

[dfilter service]

The following reply was made to PR kern/133554; it has been noted by GNATS.

From: dfilter at FreeBSD.ORG (dfilter service)
To: bug-followup at FreeBSD.org
Cc:  
Subject: Re: kern/133554: commit references a PR
Date: Sun, 19 Apr 2009 16:54:47 +0000 (UTC)

 Author: rnoland
 Date: Sun Apr 19 16:54:33 2009
 New Revision: 191274
 URL: http://svn.freebsd.org/changeset/base/191274
 
 Log:
   Don't try to setup interrupts for drivers that don't support them.
   
   This causes sis and probably a couple of other driver to panic and fail.
   
   Tested by:	cpghost <cpghost at cordula.ws>
   PR:		133554
   MFC after:	3 days
 
 Modified:
   head/sys/dev/drm/drm_drv.c
 
 Modified: head/sys/dev/drm/drm_drv.c
 ==============================================================================
 --- head/sys/dev/drm/drm_drv.c	Sun Apr 19 16:17:13 2009	(r191273)
 +++ head/sys/dev/drm/drm_drv.c	Sun Apr 19 16:54:33 2009	(r191274)
 @@ -134,7 +134,7 @@ static struct cdevsw drm_cdevsw = {
  	.d_flags =	D_TRACKCLOSE
  };
  
 -int drm_msi = 1;	/* Enable by default. */
 +static int drm_msi = 1;	/* Enable by default. */
  TUNABLE_INT("hw.drm.msi", &drm_msi);
  
  static struct drm_msi_blacklist_entry drm_msi_blacklist[] = {
 @@ -228,28 +228,31 @@ int drm_attach(device_t kdev, drm_pci_id
  	dev->pci_vendor = pci_get_vendor(dev->device);
  	dev->pci_device = pci_get_device(dev->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)
 -			msicount = 1;
 +	if (drm_core_check_feature(dev, DRIVER_HAVE_IRQ)) {
 +		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)
 +				msicount = 1;
 +
 +			if (pci_alloc_msi(dev->device, &msicount) == 0) {
 +				DRM_INFO("MSI enabled %d message(s)\n",
 +				    msicount);
 +				dev->msi_enabled = 1;
 +				dev->irqrid = 1;
 +			}
 +		}
  
 -		if (pci_alloc_msi(dev->device, &msicount) == 0) {
 -			DRM_INFO("MSI enabled %d message(s)\n", msicount);
 -			dev->msi_enabled = 1;
 -			dev->irqrid = 1;
 +		dev->irqr = bus_alloc_resource_any(dev->device, SYS_RES_IRQ,
 +		    &dev->irqrid, RF_SHAREABLE);
 +		if (!dev->irqr) {
 +			return ENOENT;
  		}
 -	}
  
 -	dev->irqr = bus_alloc_resource_any(dev->device, SYS_RES_IRQ,
 -	    &dev->irqrid, RF_SHAREABLE);
 -	if (!dev->irqr) {
 -		return ENOENT;
 +		dev->irq = (int) rman_get_start(dev->irqr);
  	}
  
 -	dev->irq = (int) rman_get_start(dev->irqr);
 -
  	mtx_init(&dev->dev_lock, "drmdev", NULL, MTX_DEF);
  	mtx_init(&dev->irq_lock, "drmirq", NULL, MTX_DEF);
  	mtx_init(&dev->vbl_lock, "drmvbl", NULL, MTX_DEF);
 _______________________________________________
 svn-src-all at freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-src-all
 To unsubscribe, send any mail to "svn-src-all-unsubscribe at freebsd.org"