diff options
| author | Thomas Hellstrom <thellstrom@vmware.com> | 2009-06-17 12:29:56 +0200 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2009-06-19 09:01:12 +1000 |
| commit | 89579f778266d5a4d08d0c64c46b1565218de9f9 (patch) | |
| tree | f7a2389d1277bf285e790b660e0f6a6019ff857f /include | |
| parent | 78ecf091aa592a9e160ebbbfa5873c2bb2e2d0f8 (diff) | |
| download | linux-stable-89579f778266d5a4d08d0c64c46b1565218de9f9.tar.gz linux-stable-89579f778266d5a4d08d0c64c46b1565218de9f9.tar.bz2 linux-stable-89579f778266d5a4d08d0c64c46b1565218de9f9.zip | |
drm: Apply "Memory fragmentation from lost alignment blocks"
also for the atomic path by using a common code-path.
Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/drm/drm_mm.h | 21 |
1 files changed, 15 insertions, 6 deletions
diff --git a/include/drm/drm_mm.h b/include/drm/drm_mm.h index 5662f4278ef3..f8332073d277 100644 --- a/include/drm/drm_mm.h +++ b/include/drm/drm_mm.h @@ -59,13 +59,22 @@ struct drm_mm { /* * Basic range manager support (drm_mm.c) */ - -extern struct drm_mm_node *drm_mm_get_block(struct drm_mm_node *parent, - unsigned long size, - unsigned alignment); -extern struct drm_mm_node *drm_mm_get_block_atomic(struct drm_mm_node *parent, +extern struct drm_mm_node *drm_mm_get_block_generic(struct drm_mm_node *node, + unsigned long size, + unsigned alignment, + int atomic); +static inline struct drm_mm_node *drm_mm_get_block(struct drm_mm_node *parent, unsigned long size, - unsigned alignment); + unsigned alignment) +{ + return drm_mm_get_block_generic(parent, size, alignment, 0); +} +static inline struct drm_mm_node *drm_mm_get_block_atomic(struct drm_mm_node *parent, + unsigned long size, + unsigned alignment) +{ + return drm_mm_get_block_generic(parent, size, alignment, 1); +} extern void drm_mm_put_block(struct drm_mm_node *cur); extern struct drm_mm_node *drm_mm_search_free(const struct drm_mm *mm, unsigned long size, |