From patchwork Wed Jul 10 12:11:57 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 2825684 Return-Path: X-Original-To: patchwork-dri-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 7FE3D9F968 for ; Wed, 10 Jul 2013 12:32:14 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 540162014C for ; Wed, 10 Jul 2013 12:32:13 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 9FA422011D for ; Wed, 10 Jul 2013 12:32:08 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 67ECBE62D4 for ; Wed, 10 Jul 2013 05:32:08 -0700 (PDT) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-ee0-f54.google.com (mail-ee0-f54.google.com [74.125.83.54]) by gabe.freedesktop.org (Postfix) with ESMTP id 704EDE5EDC for ; Wed, 10 Jul 2013 05:12:54 -0700 (PDT) Received: by mail-ee0-f54.google.com with SMTP id t10so4782676eei.41 for ; Wed, 10 Jul 2013 05:12:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ffwll.ch; s=google; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; bh=/1DIlWiI9W/0oww3ta+cFZ7zScarE4EkUlJLDaynwGs=; b=JaAyiWyGe4q/9RTFkkV922UC+Hr0ipzJSVF5LmEaNcCASKU9T6hUOt8rm8aHJ+G0cm WeNMidKLFlcBBaHccm+vin6qWziD5nsys3jWf2wAHSmro0nwcaFtqb9TcTrbm3AZvgPc xAnEPzD/mH90lU4ibQnKoLIWkwVLU1hMd+Pc4= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references :x-gm-message-state; bh=/1DIlWiI9W/0oww3ta+cFZ7zScarE4EkUlJLDaynwGs=; b=av8QMlmoD7gaeHN3i7S0gGv82zZW7C7NDBbzpDO4qlQf87hvdGu6sQ/OblxAoTnA45 yfDIJEh0v+eISXdDJmwuxRVhYQdstWIj8xGE64vRp0oNEih2cS6JB1PoiDccnUtzBA/m 3SP/ZP3zN0bg3YYy6znMjxE0EsSD4uupxyR5dGr/RQ//5GmNJNL1p05h8aZHki63WDvV JS4tQW55i2g2V2NJV/JCIh+7UtEOIYUm/ksSMB0BFBYZL32bfPVAVAa8fap0TD6rpYzn 5xD4CwGNUkGFF8pM625D70toLBt9Q7xlatwQ+AigOES+c0SiEKBpnIpIgr+ypEUny+ti cgOQ== X-Received: by 10.14.209.197 with SMTP id s45mr36161689eeo.108.1373458373510; Wed, 10 Jul 2013 05:12:53 -0700 (PDT) Received: from phenom.ffwll.local (178-83-130-250.dynamic.hispeed.ch. [178.83.130.250]) by mx.google.com with ESMTPSA id i2sm59527012eeu.4.2013.07.10.05.12.52 for (version=TLSv1.2 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 10 Jul 2013 05:12:52 -0700 (PDT) From: Daniel Vetter To: DRI Development Subject: [PATCH 23/39] drm/bufs: s/drm_order/order_base_2/ Date: Wed, 10 Jul 2013 14:11:57 +0200 Message-Id: <1373458333-5988-24-git-send-email-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 1.8.3.2 In-Reply-To: <1373458333-5988-1-git-send-email-daniel.vetter@ffwll.ch> References: <1373458333-5988-1-git-send-email-daniel.vetter@ffwll.ch> X-Gm-Message-State: ALoCoQljNUozjyg+ZswQMYAtLEGkBTY0VqREFvV/popV4sU9fD9MU5SLEGdtrcjyJy9JNzzJQpxm Cc: Daniel Vetter X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: dri-devel-bounces+patchwork-dri-devel=patchwork.kernel.org@lists.freedesktop.org Errors-To: dri-devel-bounces+patchwork-dri-devel=patchwork.kernel.org@lists.freedesktop.org X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,RP_MATCHES_RCVD,T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The version offered by the core is ridiculously optimized and does the same thing. So use it. Signed-off-by: Daniel Vetter --- drivers/gpu/drm/drm_bufs.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/gpu/drm/drm_bufs.c b/drivers/gpu/drm/drm_bufs.c index 6a0ff32..31a971d 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, } map->handle = vmalloc_user(map->size); DRM_DEBUG("%lu %d %p\n", - map->size, drm_order(map->size), map->handle); + map->size, order_base_2(map->size), map->handle); if (!map->handle) { kfree(map); return -ENOMEM; @@ -630,7 +630,7 @@ int drm_addbufs_agp(struct drm_device * dev, struct drm_buf_desc * request) return -EINVAL; count = request->count; - order = drm_order(request->size); + order = order_base_2(request->size); size = 1 << order; alignment = (request->flags & _DRM_PAGE_ALIGN) @@ -800,7 +800,7 @@ int drm_addbufs_pci(struct drm_device * dev, struct drm_buf_desc * request) return -EPERM; count = request->count; - order = drm_order(request->size); + order = order_base_2(request->size); size = 1 << order; 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 return -EPERM; count = request->count; - order = drm_order(request->size); + order = order_base_2(request->size); size = 1 << order; alignment = (request->flags & _DRM_PAGE_ALIGN) @@ -1157,7 +1157,7 @@ static int drm_addbufs_fb(struct drm_device * dev, struct drm_buf_desc * request return -EPERM; count = request->count; - order = drm_order(request->size); + order = order_base_2(request->size); size = 1 << order; alignment = (request->flags & _DRM_PAGE_ALIGN) @@ -1444,7 +1444,7 @@ int drm_markbufs(struct drm_device *dev, void *data, DRM_DEBUG("%d, %d, %d\n", request->size, request->low_mark, request->high_mark); - order = drm_order(request->size); + order = order_base_2(request->size); if (order < DRM_MIN_ORDER || order > DRM_MAX_ORDER) return -EINVAL; entry = &dma->bufs[order];