diff options
| author | Alex Deucher <alexdeucher@gmail.com> | 2009-10-16 12:21:24 -0400 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2009-10-26 13:28:23 +1000 |
| commit | 3e5cb98dfe87cc61d0a1119dd8aa2b1e4cfab424 (patch) | |
| tree | d2ce9174cf1257cce348da291c67de9d67d2a69c /drivers/gpu/drm/radeon/r100.c | |
| parent | ebbe1cb936dfc96d809ccf4d64a9755f8ba0c0ff (diff) | |
| download | lwn-3e5cb98dfe87cc61d0a1119dd8aa2b1e4cfab424.tar.gz lwn-3e5cb98dfe87cc61d0a1119dd8aa2b1e4cfab424.zip | |
drm/radeon/kms: add support for msi
Try to enable msi on chips that support it.
Signed-off-by: Alex Deucher <alexdeucher@gmail.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/radeon/r100.c')
| -rw-r--r-- | drivers/gpu/drm/radeon/r100.c | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/drivers/gpu/drm/radeon/r100.c b/drivers/gpu/drm/radeon/r100.c index ed5e983d21e9..b438b520ee7f 100644 --- a/drivers/gpu/drm/radeon/r100.c +++ b/drivers/gpu/drm/radeon/r100.c @@ -186,7 +186,7 @@ static inline uint32_t r100_irq_ack(struct radeon_device *rdev) int r100_irq_process(struct radeon_device *rdev) { - uint32_t status; + uint32_t status, msi_rearm; status = r100_irq_ack(rdev); if (!status) { @@ -209,6 +209,21 @@ int r100_irq_process(struct radeon_device *rdev) } status = r100_irq_ack(rdev); } + if (rdev->msi_enabled) { + switch (rdev->family) { + case CHIP_RS400: + case CHIP_RS480: + msi_rearm = RREG32(RADEON_AIC_CNTL) & ~RS400_MSI_REARM; + WREG32(RADEON_AIC_CNTL, msi_rearm); + WREG32(RADEON_AIC_CNTL, msi_rearm | RS400_MSI_REARM); + break; + default: + msi_rearm = RREG32(RADEON_MSI_REARM_EN) & ~RV370_MSI_REARM_EN; + WREG32(RADEON_MSI_REARM_EN, msi_rearm); + WREG32(RADEON_MSI_REARM_EN, msi_rearm | RV370_MSI_REARM_EN); + break; + } + } return IRQ_HANDLED; } |