Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9c0b6fcd authored by Alan Cox's avatar Alan Cox Committed by Dave Airlie
Browse files

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: default avatarAlan Cox <alan@linux.intel.com>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent 9aa65a2b

drivers/gpu/drm/gma500/cdv_device.c

+3 −0
Original line number Original line Diff line number Diff line
@@ -543,6 +543,9 @@ static int cdv_chip_setup(struct drm_device *dev) 
{

{

	struct drm_psb_private *dev_priv = dev->dev_private;

	struct drm_psb_private *dev_priv = dev->dev_private;

	INIT_WORK(&dev_priv->hotplug_work, cdv_hotplug_work_func);

	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;

	dev_priv->regmap = cdv_regmap;

	cdv_get_core_freq(dev);

	cdv_get_core_freq(dev);

	psb_intel_opregion_init(dev);

	psb_intel_opregion_init(dev);

drivers/gpu/drm/gma500/mdfld_device.c

+2 −0
Original line number Original line Diff line number Diff line
@@ -518,6 +518,8 @@ static const struct psb_offset mdfld_regmap[3] = { 
static int mdfld_chip_setup(struct drm_device *dev)

static int mdfld_chip_setup(struct drm_device *dev)

{

{

	struct drm_psb_private *dev_priv = dev->dev_private;

	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;

	dev_priv->regmap = mdfld_regmap;

	return mid_chip_setup(dev);

	return mid_chip_setup(dev);

}

}

drivers/gpu/drm/gma500/oaktrail_device.c

+3 −0
Original line number Original line Diff line number Diff line
@@ -511,6 +511,9 @@ static int oaktrail_chip_setup(struct drm_device *dev) 
	struct drm_psb_private *dev_priv = dev->dev_private;

	struct drm_psb_private *dev_priv = dev->dev_private;

	int ret;

	int ret;

	

	

	if (pci_enable_msi(dev->pdev))

		dev_warn(dev->dev, "Enabling MSI failed!\n");



	dev_priv->regmap = oaktrail_regmap;

	dev_priv->regmap = oaktrail_regmap;





	ret = mid_chip_setup(dev);

	ret = mid_chip_setup(dev);

drivers/gpu/drm/gma500/psb_drv.c

+0 −5
Original line number Original line Diff line number Diff line
@@ -280,11 +280,6 @@ static int psb_driver_load(struct drm_device *dev, unsigned long chipset) 




	pci_set_master(dev->pdev);

	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;

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

drivers/gpu/drm/gma500/psb_intel_sdvo.c

+1 −2
Original line number Original line Diff line number Diff line
@@ -2038,7 +2038,6 @@ psb_intel_sdvo_add_hdmi_properties(struct psb_intel_sdvo_connector *connector) 
	struct drm_device *dev = connector->base.base.dev;

	struct drm_device *dev = connector->base.base.dev;





	intel_attach_force_audio_property(&connector->base.base);

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

	*/

	*/

}

}