diff options
author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2013-07-10 08:11:57 -0400 |
---|---|---|
committer | Dave Airlie <airlied@gmail.com> | 2013-07-23 06:13:49 -0400 |
commit | 04420c9c6a6d027511218b37ad986b9093667a91 (patch) | |
tree | 0f1a2937765346f6ec9a6911b6123b79c77c1862 | |
parent | bd0c0ceef6b1e7cb8c5dc1c9c6d168bae6bccaa0 (diff) |
drm/bufs: s/drm_order/order_base_2/
The version offered by the core is ridiculously optimized and
does the same thing. So use it.
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Dave Airlie <airlied@gmail.com>
-rw-r--r-- | drivers/gpu/drm/drm_bufs.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/gpu/drm/drm_bufs.c b/drivers/gpu/drm/drm_bufs.c index 9d09f4c48a4e..c5bbcaaa73c0 100644 --- a/drivers/gpu/drm/drm_bufs.c +++ b/drivers/gpu/drm/drm_bufs.c | |||
@@ -243,7 +243,7 @@ static int drm_addmap_core(struct drm_device * dev, resource_size_t offset, | |||
243 | } | 243 | } |
244 | map->handle = vmalloc_user(map->size); | 244 | map->handle = vmalloc_user(map->size); |
245 | DRM_DEBUG("%lu %d %p\n", | 245 | DRM_DEBUG("%lu %d %p\n", |
246 | map->size, drm_order(map->size), map->handle); | 246 | map->size, order_base_2(map->size), map->handle); |
247 | if (!map->handle) { | 247 | if (!map->handle) { |
248 | kfree(map); | 248 | kfree(map); |
249 | return -ENOMEM; | 249 | return -ENOMEM; |
@@ -630,7 +630,7 @@ int drm_addbufs_agp(struct drm_device * dev, struct drm_buf_desc * request) | |||
630 | return -EINVAL; | 630 | return -EINVAL; |
631 | 631 | ||
632 | count = request->count; | 632 | count = request->count; |
633 | order = drm_order(request->size); | 633 | order = order_base_2(request->size); |
634 | size = 1 << order; | 634 | size = 1 << order; |
635 | 635 | ||
636 | alignment = (request->flags & _DRM_PAGE_ALIGN) | 636 | alignment = (request->flags & _DRM_PAGE_ALIGN) |
@@ -800,7 +800,7 @@ int drm_addbufs_pci(struct drm_device * dev, struct drm_buf_desc * request) | |||
800 | return -EPERM; | 800 | return -EPERM; |
801 | 801 | ||
802 | count = request->count; | 802 | count = request->count; |
803 | order = drm_order(request->size); | 803 | order = order_base_2(request->size); |
804 | size = 1 << order; | 804 | size = 1 << order; |
805 | 805 | ||
806 | DRM_DEBUG("count=%d, size=%d (%d), order=%d\n", | 806 | DRM_DEBUG("count=%d, size=%d (%d), order=%d\n", |
@@ -1002,7 +1002,7 @@ static int drm_addbufs_sg(struct drm_device * dev, struct drm_buf_desc * request | |||
1002 | return -EPERM; | 1002 | return -EPERM; |
1003 | 1003 | ||
1004 | count = request->count; | 1004 | count = request->count; |
1005 | order = drm_order(request->size); | 1005 | order = order_base_2(request->size); |
1006 | size = 1 << order; | 1006 | size = 1 << order; |
1007 | 1007 | ||
1008 | alignment = (request->flags & _DRM_PAGE_ALIGN) | 1008 | alignment = (request->flags & _DRM_PAGE_ALIGN) |
@@ -1157,7 +1157,7 @@ static int drm_addbufs_fb(struct drm_device * dev, struct drm_buf_desc * request | |||
1157 | return -EPERM; | 1157 | return -EPERM; |
1158 | 1158 | ||
1159 | count = request->count; | 1159 | count = request->count; |
1160 | order = drm_order(request->size); | 1160 | order = order_base_2(request->size); |
1161 | size = 1 << order; | 1161 | size = 1 << order; |
1162 | 1162 | ||
1163 | alignment = (request->flags & _DRM_PAGE_ALIGN) | 1163 | alignment = (request->flags & _DRM_PAGE_ALIGN) |
@@ -1435,7 +1435,7 @@ int drm_markbufs(struct drm_device *dev, void *data, | |||
1435 | 1435 | ||
1436 | DRM_DEBUG("%d, %d, %d\n", | 1436 | DRM_DEBUG("%d, %d, %d\n", |
1437 | request->size, request->low_mark, request->high_mark); | 1437 | request->size, request->low_mark, request->high_mark); |
1438 | order = drm_order(request->size); | 1438 | order = order_base_2(request->size); |
1439 | if (order < DRM_MIN_ORDER || order > DRM_MAX_ORDER) | 1439 | if (order < DRM_MIN_ORDER || order > DRM_MAX_ORDER) |
1440 | return -EINVAL; | 1440 | return -EINVAL; |
1441 | entry = &dma->bufs[order]; | 1441 | entry = &dma->bufs[order]; |