Merge branch 'drm-patches' of ssh://master.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6

* 'drm-patches' of ssh://master.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6:
  drm: convert drawable code to using idr
  drm: convert drm context code to use Linux idr

4 files changed, 93 insertions, 312 deletions

diff --git a/drivers/char/drm/drmP.h b/drivers/char/drm/drmP.h
index 1277693e9ca4..0df87fc3dcb2 100644
--- a/drivers/char/drm/drmP.h
+++ b/drivers/char/drm/drmP.h
@@ -75,6 +75,8 @@
 #include <asm/pgalloc.h>
 #include "drm.h"
 
+#include <linux/idr.h>
+
 #define __OS_HAS_AGP (defined(CONFIG_AGP) || (defined(CONFIG_AGP_MODULE) && defined(MODULE)))
 #define __OS_HAS_MTRR (defined(CONFIG_MTRR))
 
@@ -676,8 +678,7 @@ struct drm_device {
         int ctx_count;                  /**< Number of context handles */
         struct mutex ctxlist_mutex;     /**< For ctxlist */
 
-        struct drm_map **context_sareas;            /**< per-context SAREA's */
-        int max_context;
+        struct idr ctx_idr;
 
         struct list_head vmalist;       /**< List of vmas (for debugging) */
         struct drm_lock_data lock;      /**< Information on hardware lock */
@@ -750,10 +751,7 @@ struct drm_device {
         /** \name Drawable information */
         /*@{ */
         spinlock_t drw_lock;
-        unsigned int drw_bitfield_length;
-        u32 *drw_bitfield;
-        unsigned int drw_info_length;
-        struct drm_drawable_info **drw_info;
+        struct idr drw_idr;
         /*@} */
 };
 
@@ -903,6 +901,7 @@ extern int drm_update_drawable_info(struct inode *inode, struct file *filp,
                        unsigned int cmd, unsigned long arg);
 extern struct drm_drawable_info *drm_get_drawable_info(struct drm_device *dev,
                                                   drm_drawable_t id);
+extern void drm_drawable_free_all(struct drm_device *dev);
 
                                 /* Authentication IOCTL support (drm_auth.h) */
 extern int drm_getmagic(struct inode *inode, struct file *filp,
diff --git a/drivers/char/drm/drm_context.c b/drivers/char/drm/drm_context.c
index 7fc055adec25..61ad986baa8d 100644
--- a/drivers/char/drm/drm_context.c
+++ b/drivers/char/drm/drm_context.c
@@ -53,26 +53,14 @@
  * \param ctx_handle context handle.
  *
  * Clears the bit specified by \p ctx_handle in drm_device::ctx_bitmap and the entry
- * in drm_device::context_sareas, while holding the drm_device::struct_mutex
+ * in drm_device::ctx_idr, while holding the drm_device::struct_mutex
  * lock.
  */
 void drm_ctxbitmap_free(struct drm_device * dev, int ctx_handle)
 {
-        if (ctx_handle < 0)
-                goto failed;
-        if (!dev->ctx_bitmap)
-                goto failed;
-
-        if (ctx_handle < DRM_MAX_CTXBITMAP) {
-                mutex_lock(&dev->struct_mutex);
-                clear_bit(ctx_handle, dev->ctx_bitmap);
-                dev->context_sareas[ctx_handle] = NULL;
-                mutex_unlock(&dev->struct_mutex);
-                return;
-        }
-      failed:
-        DRM_ERROR("Attempt to free invalid context handle: %d\n", ctx_handle);
-        return;
+        mutex_lock(&dev->struct_mutex);
+        idr_remove(&dev->ctx_idr, ctx_handle);
+        mutex_unlock(&dev->struct_mutex);
 }
 
 /**
@@ -81,62 +69,28 @@ void drm_ctxbitmap_free(struct drm_device * dev, int ctx_handle)
  * \param dev DRM device.
  * \return (non-negative) context handle on success or a negative number on failure.
  *
- * Find the first zero bit in drm_device::ctx_bitmap and (re)allocates
- * drm_device::context_sareas to accommodate the new entry while holding the
+ * Allocate a new idr from drm_device::ctx_idr while holding the
  * drm_device::struct_mutex lock.
  */
 static int drm_ctxbitmap_next(struct drm_device * dev)
 {
-        int bit;
-
-        if (!dev->ctx_bitmap)
-                return -1;
+        int new_id;
+        int ret;
 
+again:
+        if (idr_pre_get(&dev->ctx_idr, GFP_KERNEL) == 0) {
+                DRM_ERROR("Out of memory expanding drawable idr\n");
+                return -ENOMEM;
+        }
         mutex_lock(&dev->struct_mutex);
-        bit = find_first_zero_bit(dev->ctx_bitmap, DRM_MAX_CTXBITMAP);
-        if (bit < DRM_MAX_CTXBITMAP) {
-                set_bit(bit, dev->ctx_bitmap);
-                DRM_DEBUG("drm_ctxbitmap_next bit : %d\n", bit);
-                if ((bit + 1) > dev->max_context) {
-                        dev->max_context = (bit + 1);
-                        if (dev->context_sareas) {
-                                struct drm_map **ctx_sareas;
-
-                                ctx_sareas = drm_realloc(dev->context_sareas,
-                                                         (dev->max_context -
-                                                          1) *
-                                                         sizeof(*dev->
-                                                                context_sareas),
-                                                         dev->max_context *
-                                                         sizeof(*dev->
-                                                                context_sareas),
-                                                         DRM_MEM_MAPS);
-                                if (!ctx_sareas) {
-                                        clear_bit(bit, dev->ctx_bitmap);
-                                        mutex_unlock(&dev->struct_mutex);
-                                        return -1;
-                                }
-                                dev->context_sareas = ctx_sareas;
-                                dev->context_sareas[bit] = NULL;
-                        } else {
-                                /* max_context == 1 at this point */
-                                dev->context_sareas =
-                                    drm_alloc(dev->max_context *
-                                              sizeof(*dev->context_sareas),
-                                              DRM_MEM_MAPS);
-                                if (!dev->context_sareas) {
-                                        clear_bit(bit, dev->ctx_bitmap);
-                                        mutex_unlock(&dev->struct_mutex);
-                                        return -1;
-                                }
-                                dev->context_sareas[bit] = NULL;
-                        }
-                }
+        ret = idr_get_new_above(&dev->ctx_idr, NULL,
+                                DRM_RESERVED_CONTEXTS, &new_id);
+        if (ret == -EAGAIN) {
                 mutex_unlock(&dev->struct_mutex);
-                return bit;
+                goto again;
         }
         mutex_unlock(&dev->struct_mutex);
-        return -1;
+        return new_id;
 }
 
 /**
@@ -144,31 +98,11 @@ static int drm_ctxbitmap_next(struct drm_device * dev)
  *
  * \param dev DRM device.
  *
- * Allocates and initialize drm_device::ctx_bitmap and drm_device::context_sareas, while holding
- * the drm_device::struct_mutex lock.
+ * Initialise the drm_device::ctx_idr
  */
 int drm_ctxbitmap_init(struct drm_device * dev)
 {
-        int i;
-        int temp;
-
-        mutex_lock(&dev->struct_mutex);
-        dev->ctx_bitmap = (unsigned long *)drm_alloc(PAGE_SIZE,
-                                                     DRM_MEM_CTXBITMAP);
-        if (dev->ctx_bitmap == NULL) {
-                mutex_unlock(&dev->struct_mutex);
-                return -ENOMEM;
-        }
-        memset((void *)dev->ctx_bitmap, 0, PAGE_SIZE);
-        dev->context_sareas = NULL;
-        dev->max_context = -1;
-        mutex_unlock(&dev->struct_mutex);
-
-        for (i = 0; i < DRM_RESERVED_CONTEXTS; i++) {
-                temp = drm_ctxbitmap_next(dev);
-                DRM_DEBUG("drm_ctxbitmap_init : %d\n", temp);
-        }
-
+        idr_init(&dev->ctx_idr);
         return 0;
 }
 
@@ -177,17 +111,13 @@ int drm_ctxbitmap_init(struct drm_device * dev)
  *
  * \param dev DRM device.
  *
- * Frees drm_device::ctx_bitmap and drm_device::context_sareas, while holding
- * the drm_device::struct_mutex lock.
+ * Free all idr members using drm_ctx_sarea_free helper function
+ * while holding the drm_device::struct_mutex lock.
  */
 void drm_ctxbitmap_cleanup(struct drm_device * dev)
 {
         mutex_lock(&dev->struct_mutex);
-        if (dev->context_sareas)
-                drm_free(dev->context_sareas,
-                         sizeof(*dev->context_sareas) *
-                         dev->max_context, DRM_MEM_MAPS);
-        drm_free((void *)dev->ctx_bitmap, PAGE_SIZE, DRM_MEM_CTXBITMAP);
+        idr_remove_all(&dev->ctx_idr);
         mutex_unlock(&dev->struct_mutex);
 }
 
@@ -206,7 +136,7 @@ void drm_ctxbitmap_cleanup(struct drm_device * dev)
  * \param arg user argument pointing to a drm_ctx_priv_map structure.
  * \return zero on success or a negative number on failure.
  *
- * Gets the map from drm_device::context_sareas with the handle specified and
+ * Gets the map from drm_device::ctx_idr with the handle specified and
  * returns its handle.
  */
 int drm_getsareactx(struct inode *inode, struct file *filp,
@@ -223,13 +153,13 @@ int drm_getsareactx(struct inode *inode, struct file *filp,
                 return -EFAULT;
 
         mutex_lock(&dev->struct_mutex);
-        if (dev->max_context < 0
-            || request.ctx_id >= (unsigned)dev->max_context) {
+
+        map = idr_find(&dev->ctx_idr, request.ctx_id);
+        if (!map) {
                 mutex_unlock(&dev->struct_mutex);
                 return -EINVAL;
         }
 
-        map = dev->context_sareas[request.ctx_id];
         mutex_unlock(&dev->struct_mutex);
 
         request.handle = NULL;
@@ -258,7 +188,7 @@ int drm_getsareactx(struct inode *inode, struct file *filp,
  * \return zero on success or a negative number on failure.
  *
  * Searches the mapping specified in \p arg and update the entry in
- * drm_device::context_sareas with it.
+ * drm_device::ctx_idr with it.
  */
 int drm_setsareactx(struct inode *inode, struct file *filp,
                     unsigned int cmd, unsigned long arg)
@@ -288,11 +218,10 @@ int drm_setsareactx(struct inode *inode, struct file *filp,
         map = r_list->map;
         if (!map)
                 goto bad;
-        if (dev->max_context < 0)
-                goto bad;
-        if (request.ctx_id >= (unsigned)dev->max_context)
+
+        if (IS_ERR(idr_replace(&dev->ctx_idr, map, request.ctx_id)))
                 goto bad;
-        dev->context_sareas[request.ctx_id] = map;
+
         mutex_unlock(&dev->struct_mutex);
         return 0;
 }
diff --git a/drivers/char/drm/drm_drawable.c b/drivers/char/drm/drm_drawable.c
index 309e585a5442..d6cdba5644e2 100644
--- a/drivers/char/drm/drm_drawable.c
+++ b/drivers/char/drm/drm_drawable.c
@@ -44,82 +44,29 @@ int drm_adddraw(DRM_IOCTL_ARGS)
 {
         DRM_DEVICE;
         unsigned long irqflags;
-        int i, j;
-        u32 *bitfield = dev->drw_bitfield;
-        unsigned int bitfield_length = dev->drw_bitfield_length;
-        struct drm_drawable_info **info = dev->drw_info;
-        unsigned int info_length = dev->drw_info_length;
         struct drm_draw draw;
+        int new_id = 0;
+        int ret;
 
-        for (i = 0, j = 0; i < bitfield_length; i++) {
-                if (bitfield[i] == ~0)
-                        continue;
-
-                for (; j < 8 * sizeof(*bitfield); j++)
-                        if (!(bitfield[i] & (1 << j)))
-                                goto done;
-        }
-done:
-
-        if (i == bitfield_length) {
-                bitfield_length++;
-
-                bitfield = drm_alloc(bitfield_length * sizeof(*bitfield),
-                                     DRM_MEM_BUFS);
-
-                if (!bitfield) {
-                        DRM_ERROR("Failed to allocate new drawable bitfield\n");
-                        return DRM_ERR(ENOMEM);
-                }
-
-                if (8 * sizeof(*bitfield) * bitfield_length > info_length) {
-                        info_length += 8 * sizeof(*bitfield);
-
-                        info = drm_alloc(info_length * sizeof(*info),
-                                         DRM_MEM_BUFS);
-
-                        if (!info) {
-                                DRM_ERROR("Failed to allocate new drawable info"
-                                          " array\n");
-
-                                drm_free(bitfield,
-                                         bitfield_length * sizeof(*bitfield),
-                                         DRM_MEM_BUFS);
-                                return DRM_ERR(ENOMEM);
-                        }
-                }
-
-                bitfield[i] = 0;
+again:
+        if (idr_pre_get(&dev->drw_idr, GFP_KERNEL) == 0) {
+                DRM_ERROR("Out of memory expanding drawable idr\n");
+                return -ENOMEM;
         }
 
-        draw.handle = i * 8 * sizeof(*bitfield) + j + 1;
-        DRM_DEBUG("%d\n", draw.handle);
-
         spin_lock_irqsave(&dev->drw_lock, irqflags);
-
-        bitfield[i] |= 1 << j;
-        info[draw.handle - 1] = NULL;
-
-        if (bitfield != dev->drw_bitfield) {
-                memcpy(bitfield, dev->drw_bitfield, dev->drw_bitfield_length *
-                       sizeof(*bitfield));
-                drm_free(dev->drw_bitfield, sizeof(*bitfield) *
-                         dev->drw_bitfield_length, DRM_MEM_BUFS);
-                dev->drw_bitfield = bitfield;
-                dev->drw_bitfield_length = bitfield_length;
-        }
-
-        if (info != dev->drw_info) {
-                memcpy(info, dev->drw_info, dev->drw_info_length *
-                       sizeof(*info));
-                drm_free(dev->drw_info, sizeof(*info) * dev->drw_info_length,
-                         DRM_MEM_BUFS);
-                dev->drw_info = info;
-                dev->drw_info_length = info_length;
+        ret = idr_get_new_above(&dev->drw_idr, NULL, 1, &new_id);
+        if (ret == -EAGAIN) {
+                spin_unlock_irqrestore(&dev->drw_lock, irqflags);
+                goto again;
         }
 
         spin_unlock_irqrestore(&dev->drw_lock, irqflags);
 
+        draw.handle = new_id;
+
+        DRM_DEBUG("%d\n", draw.handle);
+
         DRM_COPY_TO_USER_IOCTL((struct drm_draw __user *)data, draw, sizeof(draw));
 
         return 0;
@@ -132,133 +79,44 @@ int drm_rmdraw(DRM_IOCTL_ARGS)
 {
         DRM_DEVICE;
         struct drm_draw draw;
-        int id, idx;
-        unsigned int shift;
         unsigned long irqflags;
-        u32 *bitfield = dev->drw_bitfield;
-        unsigned int bitfield_length = dev->drw_bitfield_length;
-        struct drm_drawable_info **info = dev->drw_info;
-        unsigned int info_length = dev->drw_info_length;
 
         DRM_COPY_FROM_USER_IOCTL(draw, (struct drm_draw __user *) data,
                                  sizeof(draw));
 
-        id = draw.handle - 1;
-        idx = id / (8 * sizeof(*bitfield));
-        shift = id % (8 * sizeof(*bitfield));
-
-        if (idx < 0 || idx >= bitfield_length ||
-            !(bitfield[idx] & (1 << shift))) {
-                DRM_DEBUG("No such drawable %d\n", draw.handle);
-                return 0;
-        }
-
         spin_lock_irqsave(&dev->drw_lock, irqflags);
 
-        bitfield[idx] &= ~(1 << shift);
-
-        spin_unlock_irqrestore(&dev->drw_lock, irqflags);
-
-        if (info[id]) {
-                drm_free(info[id]->rects, info[id]->num_rects *
-                         sizeof(struct drm_clip_rect), DRM_MEM_BUFS);
-                drm_free(info[id], sizeof(**info), DRM_MEM_BUFS);
-        }
-
-        /* Can we shrink the arrays? */
-        if (idx == bitfield_length - 1) {
-                while (idx >= 0 && !bitfield[idx])
-                        --idx;
-
-                bitfield_length = idx + 1;
-
-                bitfield = NULL;
-
-                if (bitfield_length) {
-                        if (bitfield_length != dev->drw_bitfield_length)
-                                bitfield = drm_alloc(bitfield_length *
-                                                     sizeof(*bitfield),
-                                                     DRM_MEM_BUFS);
-
-                        if (!bitfield) {
-                                bitfield = dev->drw_bitfield;
-                                bitfield_length = dev->drw_bitfield_length;
-                        }
-                }
-        }
-
-        if (bitfield != dev->drw_bitfield) {
-                info_length = 8 * sizeof(*bitfield) * bitfield_length;
-
-                if (info_length) {
-                        info = drm_alloc(info_length * sizeof(*info),
-                                         DRM_MEM_BUFS);
-
-                        if (!info) {
-                                info = dev->drw_info;
-                                info_length = dev->drw_info_length;
-                        }
-                } else
-                        info = NULL;
-
-                spin_lock_irqsave(&dev->drw_lock, irqflags);
-
-                if (bitfield)
-                        memcpy(bitfield, dev->drw_bitfield, bitfield_length *
-                               sizeof(*bitfield));
-                drm_free(dev->drw_bitfield, sizeof(*bitfield) *
-                         dev->drw_bitfield_length, DRM_MEM_BUFS);
-                dev->drw_bitfield = bitfield;
-                dev->drw_bitfield_length = bitfield_length;
-
-                if (info != dev->drw_info) {
-                        if (info)
-                                memcpy(info, dev->drw_info, info_length *
-                                       sizeof(*info));
-                        drm_free(dev->drw_info, sizeof(*info) *
-                                 dev->drw_info_length, DRM_MEM_BUFS);
-                        dev->drw_info = info;
-                        dev->drw_info_length = info_length;
-                }
+        drm_free(drm_get_drawable_info(dev, draw.handle),
+                 sizeof(struct drm_drawable_info), DRM_MEM_BUFS);
 
-                spin_unlock_irqrestore(&dev->drw_lock, irqflags);
-        }
+        idr_remove(&dev->drw_idr, draw.handle);
 
+        spin_unlock_irqrestore(&dev->drw_lock, irqflags);
         DRM_DEBUG("%d\n", draw.handle);
         return 0;
 }
 
-int drm_update_drawable_info(DRM_IOCTL_ARGS) {
+int drm_update_drawable_info(DRM_IOCTL_ARGS)
+{
         DRM_DEVICE;
         struct drm_update_draw update;
-        unsigned int id, idx, shift;
-        u32 *bitfield = dev->drw_bitfield;
-        unsigned long irqflags, bitfield_length = dev->drw_bitfield_length;
-        struct drm_drawable_info *info;
+        unsigned long irqflags;
         struct drm_clip_rect *rects;
+        struct drm_drawable_info *info;
         int err;
 
         DRM_COPY_FROM_USER_IOCTL(update, (struct drm_update_draw __user *) data,
                                  sizeof(update));
 
-        id = update.handle - 1;
-        idx = id / (8 * sizeof(*bitfield));
-        shift = id % (8 * sizeof(*bitfield));
-
-        if (idx < 0 || idx >= bitfield_length ||
-            !(bitfield[idx] & (1 << shift))) {
-                DRM_ERROR("No such drawable %d\n", update.handle);
-                return DRM_ERR(EINVAL);
-        }
-
-        info = dev->drw_info[id];
-
+        info = idr_find(&dev->drw_idr, update.handle);
         if (!info) {
-                info = drm_calloc(1, sizeof(struct drm_drawable_info), DRM_MEM_BUFS);
-
-                if (!info) {
-                        DRM_ERROR("Failed to allocate drawable info memory\n");
-                        return DRM_ERR(ENOMEM);
+                info = drm_calloc(1, sizeof(*info), DRM_MEM_BUFS);
+                if (!info)
+                        return -ENOMEM;
+                if (IS_ERR(idr_replace(&dev->drw_idr, info, update.handle))) {
+                        DRM_ERROR("No such drawable %d\n", update.handle);
+                        drm_free(info, sizeof(*info), DRM_MEM_BUFS);
+                        return -EINVAL;
                 }
         }
 
@@ -295,12 +153,11 @@ int drm_update_drawable_info(DRM_IOCTL_ARGS) {
 
                 info->rects = rects;
                 info->num_rects = update.num;
-                dev->drw_info[id] = info;
 
                 spin_unlock_irqrestore(&dev->drw_lock, irqflags);
 
                 DRM_DEBUG("Updated %d cliprects for drawable %d\n",
-                          info->num_rects, id);
+                          info->num_rects, update.handle);
                 break;
         default:
                 DRM_ERROR("Invalid update type %d\n", update.type);
@@ -310,11 +167,9 @@ int drm_update_drawable_info(DRM_IOCTL_ARGS) {
         return 0;
 
 error:
-        if (!dev->drw_info[id])
-                drm_free(info, sizeof(*info), DRM_MEM_BUFS);
-        else if (rects != dev->drw_info[id]->rects)
-                drm_free(rects, update.num *
-                         sizeof(struct drm_clip_rect), DRM_MEM_BUFS);
+        if (rects != info->rects)
+                drm_free(rects, update.num * sizeof(struct drm_clip_rect),
+                         DRM_MEM_BUFS);
 
         return err;
 }
@@ -322,20 +177,27 @@ error:
 /**
  * Caller must hold the drawable spinlock!
  */
-struct drm_drawable_info *drm_get_drawable_info(struct drm_device *dev, drm_drawable_t id) {
-        u32 *bitfield = dev->drw_bitfield;
-        unsigned int idx, shift;
-
-        id--;
-        idx = id / (8 * sizeof(*bitfield));
-        shift = id % (8 * sizeof(*bitfield));
-
-        if (idx < 0 || idx >= dev->drw_bitfield_length ||
-            !(bitfield[idx] & (1 << shift))) {
-                DRM_DEBUG("No such drawable %d\n", id);
-                return NULL;
+struct drm_drawable_info *drm_get_drawable_info(struct drm_device *dev, drm_drawable_t id)
+{
+        return idr_find(&dev->drw_idr, id);
+}
+EXPORT_SYMBOL(drm_get_drawable_info);
+
+static int drm_drawable_free(int idr, void *p, void *data)
+{
+        struct drm_drawable_info *info = p;
+
+        if (info) {
+                drm_free(info->rects, info->num_rects *
+                         sizeof(struct drm_clip_rect), DRM_MEM_BUFS);
+                drm_free(info, sizeof(*info), DRM_MEM_BUFS);
         }
 
-        return dev->drw_info[id];
+        return 0;
+}
+
+void drm_drawable_free_all(struct drm_device *dev)
+{
+        idr_for_each(&dev->drw_idr, drm_drawable_free, NULL);
+        idr_remove_all(&dev->drw_idr);
 }
-EXPORT_SYMBOL(drm_get_drawable_info);
diff --git a/drivers/char/drm/drm_drv.c b/drivers/char/drm/drm_drv.c
index d5cf5cfccf78..19994cd865de 100644
--- a/drivers/char/drm/drm_drv.c
+++ b/drivers/char/drm/drm_drv.c
@@ -151,19 +151,10 @@ int drm_lastclose(struct drm_device * dev)
         if (dev->irq_enabled)
                 drm_irq_uninstall(dev);
 
-        /* Free drawable information memory */
-        for (i = 0; i < dev->drw_bitfield_length / sizeof(*dev->drw_bitfield);
-             i++) {
-                struct drm_drawable_info *info = drm_get_drawable_info(dev, i);
-
-                if (info) {
-                        drm_free(info->rects, info->num_rects *
-                                 sizeof(struct drm_clip_rect), DRM_MEM_BUFS);
-                        drm_free(info, sizeof(*info), DRM_MEM_BUFS);
-                }
-        }
-
         mutex_lock(&dev->struct_mutex);
+
+        /* Free drawable information memory */
+        drm_drawable_free_all(dev);
         del_timer(&dev->timer);
 
         /* Clear pid list */