6 files changed, 52 insertions, 71 deletions

diff --git a/drivers/gpu/drm/i915/i915_dma.c b/drivers/gpu/drm/i915/i915_dma.c
index 1a60626f6803..f112c769d533 100644
--- a/drivers/gpu/drm/i915/i915_dma.c
+++ b/drivers/gpu/drm/i915/i915_dma.c
@@ -643,9 +643,9 @@ static int i915_batchbuffer(struct drm_device *dev, void *data,
                 return -EINVAL;
 
         if (batch->num_cliprects) {
-                cliprects = drm_calloc(batch->num_cliprects,
-                                       sizeof(struct drm_clip_rect),
-                                       DRM_MEM_DRIVER);
+                cliprects = kcalloc(batch->num_cliprects,
+                                    sizeof(struct drm_clip_rect),
+                                    GFP_KERNEL);
                 if (cliprects == NULL)
                         return -ENOMEM;
 
@@ -664,9 +664,7 @@ static int i915_batchbuffer(struct drm_device *dev, void *data,
                 sarea_priv->last_dispatch = READ_BREADCRUMB(dev_priv);
 
 fail_free:
-        drm_free(cliprects,
-                 batch->num_cliprects * sizeof(struct drm_clip_rect),
-                 DRM_MEM_DRIVER);
+        kfree(cliprects);
 
         return ret;
 }
@@ -692,7 +690,7 @@ static int i915_cmdbuffer(struct drm_device *dev, void *data,
         if (cmdbuf->num_cliprects < 0)
                 return -EINVAL;
 
-        batch_data = drm_alloc(cmdbuf->sz, DRM_MEM_DRIVER);
+        batch_data = kmalloc(cmdbuf->sz, GFP_KERNEL);
         if (batch_data == NULL)
                 return -ENOMEM;
 
@@ -701,9 +699,8 @@ static int i915_cmdbuffer(struct drm_device *dev, void *data,
                 goto fail_batch_free;
 
         if (cmdbuf->num_cliprects) {
-                cliprects = drm_calloc(cmdbuf->num_cliprects,
-                                       sizeof(struct drm_clip_rect),
-                                       DRM_MEM_DRIVER);
+                cliprects = kcalloc(cmdbuf->num_cliprects,
+                                    sizeof(struct drm_clip_rect), GFP_KERNEL);
                 if (cliprects == NULL)
                         goto fail_batch_free;
 
@@ -726,11 +723,9 @@ static int i915_cmdbuffer(struct drm_device *dev, void *data,
                 sarea_priv->last_dispatch = READ_BREADCRUMB(dev_priv);
 
 fail_clip_free:
-        drm_free(cliprects,
-                 cmdbuf->num_cliprects * sizeof(struct drm_clip_rect),
-                 DRM_MEM_DRIVER);
+        kfree(cliprects);
 fail_batch_free:
-        drm_free(batch_data, cmdbuf->sz, DRM_MEM_DRIVER);
+        kfree(batch_data);
 
         return ret;
 }
@@ -1067,7 +1062,7 @@ int i915_master_create(struct drm_device *dev, struct drm_master *master)
 {
         struct drm_i915_master_private *master_priv;
 
-        master_priv = drm_calloc(1, sizeof(*master_priv), DRM_MEM_DRIVER);
+        master_priv = kzalloc(sizeof(*master_priv), GFP_KERNEL);
         if (!master_priv)
                 return -ENOMEM;
 
@@ -1082,7 +1077,7 @@ void i915_master_destroy(struct drm_device *dev, struct drm_master *master)
         if (!master_priv)
                 return;
 
-        drm_free(master_priv, sizeof(*master_priv), DRM_MEM_DRIVER);
+        kfree(master_priv);
 
         master->driver_priv = NULL;
 }
@@ -1111,12 +1106,10 @@ int i915_driver_load(struct drm_device *dev, unsigned long flags)
         dev->types[8] = _DRM_STAT_SECONDARY;
         dev->types[9] = _DRM_STAT_DMA;
 
-        dev_priv = drm_alloc(sizeof(drm_i915_private_t), DRM_MEM_DRIVER);
+        dev_priv = kzalloc(sizeof(drm_i915_private_t), GFP_KERNEL);
         if (dev_priv == NULL)
                 return -ENOMEM;
 
-        memset(dev_priv, 0, sizeof(drm_i915_private_t));
-
         dev->dev_private = (void *)dev_priv;
         dev_priv->dev = dev;
 
@@ -1153,13 +1146,8 @@ int i915_driver_load(struct drm_device *dev, unsigned long flags)
                          "performance may suffer.\n");
         }
 
-#ifdef CONFIG_HIGHMEM64G
-        /* don't enable GEM on PAE - needs agp + set_memory_* interface fixes */
-        dev_priv->has_gem = 0;
-#else
         /* enable GEM by default */
         dev_priv->has_gem = 1;
-#endif
 
         dev->driver->get_vblank_counter = i915_get_vblank_counter;
         dev->max_vblank_count = 0xffffff; /* only 24 bits of frame count */
@@ -1221,7 +1209,7 @@ out_iomapfree:
 out_rmmap:
         iounmap(dev_priv->regs);
 free_priv:
-        drm_free(dev_priv, sizeof(struct drm_i915_private), DRM_MEM_DRIVER);
+        kfree(dev_priv);
         return ret;
 }
 
@@ -1261,8 +1249,7 @@ int i915_driver_unload(struct drm_device *dev)
                 i915_gem_lastclose(dev);
         }
 
-        drm_free(dev->dev_private, sizeof(drm_i915_private_t),
-                 DRM_MEM_DRIVER);
+        kfree(dev->dev_private);
 
         return 0;
 }
