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/radeon/radeon_cp.c | |
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/radeon/radeon_cp.c')
-rw-r--r-- | drivers/gpu/drm/radeon/radeon_cp.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/drivers/gpu/drm/radeon/radeon_cp.c b/drivers/gpu/drm/radeon/radeon_cp.c index 89c4c44169f7..d8356827ef17 100644 --- a/drivers/gpu/drm/radeon/radeon_cp.c +++ b/drivers/gpu/drm/radeon/radeon_cp.c | |||
@@ -2045,11 +2045,10 @@ int radeon_driver_load(struct drm_device *dev, unsigned long flags) | |||
2045 | drm_radeon_private_t *dev_priv; | 2045 | drm_radeon_private_t *dev_priv; |
2046 | int ret = 0; | 2046 | int ret = 0; |
2047 | 2047 | ||
2048 | dev_priv = drm_alloc(sizeof(drm_radeon_private_t), DRM_MEM_DRIVER); | 2048 | dev_priv = kzalloc(sizeof(drm_radeon_private_t), GFP_KERNEL); |
2049 | if (dev_priv == NULL) | 2049 | if (dev_priv == NULL) |
2050 | return -ENOMEM; | 2050 | return -ENOMEM; |
2051 | 2051 | ||
2052 | memset(dev_priv, 0, sizeof(drm_radeon_private_t)); | ||
2053 | dev->dev_private = (void *)dev_priv; | 2052 | dev->dev_private = (void *)dev_priv; |
2054 | dev_priv->flags = flags; | 2053 | dev_priv->flags = flags; |
2055 | 2054 | ||
@@ -2103,7 +2102,7 @@ int radeon_master_create(struct drm_device *dev, struct drm_master *master) | |||
2103 | unsigned long sareapage; | 2102 | unsigned long sareapage; |
2104 | int ret; | 2103 | int ret; |
2105 | 2104 | ||
2106 | master_priv = drm_calloc(1, sizeof(*master_priv), DRM_MEM_DRIVER); | 2105 | master_priv = kzalloc(sizeof(*master_priv), GFP_KERNEL); |
2107 | if (!master_priv) | 2106 | if (!master_priv) |
2108 | return -ENOMEM; | 2107 | return -ENOMEM; |
2109 | 2108 | ||
@@ -2137,7 +2136,7 @@ void radeon_master_destroy(struct drm_device *dev, struct drm_master *master) | |||
2137 | if (master_priv->sarea) | 2136 | if (master_priv->sarea) |
2138 | drm_rmmap_locked(dev, master_priv->sarea); | 2137 | drm_rmmap_locked(dev, master_priv->sarea); |
2139 | 2138 | ||
2140 | drm_free(master_priv, sizeof(*master_priv), DRM_MEM_DRIVER); | 2139 | kfree(master_priv); |
2141 | 2140 | ||
2142 | master->driver_priv = NULL; | 2141 | master->driver_priv = NULL; |
2143 | } | 2142 | } |
@@ -2171,7 +2170,7 @@ int radeon_driver_unload(struct drm_device *dev) | |||
2171 | 2170 | ||
2172 | drm_rmmap(dev, dev_priv->mmio); | 2171 | drm_rmmap(dev, dev_priv->mmio); |
2173 | 2172 | ||
2174 | drm_free(dev_priv, sizeof(*dev_priv), DRM_MEM_DRIVER); | 2173 | kfree(dev_priv); |
2175 | 2174 | ||
2176 | dev->dev_private = NULL; | 2175 | dev->dev_private = NULL; |
2177 | return 0; | 2176 | return 0; |