From patchwork Fri Jul 22 16:41:14 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonathan Cameron X-Patchwork-Id: 1000312 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by demeter1.kernel.org (8.14.4/8.14.4) with ESMTP id p6MI8UBO021448 for ; Fri, 22 Jul 2011 18:08:50 GMT Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 556799E9E6 for ; Fri, 22 Jul 2011 11:08:30 -0700 (PDT) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from ppsw-51.csi.cam.ac.uk (ppsw-51.csi.cam.ac.uk [131.111.8.151]) by gabe.freedesktop.org (Postfix) with ESMTP id 98ACF9E81B for ; Fri, 22 Jul 2011 10:13:53 -0700 (PDT) X-Cam-AntiVirus: no malware found X-Cam-SpamDetails: not scanned X-Cam-ScannerInfo: http://www.cam.ac.uk/cs/email/scanner/ Received: from arcturus.eng.cam.ac.uk ([129.169.154.73]:58777 helo=localhost.eng.cam.ac.uk) by ppsw-51.csi.cam.ac.uk (smtp.hermes.cam.ac.uk [131.111.8.158]:465) with esmtpsa (LOGIN:jic23) (TLSv1:DHE-RSA-AES256-SHA:256) id 1QkImy-0004Oy-XJ (Exim 4.72) (return-path ); Fri, 22 Jul 2011 17:41:24 +0100 From: Jonathan Cameron To: linux-kernel@vger.kernel.org Subject: [PATCH 5/8] drm/vmwgfx: use ida_simple_get for id allocation. Date: Fri, 22 Jul 2011 17:41:14 +0100 Message-Id: <1311352886-4047-6-git-send-email-jic23@cam.ac.uk> X-Mailer: git-send-email 1.7.3.4 In-Reply-To: <1311352886-4047-1-git-send-email-jic23@cam.ac.uk> References: <1311352886-4047-1-git-send-email-jic23@cam.ac.uk> X-Mailman-Approved-At: Fri, 22 Jul 2011 11:08:15 -0700 Cc: randy.dunlap@oracle.com, dri-devel@lists.freedesktop.org, Jonathan Cameron , guenter.roeck@ericsson.com, johnpol@2ka.mipt.ru, thellstrom@vmware.com, linux-scsi@vger.kernel.org, JBottomley@parallels.com, lm-sensors@lm-sensors.org, bharrosh@panasas.com, airlied@redhat.com, paulmck@linux.vnet.ibm.com, naota@elisp.net, rtc-linux@googlegroups.com, namhyung@gmail.com, rusty@rustcorp.com.au, khali@linux-fr.org, osd-dev@open-osd.org, akpm@linux-foundation.org, a.zummo@towertech.it, jkosina@suse.cz, cabarnes@indesign-llc.com, tj@kernel.org, bhalevy@panasas.com X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.11 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-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Fri, 22 Jul 2011 18:08:50 +0000 (UTC) Some messing with error codes to return 0 on out id's and match current situation. Is this necessary? Looks a touch 'interesting'. Signed-off-by: Jonathan Cameron --- drivers/gpu/drm/vmwgfx/vmwgfx_gmrid_manager.c | 34 ++++++------------------- 1 files changed, 8 insertions(+), 26 deletions(-) diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_gmrid_manager.c b/drivers/gpu/drm/vmwgfx/vmwgfx_gmrid_manager.c index ac6e0d1..d51577b 100644 --- a/drivers/gpu/drm/vmwgfx/vmwgfx_gmrid_manager.c +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_gmrid_manager.c @@ -37,7 +37,6 @@ #include struct vmwgfx_gmrid_man { - spinlock_t lock; struct ida gmr_ida; uint32_t max_gmr_ids; }; @@ -49,34 +48,20 @@ static int vmw_gmrid_man_get_node(struct ttm_mem_type_manager *man, { struct vmwgfx_gmrid_man *gman = (struct vmwgfx_gmrid_man *)man->priv; - int ret; int id; mem->mm_node = NULL; - do { - if (unlikely(ida_pre_get(&gman->gmr_ida, GFP_KERNEL) == 0)) - return -ENOMEM; - - spin_lock(&gman->lock); - ret = ida_get_new(&gman->gmr_ida, &id); - - if (unlikely(ret == 0 && id >= gman->max_gmr_ids)) { - ida_remove(&gman->gmr_ida, id); - spin_unlock(&gman->lock); + id = ida_simple_get(&gman->gmr_ida, 0, gman->max_gmr_ids, GFP_KERNEL); + if (id < 0) { + if (id == -ENOSPC) return 0; - } - - spin_unlock(&gman->lock); - - } while (ret == -EAGAIN); - - if (likely(ret == 0)) { - mem->mm_node = gman; - mem->start = id; + return id; } + mem->mm_node = gman; + mem->start = id; - return ret; + return 0; } static void vmw_gmrid_man_put_node(struct ttm_mem_type_manager *man, @@ -86,9 +71,7 @@ static void vmw_gmrid_man_put_node(struct ttm_mem_type_manager *man, (struct vmwgfx_gmrid_man *)man->priv; if (mem->mm_node) { - spin_lock(&gman->lock); - ida_remove(&gman->gmr_ida, mem->start); - spin_unlock(&gman->lock); + ida_simple_remove(&gman->gmr_ida, mem->start); mem->mm_node = NULL; } } @@ -102,7 +85,6 @@ static int vmw_gmrid_man_init(struct ttm_mem_type_manager *man, if (unlikely(gman == NULL)) return -ENOMEM; - spin_lock_init(&gman->lock); ida_init(&gman->gmr_ida); gman->max_gmr_ids = p_size; man->priv = (void *) gman;