diff options
author | Ben Widawsky <ben@bwidawsk.net> | 2013-07-05 17:41:03 -0400 |
---|---|---|
committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2013-07-08 16:04:33 -0400 |
commit | 338710e7aff3428dc8170a03704a8ae981b58dcd (patch) | |
tree | 5c95329df3cd1114ddd3f59181f36fc4cbd5ab96 /include/drm/drm_mm.h | |
parent | b3a070cccb9135f8bec63d9f194ddaa422136fb0 (diff) |
drm: Change create block to reserve node
With the previous patch we no longer actually create a node, we simply
find the correct hole and occupy it. This very well could have been
squashed with the last patch, but since I already had David's review, I
figured it's easiest to keep it distinct.
Also update the users in i915. Conveniently this is the only user of the
interface.
CC: David Airlie <airlied@linux.ie>
CC: <dri-devel@lists.freedesktop.org>
Signed-off-by: Ben Widawsky <ben@bwidawsk.net>
Acked-by: David Airlie <airlied@linux.ie>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'include/drm/drm_mm.h')
-rw-r--r-- | include/drm/drm_mm.h | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/include/drm/drm_mm.h b/include/drm/drm_mm.h index d8b56b7d1839..2de91e3da5cc 100644 --- a/include/drm/drm_mm.h +++ b/include/drm/drm_mm.h | |||
@@ -138,10 +138,7 @@ static inline unsigned long drm_mm_hole_node_end(struct drm_mm_node *hole_node) | |||
138 | /* | 138 | /* |
139 | * Basic range manager support (drm_mm.c) | 139 | * Basic range manager support (drm_mm.c) |
140 | */ | 140 | */ |
141 | extern int drm_mm_create_block(struct drm_mm *mm, | 141 | extern int drm_mm_reserve_node(struct drm_mm *mm, struct drm_mm_node *node); |
142 | struct drm_mm_node *node, | ||
143 | unsigned long start, | ||
144 | unsigned long size); | ||
145 | extern struct drm_mm_node *drm_mm_get_block_generic(struct drm_mm_node *node, | 142 | extern struct drm_mm_node *drm_mm_get_block_generic(struct drm_mm_node *node, |
146 | unsigned long size, | 143 | unsigned long size, |
147 | unsigned alignment, | 144 | unsigned alignment, |