diff options
author | Alex Deucher <alexdeucher@gmail.com> | 2010-08-12 18:05:34 -0400 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2010-08-20 08:49:37 +1000 |
commit | da7be684c55dbaeebfc1a048d5faf52d52cb3c1f (patch) | |
tree | 1731e3e339952b775cc9efe09bb1e62aced56b21 /drivers/gpu | |
parent | e57415d85f72e36029b75fdb556c95fb5346b692 (diff) | |
download | op-kernel-dev-da7be684c55dbaeebfc1a048d5faf52d52cb3c1f.zip op-kernel-dev-da7be684c55dbaeebfc1a048d5faf52d52cb3c1f.tar.gz |
drm/radeon/kms: don't enable MSIs on AGP boards
Fixes:
https://bugs.freedesktop.org/show_bug.cgi?id=29327
Signed-off-by: Alex Deucher <alexdeucher@gmail.com>
Cc: stable@kernel.org
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu')
-rw-r--r-- | drivers/gpu/drm/radeon/radeon_irq_kms.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/gpu/drm/radeon/radeon_irq_kms.c b/drivers/gpu/drm/radeon/radeon_irq_kms.c index 059bfa4..a108c7e 100644 --- a/drivers/gpu/drm/radeon/radeon_irq_kms.c +++ b/drivers/gpu/drm/radeon/radeon_irq_kms.c @@ -121,11 +121,12 @@ int radeon_irq_kms_init(struct radeon_device *rdev) * chips. Disable MSI on them for now. */ if ((rdev->family >= CHIP_RV380) && - (!(rdev->flags & RADEON_IS_IGP))) { + (!(rdev->flags & RADEON_IS_IGP)) && + (!(rdev->flags & RADEON_IS_AGP))) { int ret = pci_enable_msi(rdev->pdev); if (!ret) { rdev->msi_enabled = 1; - DRM_INFO("radeon: using MSI.\n"); + dev_info(rdev->dev, "radeon: using MSI.\n"); } } rdev->irq.installed = true; |