OSDN Git Service

drm/mm: kill color_search_free/get_block
authorDaniel Vetter <daniel.vetter@ffwll.ch>
Mon, 1 Jul 2013 20:05:53 +0000 (22:05 +0200)
committerDave Airlie <airlied@redhat.com>
Thu, 4 Jul 2013 00:57:40 +0000 (10:57 +1000)
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>
include/drm/drm_mm.h

index de92425..4d06edb 100644 (file)
@@ -177,17 +177,6 @@ static inline struct drm_mm_node *drm_mm_get_block_range(
        return drm_mm_get_block_range_generic(parent, size, alignment, 0,
                                              start, end, 0);
 }
-static inline struct drm_mm_node *drm_mm_get_color_block_range(
-                                               struct drm_mm_node *parent,
-                                               unsigned long size,
-                                               unsigned alignment,
-                                               unsigned long color,
-                                               unsigned long start,
-                                               unsigned long end)
-{
-       return drm_mm_get_block_range_generic(parent, size, alignment, color,
-                                             start, end, 0);
-}
 static inline struct drm_mm_node *drm_mm_get_block_atomic_range(
                                                struct drm_mm_node *parent,
                                                unsigned long size,
@@ -255,26 +244,7 @@ static inline  struct drm_mm_node *drm_mm_search_free_in_range(
        return drm_mm_search_free_in_range_generic(mm, size, alignment, 0,
                                                   start, end, best_match);
 }
-static inline struct drm_mm_node *drm_mm_search_free_color(const struct drm_mm *mm,
-                                                          unsigned long size,
-                                                          unsigned alignment,
-                                                          unsigned long color,
-                                                          bool best_match)
-{
-       return drm_mm_search_free_generic(mm,size, alignment, color, best_match);
-}
-static inline  struct drm_mm_node *drm_mm_search_free_in_range_color(
-                                               const struct drm_mm *mm,
-                                               unsigned long size,
-                                               unsigned alignment,
-                                               unsigned long color,
-                                               unsigned long start,
-                                               unsigned long end,
-                                               bool best_match)
-{
-       return drm_mm_search_free_in_range_generic(mm, size, alignment, color,
-                                                  start, end, best_match);
-}
+
 extern void drm_mm_init(struct drm_mm *mm,
                        unsigned long start,
                        unsigned long size);