From edb34ff4bf328c71ed24ca9faa336bfd19dd293e Mon Sep 17 00:00:00 2001 From: Alex Deucher Date: Tue, 30 Mar 2010 17:22:32 -0400 Subject: [PATCH] --- yaml --- r: 189366 b: refs/heads/master c: c414a117c6094c3f86b533f97beaf45ef9075f03 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/radeon/radeon_irq_kms.c | 8 +++----- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 74f2e2115882..beae10722675 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f46c01208da1881591e3f55ca77d37f54469f8e4 +refs/heads/master: c414a117c6094c3f86b533f97beaf45ef9075f03 diff --git a/trunk/drivers/gpu/drm/radeon/radeon_irq_kms.c b/trunk/drivers/gpu/drm/radeon/radeon_irq_kms.c index 68519b406ca6..a212041e8b0b 100644 --- a/trunk/drivers/gpu/drm/radeon/radeon_irq_kms.c +++ b/trunk/drivers/gpu/drm/radeon/radeon_irq_kms.c @@ -114,13 +114,11 @@ int radeon_irq_kms_init(struct radeon_device *rdev) } /* enable msi */ rdev->msi_enabled = 0; - /* MSIs don't seem to work on my rs780; - * not sure about rs880 or other rs780s. - * Needs more investigation. + /* MSIs don't seem to work reliably on all IGP + * chips. Disable MSI on them for now. */ if ((rdev->family >= CHIP_RV380) && - (rdev->family != CHIP_RS780) && - (rdev->family != CHIP_RS880)) { + (!(rdev->flags & RADEON_IS_IGP))) { int ret = pci_enable_msi(rdev->pdev); if (!ret) { rdev->msi_enabled = 1;