4 files changed, 11 insertions, 32 deletions

diff --git a/drivers/gpu/drm/gma500/framebuffer.c b/drivers/gpu/drm/gma500/framebuffer.c
index 830dfdd6bf15..c1c4dc174fa2 100644
--- a/drivers/gpu/drm/gma500/framebuffer.c
+++ b/drivers/gpu/drm/gma500/framebuffer.c
@@ -507,11 +507,7 @@ static int psbfb_create(struct psb_fbdev *fbdev,
         info->fix.mmio_start = pci_resource_start(dev->pdev, 0);
         info->fix.mmio_len = pci_resource_len(dev->pdev, 0);
 
-        info->pixmap.size = 64 * 1024;
-        info->pixmap.buf_align = 8;
-        info->pixmap.access_align = 32;
-        info->pixmap.flags = FB_PIXMAP_SYSTEM;
-        info->pixmap.scan_align = 1;
+        /* Use default scratch pixmap (info->pixmap.flags = FB_PIXMAP_SYSTEM) */
 
         dev_info(dev->dev, "allocated %dx%d fb\n",
                                         psbfb->base.width, psbfb->base.height);
@@ -725,10 +721,7 @@ static int psb_create_backlight_property(struct drm_device *dev)
         if (dev_priv->backlight_property)
                 return 0;
 
-        backlight = drm_property_create(dev, DRM_MODE_PROP_RANGE,
-                                                        "backlight", 2);
-        backlight->values[0] = 0;
-        backlight->values[1] = 100;
+        backlight = drm_property_create_range(dev, 0, "backlight", 0, 100);
 
         dev_priv->backlight_property = backlight;
 
diff --git a/drivers/gpu/drm/gma500/intel_gmbus.c b/drivers/gpu/drm/gma500/intel_gmbus.c
index 147584ac8d02..9db90527bf0f 100644
--- a/drivers/gpu/drm/gma500/intel_gmbus.c
+++ b/drivers/gpu/drm/gma500/intel_gmbus.c
@@ -395,7 +395,7 @@ int gma_intel_setup_gmbus(struct drm_device *dev)
         struct drm_psb_private *dev_priv = dev->dev_private;
         int ret, i;
 
-        dev_priv->gmbus = kcalloc(sizeof(struct intel_gmbus), GMBUS_NUM_PORTS,
+        dev_priv->gmbus = kcalloc(GMBUS_NUM_PORTS, sizeof(struct intel_gmbus),
                                   GFP_KERNEL);
         if (dev_priv->gmbus == NULL)
                 return -ENOMEM;
diff --git a/drivers/gpu/drm/gma500/psb_drv.c b/drivers/gpu/drm/gma500/psb_drv.c
index f14768f2b364..1f57aac2cf80 100644
--- a/drivers/gpu/drm/gma500/psb_drv.c
+++ b/drivers/gpu/drm/gma500/psb_drv.c
@@ -283,6 +283,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");
diff --git a/drivers/gpu/drm/gma500/psb_intel_sdvo.c b/drivers/gpu/drm/gma500/psb_intel_sdvo.c
index 88b42971c0fd..41b55d7a7bf8 100644
--- a/drivers/gpu/drm/gma500/psb_intel_sdvo.c
+++ b/drivers/gpu/drm/gma500/psb_intel_sdvo.c
@@ -2312,10 +2312,8 @@ static bool psb_intel_sdvo_tv_create_property(struct psb_intel_sdvo *psb_intel_s
                 psb_intel_sdvo_connector->max_##name = data_value[0]; \
                 psb_intel_sdvo_connector->cur_##name = response; \
                 psb_intel_sdvo_connector->name = \
-                        drm_property_create(dev, DRM_MODE_PROP_RANGE, #name, 2); \
+                        drm_property_create_range(dev, 0, #name, 0, data_value[0]); \
                 if (!psb_intel_sdvo_connector->name) return false; \
-                psb_intel_sdvo_connector->name->values[0] = 0; \
-                psb_intel_sdvo_connector->name->values[1] = data_value[0]; \
                 drm_connector_attach_property(connector, \
                                               psb_intel_sdvo_connector->name, \
                                               psb_intel_sdvo_connector->cur_##name); \
@@ -2349,25 +2347,19 @@ psb_intel_sdvo_create_enhance_property_tv(struct psb_intel_sdvo *psb_intel_sdvo,
                 psb_intel_sdvo_connector->left_margin = data_value[0] - response;
                 psb_intel_sdvo_connector->right_margin = psb_intel_sdvo_connector->left_margin;
                 psb_intel_sdvo_connector->left =
-                        drm_property_create(dev, DRM_MODE_PROP_RANGE,
-                                            "left_margin", 2);
+                        drm_property_create_range(dev, 0, "left_margin", 0, data_value[0]);
                 if (!psb_intel_sdvo_connector->left)
                         return false;
 
-                psb_intel_sdvo_connector->left->values[0] = 0;
-                psb_intel_sdvo_connector->left->values[1] = data_value[0];
                 drm_connector_attach_property(connector,
                                               psb_intel_sdvo_connector->left,
                                               psb_intel_sdvo_connector->left_margin);
 
                 psb_intel_sdvo_connector->right =
-                        drm_property_create(dev, DRM_MODE_PROP_RANGE,
-                                            "right_margin", 2);
+                        drm_property_create_range(dev, 0, "right_margin", 0, data_value[0]);
                 if (!psb_intel_sdvo_connector->right)
                         return false;
 
-                psb_intel_sdvo_connector->right->values[0] = 0;
-                psb_intel_sdvo_connector->right->values[1] = data_value[0];
                 drm_connector_attach_property(connector,
                                               psb_intel_sdvo_connector->right,
                                               psb_intel_sdvo_connector->right_margin);
@@ -2391,25 +2383,19 @@ psb_intel_sdvo_create_enhance_property_tv(struct psb_intel_sdvo *psb_intel_sdvo,
                 psb_intel_sdvo_connector->top_margin = data_value[0] - response;
                 psb_intel_sdvo_connector->bottom_margin = psb_intel_sdvo_connector->top_margin;
                 psb_intel_sdvo_connector->top =
-                        drm_property_create(dev, DRM_MODE_PROP_RANGE,
-                                            "top_margin", 2);
+                        drm_property_create_range(dev, 0, "top_margin", 0, data_value[0]);
                 if (!psb_intel_sdvo_connector->top)
                         return false;
 
-                psb_intel_sdvo_connector->top->values[0] = 0;
-                psb_intel_sdvo_connector->top->values[1] = data_value[0];
                 drm_connector_attach_property(connector,
                                               psb_intel_sdvo_connector->top,
                                               psb_intel_sdvo_connector->top_margin);
 
                 psb_intel_sdvo_connector->bottom =
-                        drm_property_create(dev, DRM_MODE_PROP_RANGE,
-                                            "bottom_margin", 2);
+                        drm_property_create_range(dev, 0, "bottom_margin", 0, data_value[0]);
                 if (!psb_intel_sdvo_connector->bottom)
                         return false;
 
-                psb_intel_sdvo_connector->bottom->values[0] = 0;
-                psb_intel_sdvo_connector->bottom->values[1] = data_value[0];
                 drm_connector_attach_property(connector,
                                               psb_intel_sdvo_connector->bottom,
                                               psb_intel_sdvo_connector->bottom_margin);
@@ -2438,12 +2424,10 @@ psb_intel_sdvo_create_enhance_property_tv(struct psb_intel_sdvo *psb_intel_sdvo,
                 psb_intel_sdvo_connector->max_dot_crawl = 1;
                 psb_intel_sdvo_connector->cur_dot_crawl = response & 0x1;
                 psb_intel_sdvo_connector->dot_crawl =
-                        drm_property_create(dev, DRM_MODE_PROP_RANGE, "dot_crawl", 2);
+                        drm_property_create_range(dev, 0, "dot_crawl", 0, 1);
                 if (!psb_intel_sdvo_connector->dot_crawl)
                         return false;
 
-                psb_intel_sdvo_connector->dot_crawl->values[0] = 0;
-                psb_intel_sdvo_connector->dot_crawl->values[1] = 1;
                 drm_connector_attach_property(connector,
                                               psb_intel_sdvo_connector->dot_crawl,
                                               psb_intel_sdvo_connector->cur_dot_crawl);