Commit 84b08fe6 authored by Patrik Jakobsson's avatar Patrik Jakobsson Committed by Dave Airlie

gma500: Don't enable MSI on Poulsbo

Chipset reports MSI capabilities for Poulsbo even though it isn't really there.
Signed-off-by: default avatarPatrik Jakobsson <patrik.r.jakobsson@gmail.com>
Signed-off-by: default avatarAlan Cox <alan@linux.intel.com>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent e036ba59
...@@ -287,6 +287,11 @@ static int psb_driver_load(struct drm_device *dev, unsigned long chipset) ...@@ -287,6 +287,11 @@ static int psb_driver_load(struct drm_device *dev, unsigned long chipset)
dev_priv->dev = dev; dev_priv->dev = dev;
dev->dev_private = (void *) dev_priv; dev->dev_private = (void *) dev_priv;
if (!IS_PSB(dev)) {
if (pci_enable_msi(dev->pdev))
dev_warn(dev->dev, "Enabling MSI failed!\n");
}
dev_priv->num_pipe = dev_priv->ops->pipes; dev_priv->num_pipe = dev_priv->ops->pipes;
resource_start = pci_resource_start(dev->pdev, PSB_MMIO_RESOURCE); resource_start = pci_resource_start(dev->pdev, PSB_MMIO_RESOURCE);
...@@ -683,9 +688,6 @@ static struct pci_driver psb_pci_driver = { ...@@ -683,9 +688,6 @@ static struct pci_driver psb_pci_driver = {
static int psb_probe(struct pci_dev *pdev, const struct pci_device_id *ent) static int psb_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
{ {
/* MLD Added this from Inaky's patch */
if (pci_enable_msi(pdev))
dev_warn(&pdev->dev, "Enable MSI failed!\n");
return drm_get_pci_dev(pdev, ent, &driver); return drm_get_pci_dev(pdev, ent, &driver);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment