diff options
author | Eric Anholt <eric@anholt.net> | 2009-03-24 15:23:04 -0400 |
---|---|---|
committer | Eric Anholt <eric@anholt.net> | 2009-06-18 16:00:33 -0400 |
commit | 9a298b2acd771d8a5c0004d8f8e4156c65b11f6b (patch) | |
tree | f8bf6cfe675492cb881abb50d9aa9aa8f38733d6 /drivers/gpu/drm/i830 | |
parent | 52dc7d32b88156248167864f77a9026abe27b432 (diff) |
drm: Remove memory debugging infrastructure.
It hasn't been used in ages, and having the user tell your how much
memory is being freed at free time is a recipe for disaster even if it
was ever used.
Signed-off-by: Eric Anholt <eric@anholt.net>
Diffstat (limited to 'drivers/gpu/drm/i830')
-rw-r--r-- | drivers/gpu/drm/i830/i830_dma.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/gpu/drm/i830/i830_dma.c b/drivers/gpu/drm/i830/i830_dma.c index a86ab30b4620..877bf6cb14a4 100644 --- a/drivers/gpu/drm/i830/i830_dma.c +++ b/drivers/gpu/drm/i830/i830_dma.c | |||
@@ -232,8 +232,7 @@ static int i830_dma_cleanup(struct drm_device * dev) | |||
232 | I830_WRITE(0x02080, 0x1ffff000); | 232 | I830_WRITE(0x02080, 0x1ffff000); |
233 | } | 233 | } |
234 | 234 | ||
235 | drm_free(dev->dev_private, sizeof(drm_i830_private_t), | 235 | kfree(dev->dev_private); |
236 | DRM_MEM_DRIVER); | ||
237 | dev->dev_private = NULL; | 236 | dev->dev_private = NULL; |
238 | 237 | ||
239 | for (i = 0; i < dma->buf_count; i++) { | 238 | for (i = 0; i < dma->buf_count; i++) { |
@@ -459,8 +458,7 @@ static int i830_dma_init(struct drm_device *dev, void *data, | |||
459 | 458 | ||
460 | switch (init->func) { | 459 | switch (init->func) { |
461 | case I830_INIT_DMA: | 460 | case I830_INIT_DMA: |
462 | dev_priv = drm_alloc(sizeof(drm_i830_private_t), | 461 | dev_priv = kmalloc(sizeof(drm_i830_private_t), GFP_KERNEL); |
463 | DRM_MEM_DRIVER); | ||
464 | if (dev_priv == NULL) | 462 | if (dev_priv == NULL) |
465 | return -ENOMEM; | 463 | return -ENOMEM; |
466 | retcode = i830_dma_initialize(dev, dev_priv, init); | 464 | retcode = i830_dma_initialize(dev, dev_priv, init); |