gma500: do a pass over the FIXME tags

[mv-sheeva.git] / drivers / staging / gma500 / psb_drv.c

diff --git a/drivers/staging/gma500/psb_drv.c b/drivers/staging/gma500/psb_drv.c
index b2cdce7b97ef5529205e05a44317840281665ffc..34cf24a1731c1ef0de5b91ce976195b74fd823b7 100644 (file)
--- a/drivers/staging/gma500/psb_drv.c
+++ b/drivers/staging/gma500/psb_drv.c
@@ -183,7 +183,6 @@ static void psb_lastclose(struct drm_device *dev)
 
 static void psb_do_takedown(struct drm_device *dev)
 {
-       /* FIXME: do we need to clean up the gtt here ? */
 }
 
 static int psb_do_init(struct drm_device *dev)
@@ -329,6 +328,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);
@@ -410,7 +414,7 @@ static int psb_driver_load(struct drm_device *dev, unsigned long chipset)
        PSB_WVDC32(0x00000000, PSB_INT_ENABLE_R);
        PSB_WVDC32(0xFFFFFFFF, PSB_INT_MASK_R);
        spin_unlock_irqrestore(&dev_priv->irqmask_lock, irqflags);
-       if (drm_core_check_feature(dev, DRIVER_MODESET))
+       if (IS_PSB(dev) && drm_core_check_feature(dev, DRIVER_MODESET))
                drm_irq_install(dev);
 
        dev->vblank_disable_allowed = 1;
@@ -1207,9 +1211,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);
 }