drm/radeon/kms: Add support for interrupts on r6xx/r7xx chips (v3)

[deliverable/linux.git] / drivers / gpu / drm / radeon / radeon_irq_kms.c

diff --git a/drivers/gpu/drm/radeon/radeon_irq_kms.c b/drivers/gpu/drm/radeon/radeon_irq_kms.c
index a0fe6232dcb6fc8b9ab803ce4b5b7111fae435de..84f8a6fb0da30e1e02408daea422f674d966e47c 100644 (file)
--- a/drivers/gpu/drm/radeon/radeon_irq_kms.c
+++ b/drivers/gpu/drm/radeon/radeon_irq_kms.c
@@ -94,10 +94,18 @@ int radeon_irq_kms_init(struct radeon_device *rdev)
        }
        /* enable msi */
        rdev->msi_enabled = 0;
-       if (rdev->family >= CHIP_RV380) {
+       /* MSIs don't seem to work on my rs780;
+        * not sure about rs880 or other rs780s.
+        * Needs more investigation.
+        */
+       if ((rdev->family >= CHIP_RV380) &&
+           (rdev->family != CHIP_RS780) &&
+           (rdev->family != CHIP_RS880)) {
                int ret = pci_enable_msi(rdev->pdev);
-               if (!ret)
+               if (!ret) {
                        rdev->msi_enabled = 1;
+                       DRM_INFO("radeon: using MSI.\n");
+               }
        }
        drm_irq_install(rdev->ddev);
        rdev->irq.installed = true;