diff options
| author | Thomas Hellstrom <thomas-at-tungstengraphics-dot-com> | 2007-01-08 22:25:47 +1100 |
|---|---|---|
| committer | Dave Airlie <airlied@linux.ie> | 2007-02-08 13:24:26 +1100 |
| commit | 1d58420bad15d08f93bf1e0342c1b1d1234d69b7 (patch) | |
| tree | 0894a496155dd8cda01427fce9f5351f1981d7ea /drivers/char/drm/drm_sman.c | |
| parent | 004a7727421fd202bbdfcc0231a3359085199a52 (diff) | |
drm: update core memory manager from git drm tree
Remove the memory manager parameter from the put_block function, as this
makes the client code a lot cleaner. Prepare buffer manager for lock and
unlock calls.
Fix buggy aligned allocations.
Remove the stupid root_node field from the core memory manager.
Support multi-page buffer offset alignments
Add improved alignment functionality to the core memory manager.
This makes an allocated block actually align itself and returns any
wasted space to the manager.
Signed-off-by: Dave Airlie <airlied@linux.ie>
Diffstat (limited to 'drivers/char/drm/drm_sman.c')
| -rw-r--r-- | drivers/char/drm/drm_sman.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/char/drm/drm_sman.c b/drivers/char/drm/drm_sman.c index 19c81d2e13d0..e15db6d6bea9 100644 --- a/drivers/char/drm/drm_sman.c +++ b/drivers/char/drm/drm_sman.c @@ -101,10 +101,9 @@ static void *drm_sman_mm_allocate(void *private, unsigned long size, static void drm_sman_mm_free(void *private, void *ref) { - drm_mm_t *mm = (drm_mm_t *) private; drm_mm_node_t *node = (drm_mm_node_t *) ref; - drm_mm_put_block(mm, node); + drm_mm_put_block(node); } static void drm_sman_mm_destroy(void *private) |