gma500: clean up some more checks

We don't need to check these - they are always going to be the
same for any PVR based device.

Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>

5 files changed, 9 insertions, 7 deletions

diff --git a/drivers/gpu/drm/gma500/cdv_device.c b/drivers/gpu/drm/gma500/cdv_device.c
index d94a9e6fa6a3..8e393303f53a 100644
--- a/drivers/gpu/drm/gma500/cdv_device.c
+++ b/drivers/gpu/drm/gma500/cdv_device.c
@@ -543,6 +543,9 @@ static int cdv_chip_setup(struct drm_device *dev)
 {
         struct drm_psb_private *dev_priv = dev->dev_private;
         INIT_WORK(&dev_priv->hotplug_work, cdv_hotplug_work_func);
+
+        if (pci_enable_msi(dev->pdev))
+                dev_warn(dev->dev, "Enabling MSI failed!\n");
         dev_priv->regmap = cdv_regmap;
         cdv_get_core_freq(dev);
         psb_intel_opregion_init(dev);
diff --git a/drivers/gpu/drm/gma500/mdfld_device.c b/drivers/gpu/drm/gma500/mdfld_device.c
index 393a0e15d5de..2d8e741e06d7 100644
--- a/drivers/gpu/drm/gma500/mdfld_device.c
+++ b/drivers/gpu/drm/gma500/mdfld_device.c
@@ -518,6 +518,8 @@ static const struct psb_offset mdfld_regmap[3] = {
 static int mdfld_chip_setup(struct drm_device *dev)
 {
         struct drm_psb_private *dev_priv = dev->dev_private;
+        if (pci_enable_msi(dev->pdev))
+                dev_warn(dev->dev, "Enabling MSI failed!\n");
         dev_priv->regmap = mdfld_regmap;
         return mid_chip_setup(dev);
 }
diff --git a/drivers/gpu/drm/gma500/oaktrail_device.c b/drivers/gpu/drm/gma500/oaktrail_device.c
index a8eb8014871f..7a8ff8e2dfc0 100644
--- a/drivers/gpu/drm/gma500/oaktrail_device.c
+++ b/drivers/gpu/drm/gma500/oaktrail_device.c
@@ -511,6 +511,9 @@ static int oaktrail_chip_setup(struct drm_device *dev)
         struct drm_psb_private *dev_priv = dev->dev_private;
         int ret;
         
+        if (pci_enable_msi(dev->pdev))
+                dev_warn(dev->dev, "Enabling MSI failed!\n");
+
         dev_priv->regmap = oaktrail_regmap;
 
         ret = mid_chip_setup(dev);
diff --git a/drivers/gpu/drm/gma500/psb_drv.c b/drivers/gpu/drm/gma500/psb_drv.c
index 1680a543cc6f..2bfbeb6c05dd 100644
--- a/drivers/gpu/drm/gma500/psb_drv.c
+++ b/drivers/gpu/drm/gma500/psb_drv.c
@@ -280,11 +280,6 @@ static int psb_driver_load(struct drm_device *dev, unsigned long chipset)
 
         pci_set_master(dev->pdev);
 
-        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);
diff --git a/drivers/gpu/drm/gma500/psb_intel_sdvo.c b/drivers/gpu/drm/gma500/psb_intel_sdvo.c
index 958b4e2d4aed..d39b15be7649 100644
--- a/drivers/gpu/drm/gma500/psb_intel_sdvo.c
+++ b/drivers/gpu/drm/gma500/psb_intel_sdvo.c
@@ -2038,8 +2038,7 @@ psb_intel_sdvo_add_hdmi_properties(struct psb_intel_sdvo_connector *connector)
         struct drm_device *dev = connector->base.base.dev;
 
         intel_attach_force_audio_property(&connector->base.base);
-        if (INTEL_INFO(dev)->gen >= 4 && IS_MOBILE(dev))
-                intel_attach_broadcast_rgb_property(&connector->base.base);
+        intel_attach_broadcast_rgb_property(&connector->base.base);
         */
 }