@@ -1273,7 +1260,7 @@ int i915_driver_open(struct drm_device *dev, struct drm_file *file_priv)
 
         DRM_DEBUG_DRIVER(I915_DRV, "\n");
         i915_file_priv = (struct drm_i915_file_private *)
-            drm_alloc(sizeof(*i915_file_priv), DRM_MEM_FILES);
+            kmalloc(sizeof(*i915_file_priv), GFP_KERNEL);
 
         if (!i915_file_priv)
                 return -ENOMEM;
@@ -1326,7 +1313,7 @@ void i915_driver_postclose(struct drm_device *dev, struct drm_file *file_priv)
 {
         struct drm_i915_file_private *i915_file_priv = file_priv->driver_priv;
 
-        drm_free(i915_file_priv, sizeof(*i915_file_priv), DRM_MEM_FILES);
+        kfree(i915_file_priv);
 }
 
 struct drm_ioctl_desc i915_ioctls[] = {
diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
index 174aef2d6481..fd2b8bdffe3f 100644
--- a/drivers/gpu/drm/i915/i915_gem.c
+++ b/drivers/gpu/drm/i915/i915_gem.c
@@ -1207,8 +1207,7 @@ i915_gem_create_mmap_offset(struct drm_gem_object *obj)
 
         /* Set the object up for mmap'ing */
         list = &obj->map_list;
-        list->map = drm_calloc(1, sizeof(struct drm_map_list),
-                               DRM_MEM_DRIVER);
+        list->map = kzalloc(sizeof(struct drm_map_list), GFP_KERNEL);
         if (!list->map)
                 return -ENOMEM;
 
@@ -1248,7 +1247,7 @@ i915_gem_create_mmap_offset(struct drm_gem_object *obj)
 out_free_mm:
         drm_mm_put_block(list->file_offset_node);
 out_free_list:
-        drm_free(list->map, sizeof(struct drm_map_list), DRM_MEM_DRIVER);
+        kfree(list->map);
 
         return ret;
 }
@@ -1270,7 +1269,7 @@ i915_gem_free_mmap_offset(struct drm_gem_object *obj)
         }
 
         if (list->map) {
-                drm_free(list->map, sizeof(struct drm_map), DRM_MEM_DRIVER);
+                kfree(list->map);
                 list->map = NULL;
         }
 
