Skip to content

Commit

Permalink
gma500: Don't enable MSI on Poulsbo
Browse files Browse the repository at this point in the history
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: Greg Kroah-Hartman <gregkh@suse.de>
  • Loading branch information
Patrik Jakobsson authored and Greg Kroah-Hartman committed Aug 26, 2011
1 parent ee8cc85 commit 24dd55b
Showing 1 changed file with 5 additions and 3 deletions.
8 changes: 5 additions & 3 deletions drivers/staging/gma500/psb_drv.c
Original file line number Diff line number Diff line change
Expand Up @@ -329,6 +329,11 @@ static int psb_driver_load(struct drm_device *dev, unsigned long chipset)
dev_priv->dev = dev;
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;

resource_start = pci_resource_start(dev->pdev, PSB_MMIO_RESOURCE);
Expand Down Expand Up @@ -1207,9 +1212,6 @@ static struct pci_driver psb_pci_driver = {

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);
}

Expand Down

0 comments on commit 24dd55b

Please sign in to comment.