diff options
| author | Robert Noland <rnoland@2hip.net> | 2008-10-10 13:06:22 -0400 |
|---|---|---|
| committer | Robert Noland <rnoland@2hip.net> | 2008-10-10 13:06:22 -0400 |
| commit | cdd3e9fc562bd57e0272e4c4d1c0707776bd01a1 (patch) | |
| tree | 97d7b554a5c040630fabcb693b7b26ab4ca5a9f1 /bsd-core/drm_irq.c | |
| parent | 1150a42d4398b14c5db2f34a5beba613528df147 (diff) | |
[FreeBSD] Rework all of the memory allocations
Allocate memory from different pools. This allows the OS to track memory
allocations for us, much like the linux memory debugging. This will ease
tracking down memory leaks since the OS can track the number of allocations
from each pool and help to point us in the right direction. Also replace
drm_alloc and friends with static __inline__ versions while we are here.
Diffstat (limited to 'bsd-core/drm_irq.c')
| -rw-r--r-- | bsd-core/drm_irq.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/bsd-core/drm_irq.c b/bsd-core/drm_irq.c index 00d4b31e..5e99bb33 100644 --- a/bsd-core/drm_irq.c +++ b/bsd-core/drm_irq.c @@ -111,8 +111,7 @@ static void drm_vblank_cleanup(struct drm_device *dev) vblank_disable_fn((void *)dev); - drm_free(dev->vblank, sizeof(struct drm_vblank_info) * dev->num_crtcs, - DRM_MEM_DRIVER); + free(dev->vblank, DRM_MEM_DRIVER); dev->num_crtcs = 0; } @@ -125,8 +124,8 @@ int drm_vblank_init(struct drm_device *dev, int num_crtcs) atomic_set(&dev->vbl_signal_pending, 0); dev->num_crtcs = num_crtcs; - dev->vblank = drm_calloc(num_crtcs, sizeof(struct drm_vblank_info), - DRM_MEM_DRIVER); + dev->vblank = malloc(sizeof(struct drm_vblank_info) * num_crtcs, + DRM_MEM_DRIVER, M_NOWAIT | M_ZERO); if (!dev->vblank) goto err; @@ -429,8 +428,8 @@ int drm_wait_vblank(struct drm_device *dev, void *data, struct drm_file *file_pr if (flags & _DRM_VBLANK_SIGNAL) { #if 0 /* disabled */ - drm_vbl_sig_t *vbl_sig = malloc(sizeof(drm_vbl_sig_t), M_DRM, - M_NOWAIT | M_ZERO); + drm_vbl_sig_t *vbl_sig = malloc(sizeof(drm_vbl_sig_t), + DRM_MEM_DRIVER, M_NOWAIT | M_ZERO); if (vbl_sig == NULL) return ENOMEM; |