@@ -1493,7 +1492,7 @@ i915_add_request(struct drm_device *dev, struct drm_file *file_priv,
         if (file_priv != NULL)
                 i915_file_priv = file_priv->driver_priv;
 
-        request = drm_calloc(1, sizeof(*request), DRM_MEM_DRIVER);
+        request = kzalloc(sizeof(*request), GFP_KERNEL);
         if (request == NULL)
                 return 0;
 
@@ -1675,7 +1674,7 @@ i915_gem_retire_requests(struct drm_device *dev)
 
                         list_del(&request->list);
                         list_del(&request->client_list);
-                        drm_free(request, sizeof(*request), DRM_MEM_DRIVER);
+                        kfree(request);
                 } else
                         break;
         }
@@ -2833,8 +2832,7 @@ i915_gem_object_set_to_full_cpu_read_domain(struct drm_gem_object *obj)
         /* Free the page_cpu_valid mappings which are now stale, whether
          * or not we've got I915_GEM_DOMAIN_CPU.
          */
-        drm_free(obj_priv->page_cpu_valid, obj->size / PAGE_SIZE,
-                 DRM_MEM_DRIVER);
+        kfree(obj_priv->page_cpu_valid);
         obj_priv->page_cpu_valid = NULL;
 }
 
@@ -2876,8 +2874,8 @@ i915_gem_object_set_cpu_read_domain_range(struct drm_gem_object *obj,
          * newly adding I915_GEM_DOMAIN_CPU
          */
         if (obj_priv->page_cpu_valid == NULL) {
-                obj_priv->page_cpu_valid = drm_calloc(1, obj->size / PAGE_SIZE,
-                                                      DRM_MEM_DRIVER);
+                obj_priv->page_cpu_valid = kzalloc(obj->size / PAGE_SIZE,
+                                                   GFP_KERNEL);
                 if (obj_priv->page_cpu_valid == NULL)
                         return -ENOMEM;
         } else if ((obj->read_domains & I915_GEM_DOMAIN_CPU) == 0)
@@ -3300,8 +3298,8 @@ i915_gem_execbuffer(struct drm_device *dev, void *data,
         }
 
         if (args->num_cliprects != 0) {
-                cliprects = drm_calloc(args->num_cliprects, sizeof(*cliprects),
-                                       DRM_MEM_DRIVER);
+                cliprects = kcalloc(args->num_cliprects, sizeof(*cliprects),
+                                    GFP_KERNEL);
                 if (cliprects == NULL)
                         goto pre_mutex_err;
 
@@ -3554,8 +3552,7 @@ err:
 pre_mutex_err:
         drm_free_large(object_list);
         drm_free_large(exec_list);
-        drm_free(cliprects, sizeof(*cliprects) * args->num_cliprects,
-                 DRM_MEM_DRIVER);
+        kfree(cliprects);
 
         return ret;
 }
@@ -3772,7 +3769,7 @@ int i915_gem_init_object(struct drm_gem_object *obj)
 {
         struct drm_i915_gem_object *obj_priv;
 
-        obj_priv = drm_calloc(1, sizeof(*obj_priv), DRM_MEM_DRIVER);
+        obj_priv = kzalloc(sizeof(*obj_priv), GFP_KERNEL);
         if (obj_priv == NULL)
                 return -ENOMEM;
 
@@ -3810,9 +3807,9 @@ void i915_gem_free_object(struct drm_gem_object *obj)
 
         i915_gem_free_mmap_offset(obj);
 
-        drm_free(obj_priv->page_cpu_valid, 1, DRM_MEM_DRIVER);
+        kfree(obj_priv->page_cpu_valid);
         kfree(obj_priv->bit_17);
-        drm_free(obj->driver_private, 1, DRM_MEM_DRIVER);
+        kfree(obj->driver_private);
 }
 
 /** Unbinds all objects that are on the given buffer list. */
@@ -4266,7 +4263,7 @@ int i915_gem_init_phys_object(struct drm_device *dev,
         if (dev_priv->mm.phys_objs[id - 1] || !size)
                 return 0;
 
-        phys_obj = drm_calloc(1, sizeof(struct drm_i915_gem_phys_object), DRM_MEM_DRIVER);
+        phys_obj = kzalloc(sizeof(struct drm_i915_gem_phys_object), GFP_KERNEL);
         if (!phys_obj)
                 return -ENOMEM;
 
@@ -4285,7 +4282,7 @@ int i915_gem_init_phys_object(struct drm_device *dev,
 
         return 0;
 kfree_obj:
-        drm_free(phys_obj, sizeof(struct drm_i915_gem_phys_object), DRM_MEM_DRIVER);
+        kfree(phys_obj);
         return ret;
 }
 
diff --git a/drivers/gpu/drm/i915/i915_mem.c b/drivers/gpu/drm/i915/i915_mem.c
index 96e271986d2a..83b7b81bb2b8 100644
--- a/drivers/gpu/drm/i915/i915_mem.c
+++ b/drivers/gpu/drm/i915/i915_mem.c
@@ -94,8 +94,8 @@ static struct mem_block *split_block(struct mem_block *p, int start, int size,
 {
         /* Maybe cut off the start of an existing block */
         if (start > p->start) {
-                struct mem_block *newblock =
-                    drm_alloc(sizeof(*newblock), DRM_MEM_BUFLISTS);
+                struct mem_block *newblock = kmalloc(sizeof(*newblock),
+                                                     GFP_KERNEL);
                 if (!newblock)
                         goto out;
                 newblock->start = start;
@@ -111,8 +111,8 @@ static struct mem_block *split_block(struct mem_block *p, int start, int size,
 
         /* Maybe cut off the end of an existing block */
         if (size < p->size) {
-                struct mem_block *newblock =
-                    drm_alloc(sizeof(*newblock), DRM_MEM_BUFLISTS);
+                struct mem_block *newblock = kmalloc(sizeof(*newblock),
+                                                     GFP_KERNEL);
                 if (!newblock)
                         goto out;
                 newblock->start = start + size;
@@ -169,7 +169,7 @@ static void free_block(struct mem_block *p)
                 p->size += q->size;
                 p->next = q->next;
                 p->next->prev = p;
-                drm_free(q, sizeof(*q), DRM_MEM_BUFLISTS);
+                kfree(q);
         }
 
         if (p->prev->file_priv == NULL) {
@@ -177,7 +177,7 @@ static void free_block(struct mem_block *p)
                 q->size += p->size;
                 q->next = p->next;
                 q->next->prev = q;
-                drm_free(p, sizeof(*q), DRM_MEM_BUFLISTS);
+                kfree(p);
         }
 }
 
@@ -185,14 +185,14 @@ static void free_block(struct mem_block *p)
  */
 static int init_heap(struct mem_block **heap, int start, int size)
 {
-        struct mem_block *blocks = drm_alloc(sizeof(*blocks), DRM_MEM_BUFLISTS);
+        struct mem_block *blocks = kmalloc(sizeof(*blocks), GFP_KERNEL);
 
         if (!blocks)
                 return -ENOMEM;
 
-        *heap = drm_alloc(sizeof(**heap), DRM_MEM_BUFLISTS);
+        *heap = kmalloc(sizeof(**heap), GFP_KERNEL);
         if (!*heap) {
-                drm_free(blocks, sizeof(*blocks), DRM_MEM_BUFLISTS);
+                kfree(blocks);
                 return -ENOMEM;
         }
 
@@ -233,7 +233,7 @@ void i915_mem_release(struct drm_device * dev, struct drm_file *file_priv,
                         p->size += q->size;
                         p->next = q->next;
                         p->next->prev = p;
-                        drm_free(q, sizeof(*q), DRM_MEM_BUFLISTS);
+                        kfree(q);
                 }
         }
 }
@@ -250,10 +250,10 @@ void i915_mem_takedown(struct mem_block **heap)
         for (p = (*heap)->next; p != *heap;) {
                 struct mem_block *q = p;
                 p = p->next;
-                drm_free(q, sizeof(*q), DRM_MEM_BUFLISTS);
+                kfree(q);
         }
 
-        drm_free(*heap, sizeof(**heap), DRM_MEM_BUFLISTS);
+        kfree(*heap);
         *heap = NULL;
 }
 
diff --git a/drivers/gpu/drm/i915/intel_bios.c b/drivers/gpu/drm/i915/intel_bios.c
index 754dd22fdd77..cdd126d068a7 100644
--- a/drivers/gpu/drm/i915/intel_bios.c
+++ b/drivers/gpu/drm/i915/intel_bios.c
@@ -124,8 +124,7 @@ parse_lfp_panel_data(struct drm_i915_private *dev_priv,
         entry = &lvds_lfp_data->data[lvds_options->panel_type];
         dvo_timing = &entry->dvo_timing;
 
-        panel_fixed_mode = drm_calloc(1, sizeof(*panel_fixed_mode),
-                                      DRM_MEM_DRIVER);
+        panel_fixed_mode = kzalloc(sizeof(*panel_fixed_mode), GFP_KERNEL);
 
         fill_detail_timing_data(panel_fixed_mode, dvo_timing);
 
@@ -156,8 +155,7 @@ parse_sdvo_panel_data(struct drm_i915_private *dev_priv,
         if (!dvo_timing)
                 return;
 
-        panel_fixed_mode = drm_calloc(1, sizeof(*panel_fixed_mode),
-                                      DRM_MEM_DRIVER);
+        panel_fixed_mode = kzalloc(sizeof(*panel_fixed_mode), GFP_KERNEL);
 
         if (!panel_fixed_mode)
                 return;
diff --git a/drivers/gpu/drm/i915/intel_hdmi.c b/drivers/gpu/drm/i915/intel_hdmi.c
index fbe96005fa1e..3955476eb64f 100644
--- a/drivers/gpu/drm/i915/intel_hdmi.c
+++ b/drivers/gpu/drm/i915/intel_hdmi.c
@@ -142,7 +142,7 @@ intel_hdmi_edid_detect(struct drm_connector *connector)
                             intel_output->ddc_bus);
         hdmi_priv->has_hdmi_sink = false;
         if (edid) {
-                if (edid->digital) {
+                if (edid->input & DRM_EDID_INPUT_DIGITAL) {
                         status = connector_status_connected;
                         hdmi_priv->has_hdmi_sink = drm_detect_hdmi_monitor(edid);
                 }
diff --git a/drivers/gpu/drm/i915/intel_tv.c b/drivers/gpu/drm/i915/intel_tv.c
index 50d7ed70b338..ea68992e4416 100644
--- a/drivers/gpu/drm/i915/intel_tv.c
+++ b/drivers/gpu/drm/i915/intel_tv.c
@@ -1561,8 +1561,7 @@ intel_tv_destroy (struct drm_connector *connector)
 
         drm_sysfs_connector_remove(connector);
         drm_connector_cleanup(connector);
-        drm_free(intel_output, sizeof(struct intel_output) + sizeof(struct intel_tv_priv),
-                 DRM_MEM_DRIVER);
+        kfree(intel_output);
 }
 
 
@@ -1695,8 +1694,8 @@ intel_tv_init(struct drm_device *dev)
             (tv_dac_off & TVDAC_STATE_CHG_EN) != 0)
                 return;
 
-        intel_output = drm_calloc(1, sizeof(struct intel_output) +
-                                  sizeof(struct intel_tv_priv), DRM_MEM_DRIVER);
+        intel_output = kzalloc(sizeof(struct intel_output) +
+                               sizeof(struct intel_tv_priv), GFP_KERNEL);
         if (!intel_output) {
                 return;
         }
@@ -1730,8 +1729,8 @@ intel_tv_init(struct drm_device *dev)
         connector->doublescan_allowed = false;
 
         /* Create TV properties then attach current values */
-        tv_format_names = drm_alloc(sizeof(char *) * NUM_TV_MODES,
-                                    DRM_MEM_DRIVER);
+        tv_format_names = kmalloc(sizeof(char *) * NUM_TV_MODES,
+                                  GFP_KERNEL);
         if (!tv_format_names)
                 goto out;
         for (i = 0; i < NUM_TV_MODES; i++)