Skip to content

Commit

Permalink
gma500: clean up some more checks
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Alan Cox authored and Dave Airlie committed May 11, 2012
1 parent 9aa65a2 commit 9c0b6fc
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 7 deletions.
3 changes: 3 additions & 0 deletions drivers/gpu/drm/gma500/cdv_device.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
2 changes: 2 additions & 0 deletions drivers/gpu/drm/gma500/mdfld_device.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand Down
3 changes: 3 additions & 0 deletions drivers/gpu/drm/gma500/oaktrail_device.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
5 changes: 0 additions & 5 deletions drivers/gpu/drm/gma500/psb_drv.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
3 changes: 1 addition & 2 deletions drivers/gpu/drm/gma500/psb_intel_sdvo.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
*/
}

Expand Down

0 comments on commit 9c0b6fc

Please sign in to comment.