From: Jonathan Cameron <jic23@cam.ac.uk>
To: linux-kernel@vger.kernel.org
Cc: lm-sensors@lm-sensors.org, rtc-linux@googlegroups.com,
osd-dev@open-osd.org, linux-scsi@vger.kernel.org,
dri-devel@lists.freedesktop.org, jkosina@suse.cz,
naota@elisp.net, rusty@rustcorp.com.au,
paulmck@linux.vnet.ibm.com, namhyung@gmail.com,
randy.dunlap@oracle.com, tj@kernel.org,
cabarnes@indesign-llc.com, akpm@linux-foundation.org,
airlied@redhat.com, thellstrom@vmware.com, johnpol@2ka.mipt.ru,
JBottomley@parallels.com, bhalevy@panasas.com,
bharrosh@panasas.com, a.zummo@towertech.it,
guenter.roeck@ericsson.com, khali@linux-fr.org, airlied@linux.ie,
Jonathan Cameron <jic23@cam.ac.uk>
Subject: [PATCH 5/8] drm/vmwgfx: use ida_simple_get for id allocation.
Date: Fri, 22 Jul 2011 17:41:14 +0100 [thread overview]
Message-ID: <1311352886-4047-6-git-send-email-jic23@cam.ac.uk> (raw)
In-Reply-To: <1311352886-4047-1-git-send-email-jic23@cam.ac.uk>
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 <jic23@cam.ac.uk>
---
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 <linux/kernel.h>
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;
--
1.7.3.4
next prev parent reply other threads:[~2011-07-22 16:42 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-07-22 16:41 [PATCH 0/8] RFC: Introduce ida_simple interfaces and use them Jonathan Cameron
2011-07-22 16:41 ` [PATCH 1/8] ida: Simplified functions for id allocation Jonathan Cameron
2011-07-22 16:41 ` [PATCH 2/8] hwmon: convert idr to ida and use ida_simple interface Jonathan Cameron
2011-07-22 16:41 ` [PATCH 3/8] hwmon: ibmaem: convert idr to ida and use ida_simple_get Jonathan Cameron
2011-07-26 18:04 ` Darrick J. Wong
2011-07-22 16:41 ` [PATCH 4/8] [SCSI] use ida_simple_get and ida_simple remove in place of boilerplate code Jonathan Cameron
2011-07-22 16:41 ` Jonathan Cameron [this message]
2011-07-22 16:41 ` [PATCH 6/8] [SCSI] osduld: use ida_simple_get to handle id Jonathan Cameron
2011-07-22 21:47 ` [osd-dev] " Boaz Harrosh
2011-07-25 11:06 ` Jonathan Cameron
2011-07-22 16:41 ` [PATCH 7/8] w1: ds2760 and ds2780, use ida for id and ida_simple_get to get it Jonathan Cameron
2011-07-22 16:41 ` [PATCH 8/8] rtc: class idr converted to ida and ida_simple_get used Jonathan Cameron
2011-07-23 10:17 ` Tejun Heo
2011-07-22 16:41 ` [PATCH 0/8] RFC: Introduce ida_simple interfaces and use them Jonathan Cameron
2011-07-22 16:41 ` [PATCH 1/8] ida: Simplified functions for id allocation Jonathan Cameron
2011-07-23 10:04 ` Tejun Heo
2011-07-22 16:41 ` [PATCH 2/8] hwmon: convert idr to ida and use ida_simple interface Jonathan Cameron
2011-07-22 16:41 ` [PATCH 3/8] hwmon: ibmaem: convert idr to ida and use ida_simple_get Jonathan Cameron
2011-07-22 16:41 ` [PATCH 4/8] [SCSI] use ida_simple_get and ida_simple remove in place of boilerplate code Jonathan Cameron
2011-07-22 16:41 ` [PATCH 5/8] drm/vmwgfx: use ida_simple_get for id allocation Jonathan Cameron
2011-07-22 16:41 ` [PATCH 6/8] [SCSI] osduld: use ida_simple_get to handle id Jonathan Cameron
2011-07-22 16:41 ` [PATCH 7/8] w1: ds2760 and ds2780, use ida for id and ida_simple_get to get it Jonathan Cameron
2011-07-22 16:41 ` [PATCH 8/8] rtc: class idr converted to ida and ida_simple_get used Jonathan Cameron
2011-07-22 16:48 ` [PATCH 0/8] RFC: Introduce ida_simple interfaces and use them Jonathan Cameron
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1311352886-4047-6-git-send-email-jic23@cam.ac.uk \
--to=jic23@cam.ac.uk \
--cc=JBottomley@parallels.com \
--cc=a.zummo@towertech.it \
--cc=airlied@linux.ie \
--cc=airlied@redhat.com \
--cc=akpm@linux-foundation.org \
--cc=bhalevy@panasas.com \
--cc=bharrosh@panasas.com \
--cc=cabarnes@indesign-llc.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=guenter.roeck@ericsson.com \
--cc=jkosina@suse.cz \
--cc=johnpol@2ka.mipt.ru \
--cc=khali@linux-fr.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-scsi@vger.kernel.org \
--cc=lm-sensors@lm-sensors.org \
--cc=namhyung@gmail.com \
--cc=naota@elisp.net \
--cc=osd-dev@open-osd.org \
--cc=paulmck@linux.vnet.ibm.com \
--cc=randy.dunlap@oracle.com \
--cc=rtc-linux@googlegroups.com \
--cc=rusty@rustcorp.com.au \
--cc=thellstrom@vmware.com \
--cc=tj@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®