svn commit: r189051 - head/sys/dev/drm
Robert Noland
rnoland at FreeBSD.org
Wed Feb 25 10:50:36 PST 2009
Author: rnoland
Date: Wed Feb 25 18:50:35 2009
New Revision: 189051
URL: http://svn.freebsd.org/changeset/base/189051
Log:
Prepare the radeon driver for MSI support.
MFC after: 2 weeks
Modified:
head/sys/dev/drm/radeon_irq.c
Modified: head/sys/dev/drm/radeon_irq.c
==============================================================================
--- head/sys/dev/drm/radeon_irq.c Wed Feb 25 18:48:33 2009 (r189050)
+++ head/sys/dev/drm/radeon_irq.c Wed Feb 25 18:50:35 2009 (r189051)
@@ -192,6 +192,7 @@ irqreturn_t radeon_driver_irq_handler(DR
(drm_radeon_private_t *) dev->dev_private;
u32 stat;
u32 r500_disp_int;
+ u32 tmp;
/* Only consider the bits we're interested in - others could be used
* outside the DRM
@@ -218,6 +219,33 @@ irqreturn_t radeon_driver_irq_handler(DR
if (stat & RADEON_CRTC2_VBLANK_STAT)
drm_handle_vblank(dev, 1);
}
+ if (dev->msi_enabled) {
+ switch(dev_priv->flags & RADEON_FAMILY_MASK) {
+ case CHIP_RS400:
+ case CHIP_RS480:
+ tmp = RADEON_READ(RADEON_AIC_CNTL) &
+ ~RS400_MSI_REARM;
+ RADEON_WRITE(RADEON_AIC_CNTL, tmp);
+ RADEON_WRITE(RADEON_AIC_CNTL,
+ tmp | RS400_MSI_REARM);
+ break;
+ case CHIP_RS690:
+ case CHIP_RS740:
+ tmp = RADEON_READ(RADEON_BUS_CNTL) &
+ ~RS600_MSI_REARM;
+ RADEON_WRITE(RADEON_BUS_CNTL, tmp);
+ RADEON_WRITE(RADEON_BUS_CNTL, tmp |
+ RS600_MSI_REARM);
+ break;
+ default:
+ tmp = RADEON_READ(RADEON_MSI_REARM_EN) &
+ ~RV370_MSI_REARM_EN;
+ RADEON_WRITE(RADEON_MSI_REARM_EN, tmp);
+ RADEON_WRITE(RADEON_MSI_REARM_EN,
+ tmp | RV370_MSI_REARM_EN);
+ break;
+ }
+ }
return IRQ_HANDLED;
}
More information about the svn-src-all
mailing list