diff options
| author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2013-07-01 16:05:53 -0400 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2013-07-03 20:57:40 -0400 |
| commit | 69163ea82732894e8c1e17df4010372ed078efdd (patch) | |
| tree | b0565b782a3ecaa67b64c99a3eaa6b1a8c6685fd /include | |
| parent | 04274cd058193cefc22f1ebda1e634d96cb59fa5 (diff) | |
drm/mm: kill color_search_free/get_block
drm/i915 is the only user of the color allocation handling and
switched to insert_node a while ago. So we can ditch this.
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/drm/drm_mm.h | 32 |
1 files changed, 1 insertions, 31 deletions
diff --git a/include/drm/drm_mm.h b/include/drm/drm_mm.h index de9242542f05..4d06edb56d5f 100644 --- a/include/drm/drm_mm.h +++ b/include/drm/drm_mm.h | |||
| @@ -177,17 +177,6 @@ static inline struct drm_mm_node *drm_mm_get_block_range( | |||
| 177 | return drm_mm_get_block_range_generic(parent, size, alignment, 0, | 177 | return drm_mm_get_block_range_generic(parent, size, alignment, 0, |
| 178 | start, end, 0); | 178 | start, end, 0); |
| 179 | } | 179 | } |
| 180 | static inline struct drm_mm_node *drm_mm_get_color_block_range( | ||
| 181 | struct drm_mm_node *parent, | ||
| 182 | unsigned long size, | ||
| 183 | unsigned alignment, | ||
| 184 | unsigned long color, | ||
| 185 | unsigned long start, | ||
| 186 | unsigned long end) | ||
| 187 | { | ||
| 188 | return drm_mm_get_block_range_generic(parent, size, alignment, color, | ||
| 189 | start, end, 0); | ||
| 190 | } | ||
| 191 | static inline struct drm_mm_node *drm_mm_get_block_atomic_range( | 180 | static inline struct drm_mm_node *drm_mm_get_block_atomic_range( |
| 192 | struct drm_mm_node *parent, | 181 | struct drm_mm_node *parent, |
| 193 | unsigned long size, | 182 | unsigned long size, |
| @@ -255,26 +244,7 @@ static inline struct drm_mm_node *drm_mm_search_free_in_range( | |||
| 255 | return drm_mm_search_free_in_range_generic(mm, size, alignment, 0, | 244 | return drm_mm_search_free_in_range_generic(mm, size, alignment, 0, |
| 256 | start, end, best_match); | 245 | start, end, best_match); |
| 257 | } | 246 | } |
| 258 | static inline struct drm_mm_node *drm_mm_search_free_color(const struct drm_mm *mm, | 247 | |
| 259 | unsigned long size, | ||
| 260 | unsigned alignment, | ||
| 261 | unsigned long color, | ||
| 262 | bool best_match) | ||
| 263 | { | ||
| 264 | return drm_mm_search_free_generic(mm,size, alignment, color, best_match); | ||
| 265 | } | ||
| 266 | static inline struct drm_mm_node *drm_mm_search_free_in_range_color( | ||
| 267 | const struct drm_mm *mm, | ||
| 268 | unsigned long size, | ||
| 269 | unsigned alignment, | ||
| 270 | unsigned long color, | ||
| 271 | unsigned long start, | ||
| 272 | unsigned long end, | ||
| 273 | bool best_match) | ||
| 274 | { | ||
| 275 | return drm_mm_search_free_in_range_generic(mm, size, alignment, color, | ||
| 276 | start, end, best_match); | ||
| 277 | } | ||
| 278 | extern void drm_mm_init(struct drm_mm *mm, | 248 | extern void drm_mm_init(struct drm_mm *mm, |
| 279 | unsigned long start, | 249 | unsigned long start, |
| 280 | unsigned long size); | 250 | unsigned long size); |
