1 files changed, 34 insertions, 31 deletions

diff --git a/drivers/gpu/drm/gma500/psb_drv.c b/drivers/gpu/drm/gma500/psb_drv.c
index f14768f2b364..c34adf9d910a 100644
--- a/drivers/gpu/drm/gma500/psb_drv.c
+++ b/drivers/gpu/drm/gma500/psb_drv.c
@@ -60,6 +60,16 @@ static DEFINE_PCI_DEVICE_TABLE(pciidlist) = {
         /* Atom E620 */
         { 0x8086, 0x4108, PCI_ANY_ID, PCI_ANY_ID, 0, 0, (long) &oaktrail_chip_ops},
 #endif
+#if defined(CONFIG_DRM_MEDFIELD)
+        {0x8086, 0x0130, PCI_ANY_ID, PCI_ANY_ID, 0, 0, (long) &mdfld_chip_ops},
+        {0x8086, 0x0131, PCI_ANY_ID, PCI_ANY_ID, 0, 0, (long) &mdfld_chip_ops},
+        {0x8086, 0x0132, PCI_ANY_ID, PCI_ANY_ID, 0, 0, (long) &mdfld_chip_ops},
+        {0x8086, 0x0133, PCI_ANY_ID, PCI_ANY_ID, 0, 0, (long) &mdfld_chip_ops},
+        {0x8086, 0x0134, PCI_ANY_ID, PCI_ANY_ID, 0, 0, (long) &mdfld_chip_ops},
+        {0x8086, 0x0135, PCI_ANY_ID, PCI_ANY_ID, 0, 0, (long) &mdfld_chip_ops},
+        {0x8086, 0x0136, PCI_ANY_ID, PCI_ANY_ID, 0, 0, (long) &mdfld_chip_ops},
+        {0x8086, 0x0137, PCI_ANY_ID, PCI_ANY_ID, 0, 0, (long) &mdfld_chip_ops},
+#endif
 #if defined(CONFIG_DRM_GMA3600)
         { 0x8086, 0x0be0, PCI_ANY_ID, PCI_ANY_ID, 0, 0, (long) &cdv_chip_ops},
         { 0x8086, 0x0be1, PCI_ANY_ID, PCI_ANY_ID, 0, 0, (long) &cdv_chip_ops},
@@ -70,7 +80,7 @@ static DEFINE_PCI_DEVICE_TABLE(pciidlist) = {
         { 0x8086, 0x0be6, PCI_ANY_ID, PCI_ANY_ID, 0, 0, (long) &cdv_chip_ops},
         { 0x8086, 0x0be7, PCI_ANY_ID, PCI_ANY_ID, 0, 0, (long) &cdv_chip_ops},
 #endif
-        { 0, 0, 0}
+        { 0, }
 };
 MODULE_DEVICE_TABLE(pci, pciidlist);
 
@@ -78,27 +88,27 @@ MODULE_DEVICE_TABLE(pci, pciidlist);
  * Standard IOCTLs.
  */
 
-#define DRM_IOCTL_PSB_ADB       \
+#define DRM_IOCTL_GMA_ADB       \
                 DRM_IOWR(DRM_GMA_ADB + DRM_COMMAND_BASE, uint32_t)
-#define DRM_IOCTL_PSB_MODE_OPERATION    \
+#define DRM_IOCTL_GMA_MODE_OPERATION    \
                 DRM_IOWR(DRM_GMA_MODE_OPERATION + DRM_COMMAND_BASE, \
                          struct drm_psb_mode_operation_arg)
-#define DRM_IOCTL_PSB_STOLEN_MEMORY     \
+#define DRM_IOCTL_GMA_STOLEN_MEMORY     \
                 DRM_IOWR(DRM_GMA_STOLEN_MEMORY + DRM_COMMAND_BASE, \
                          struct drm_psb_stolen_memory_arg)
-#define DRM_IOCTL_PSB_GAMMA     \
+#define DRM_IOCTL_GMA_GAMMA     \
                 DRM_IOWR(DRM_GMA_GAMMA + DRM_COMMAND_BASE, \
                          struct drm_psb_dpst_lut_arg)
-#define DRM_IOCTL_PSB_DPST_BL   \
+#define DRM_IOCTL_GMA_DPST_BL   \
                 DRM_IOWR(DRM_GMA_DPST_BL + DRM_COMMAND_BASE, \
                          uint32_t)
-#define DRM_IOCTL_PSB_GET_PIPE_FROM_CRTC_ID     \
+#define DRM_IOCTL_GMA_GET_PIPE_FROM_CRTC_ID     \
                 DRM_IOWR(DRM_GMA_GET_PIPE_FROM_CRTC_ID + DRM_COMMAND_BASE, \
                          struct drm_psb_get_pipe_from_crtc_id_arg)
-#define DRM_IOCTL_PSB_GEM_CREATE        \
+#define DRM_IOCTL_GMA_GEM_CREATE        \
                 DRM_IOWR(DRM_GMA_GEM_CREATE + DRM_COMMAND_BASE, \
                          struct drm_psb_gem_create)
-#define DRM_IOCTL_PSB_GEM_MMAP  \
+#define DRM_IOCTL_GMA_GEM_MMAP  \
                 DRM_IOWR(DRM_GMA_GEM_MMAP + DRM_COMMAND_BASE, \
                          struct drm_psb_gem_mmap)
 
@@ -113,22 +123,19 @@ static int psb_gamma_ioctl(struct drm_device *dev, void *data,
 static int psb_dpst_bl_ioctl(struct drm_device *dev, void *data,
                              struct drm_file *file_priv);
 
-#define PSB_IOCTL_DEF(ioctl, func, flags) \
-        [DRM_IOCTL_NR(ioctl) - DRM_COMMAND_BASE] = {ioctl, flags, func}
-
 static struct drm_ioctl_desc psb_ioctls[] = {
-        PSB_IOCTL_DEF(DRM_IOCTL_PSB_ADB, psb_adb_ioctl, DRM_AUTH),
-        PSB_IOCTL_DEF(DRM_IOCTL_PSB_MODE_OPERATION, psb_mode_operation_ioctl,
+        DRM_IOCTL_DEF_DRV(GMA_ADB, psb_adb_ioctl, DRM_AUTH),
+        DRM_IOCTL_DEF_DRV(GMA_MODE_OPERATION, psb_mode_operation_ioctl,
                       DRM_AUTH),
-        PSB_IOCTL_DEF(DRM_IOCTL_PSB_STOLEN_MEMORY, psb_stolen_memory_ioctl,
+        DRM_IOCTL_DEF_DRV(GMA_STOLEN_MEMORY, psb_stolen_memory_ioctl,
                       DRM_AUTH),
-        PSB_IOCTL_DEF(DRM_IOCTL_PSB_GAMMA, psb_gamma_ioctl, DRM_AUTH),
-        PSB_IOCTL_DEF(DRM_IOCTL_PSB_DPST_BL, psb_dpst_bl_ioctl, DRM_AUTH),
-        PSB_IOCTL_DEF(DRM_IOCTL_PSB_GET_PIPE_FROM_CRTC_ID,
+        DRM_IOCTL_DEF_DRV(GMA_GAMMA, psb_gamma_ioctl, DRM_AUTH),
+        DRM_IOCTL_DEF_DRV(GMA_DPST_BL, psb_dpst_bl_ioctl, DRM_AUTH),
+        DRM_IOCTL_DEF_DRV(GMA_GET_PIPE_FROM_CRTC_ID,
                                         psb_intel_get_pipe_from_crtc_id, 0),
-        PSB_IOCTL_DEF(DRM_IOCTL_PSB_GEM_CREATE, psb_gem_create_ioctl,
+        DRM_IOCTL_DEF_DRV(GMA_GEM_CREATE, psb_gem_create_ioctl,
                                                 DRM_UNLOCKED | DRM_AUTH),
-        PSB_IOCTL_DEF(DRM_IOCTL_PSB_GEM_MMAP, psb_gem_mmap_ioctl,
+        DRM_IOCTL_DEF_DRV(GMA_GEM_MMAP, psb_gem_mmap_ioctl,
                                                 DRM_UNLOCKED | DRM_AUTH),
 };
 
@@ -268,10 +275,8 @@ static int psb_driver_load(struct drm_device *dev, unsigned long chipset)
 {
         struct drm_psb_private *dev_priv;
         unsigned long resource_start;
-        struct psb_gtt *pg;
         unsigned long irqflags;
         int ret = -ENOMEM;
-        uint32_t tt_pages;
         struct drm_connector *connector;
         struct psb_intel_encoder *psb_intel_encoder;
 
@@ -283,6 +288,8 @@ static int psb_driver_load(struct drm_device *dev, unsigned long chipset)
         dev_priv->dev = dev;
         dev->dev_private = (void *) dev_priv;
 
+        pci_set_master(dev->pdev);
+
         if (!IS_PSB(dev)) {
                 if (pci_enable_msi(dev->pdev))
                         dev_warn(dev->dev, "Enabling MSI failed!\n");
@@ -327,12 +334,6 @@ static int psb_driver_load(struct drm_device *dev, unsigned long chipset)
         if (!dev_priv->mmu)
                 goto out_err;
 
-        pg = &dev_priv->gtt;
-
-        tt_pages = (pg->gatt_pages < PSB_TT_PRIV0_PLIMIT) ?
-                (pg->gatt_pages) : PSB_TT_PRIV0_PLIMIT;
-
-
         dev_priv->pf_pd = psb_mmu_alloc_pd(dev_priv->mmu, 1, 0);
         if (!dev_priv->pf_pd)
                 goto out_err;
@@ -409,7 +410,7 @@ out_err:
         return ret;
 }
 
-int psb_driver_device_is_agp(struct drm_device *dev)
+static int psb_driver_device_is_agp(struct drm_device *dev)
 {
         return 0;
 }
@@ -600,7 +601,7 @@ static long psb_unlocked_ioctl(struct file *filp, unsigned int cmd,
 /* When a client dies:
  *    - Check for and clean up flipped page state
  */
-void psb_driver_preclose(struct drm_device *dev, struct drm_file *priv)
+static void psb_driver_preclose(struct drm_device *dev, struct drm_file *priv)
 {
 }
 
@@ -677,7 +678,9 @@ static struct pci_driver psb_pci_driver = {
         .id_table = pciidlist,
         .probe = psb_probe,
         .remove = psb_remove,
-        .driver.pm = &psb_pm_ops,
+        .driver = {
+                .pm = &psb_pm_ops,
+        }
 };
 
 static int psb_probe(struct pci_dev *pdev, const struct pci_device_id *ent)