diff options
author | Patrik Jakobsson <patrik.r.jakobsson@gmail.com> | 2011-11-29 17:20:20 -0500 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2011-12-06 04:55:30 -0500 |
commit | 84b08fe62c9e8c066a29d6d6f656e409a2a86b27 (patch) | |
tree | 5852e4db7b5b16315ca3d12ba907201f6495b9ef | |
parent | e036ba5914df8a6c2ce665ba4631fe1f17f4cc2b (diff) |
gma500: Don't enable MSI on Poulsbo
Chipset reports MSI capabilities for Poulsbo even though it isn't really there.
Signed-off-by: Patrik Jakobsson <patrik.r.jakobsson@gmail.com>
Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
-rw-r--r-- | drivers/gpu/drm/gma500/psb_drv.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/gpu/drm/gma500/psb_drv.c b/drivers/gpu/drm/gma500/psb_drv.c index bcf420a163d4..f6d5f3ce755d 100644 --- a/drivers/gpu/drm/gma500/psb_drv.c +++ b/drivers/gpu/drm/gma500/psb_drv.c | |||
@@ -287,6 +287,11 @@ static int psb_driver_load(struct drm_device *dev, unsigned long chipset) | |||
287 | dev_priv->dev = dev; | 287 | dev_priv->dev = dev; |
288 | dev->dev_private = (void *) dev_priv; | 288 | dev->dev_private = (void *) dev_priv; |
289 | 289 | ||
290 | if (!IS_PSB(dev)) { | ||
291 | if (pci_enable_msi(dev->pdev)) | ||
292 | dev_warn(dev->dev, "Enabling MSI failed!\n"); | ||
293 | } | ||
294 | |||
290 | dev_priv->num_pipe = dev_priv->ops->pipes; | 295 | dev_priv->num_pipe = dev_priv->ops->pipes; |
291 | 296 | ||
292 | resource_start = pci_resource_start(dev->pdev, PSB_MMIO_RESOURCE); | 297 | resource_start = pci_resource_start(dev->pdev, PSB_MMIO_RESOURCE); |
@@ -683,9 +688,6 @@ static struct pci_driver psb_pci_driver = { | |||
683 | 688 | ||
684 | static int psb_probe(struct pci_dev *pdev, const struct pci_device_id *ent) | 689 | static int psb_probe(struct pci_dev *pdev, const struct pci_device_id *ent) |
685 | { | 690 | { |
686 | /* MLD Added this from Inaky's patch */ | ||
687 | if (pci_enable_msi(pdev)) | ||
688 | dev_warn(&pdev->dev, "Enable MSI failed!\n"); | ||
689 | return drm_get_pci_dev(pdev, ent, &driver); | 691 | return drm_get_pci_dev(pdev, ent, &driver); |
690 | } | 692 | } |
691 | 693 | ||