1 files changed, 1 insertions, 52 deletions

diff --git a/drivers/gpu/drm/drm_pci.c b/drivers/gpu/drm/drm_pci.c
index b55d5bc6ea61..577094fb1995 100644
--- a/drivers/gpu/drm/drm_pci.c
+++ b/drivers/gpu/drm/drm_pci.c
@@ -55,17 +55,6 @@ drm_dma_handle_t *drm_pci_alloc(struct drm_device * dev, size_t size, size_t ali
         unsigned long addr;
         size_t sz;
 #endif
-#ifdef DRM_DEBUG_MEMORY
-        int area = DRM_MEM_DMA;
-
-        spin_lock(&drm_mem_lock);
-        if ((drm_ram_used >> PAGE_SHIFT)
-            > (DRM_RAM_PERCENT * drm_ram_available) / 100) {
-                spin_unlock(&drm_mem_lock);
-                return 0;
-        }
-        spin_unlock(&drm_mem_lock);
-#endif
 
         /* pci_alloc_consistent only guarantees alignment to the smallest
          * PAGE_SIZE order which is greater than or equal to the requested size.
@@ -86,26 +75,10 @@ drm_dma_handle_t *drm_pci_alloc(struct drm_device * dev, size_t size, size_t ali
         dmah->size = size;
         dmah->vaddr = dma_alloc_coherent(&dev->pdev->dev, size, &dmah->busaddr, GFP_KERNEL | __GFP_COMP);
 
-#ifdef DRM_DEBUG_MEMORY
-        if (dmah->vaddr == NULL) {
-                spin_lock(&drm_mem_lock);
-                ++drm_mem_stats[area].fail_count;
-                spin_unlock(&drm_mem_lock);
-                kfree(dmah);
-                return NULL;
-        }
-
-        spin_lock(&drm_mem_lock);
-        ++drm_mem_stats[area].succeed_count;
-        drm_mem_stats[area].bytes_allocated += size;
-        drm_ram_used += size;
-        spin_unlock(&drm_mem_lock);
-#else
         if (dmah->vaddr == NULL) {
                 kfree(dmah);
                 return NULL;
         }
-#endif
 
         memset(dmah->vaddr, 0, size);
 
@@ -132,17 +105,8 @@ void __drm_pci_free(struct drm_device * dev, drm_dma_handle_t * dmah)
         unsigned long addr;
         size_t sz;
 #endif
-#ifdef DRM_DEBUG_MEMORY
-        int area = DRM_MEM_DMA;
-        int alloc_count;
-        int free_count;
-#endif
 
-        if (!dmah->vaddr) {
-#ifdef DRM_DEBUG_MEMORY
-                DRM_MEM_ERROR(area, "Attempt to free address 0\n");
-#endif
-        } else {
+        if (dmah->vaddr) {
                 /* XXX - Is virt_to_page() legal for consistent mem? */
                 /* Unreserve */
                 for (addr = (unsigned long)dmah->vaddr, sz = dmah->size;
@@ -152,21 +116,6 @@ void __drm_pci_free(struct drm_device * dev, drm_dma_handle_t * dmah)
                 dma_free_coherent(&dev->pdev->dev, dmah->size, dmah->vaddr,
                                   dmah->busaddr);
         }
-
-#ifdef DRM_DEBUG_MEMORY
-        spin_lock(&drm_mem_lock);
-        free_count = ++drm_mem_stats[area].free_count;
-        alloc_count = drm_mem_stats[area].succeed_count;
-        drm_mem_stats[area].bytes_freed += size;
-        drm_ram_used -= size;
-        spin_unlock(&drm_mem_lock);
-        if (free_count > alloc_count) {
-                DRM_MEM_ERROR(area,
-                              "Excess frees: %d frees, %d allocs\n",
-                              free_count, alloc_count);
-        }
-#endif
-
 }
 
 /**