drm: convert drawable handling to use Linux idr

This cleans this code up a lot and uses the generic Linux idr which is
designed for this.

Signed-off-by: Dave Airlie <airlied@linux.ie>

diff --git a/linux-core/drmP.h b/linux-core/drmP.h
index 6cede35..16d7dbb 100644 (file)
--- a/linux-core/drmP.h
+++ b/linux-core/drmP.h
@@ -76,6 +76,7 @@
 #include <asm/pgalloc.h>
 #include "drm.h"
 #include <linux/slab.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))
@@ -593,6 +594,11 @@ typedef struct ati_pcigart_info {
        int table_size;
 } drm_ati_pcigart_info;
 
+struct drm_drawable_list {
+       struct list_head head;
+       int id;
+       drm_drawable_info_t info;
+};
 
 #include "drm_objects.h"
 
@@ -818,10 +824,8 @@ typedef struct drm_device {
        /** \name Drawable information */
        /*@{ */
        spinlock_t drw_lock;
-       unsigned int drw_bitfield_length;
-       u32 *drw_bitfield;
-       unsigned int drw_info_length;
-       drm_drawable_info_t **drw_info;
+       struct idr drw_idr;
+       struct list_head drwlist;
        /*@} */
 } drm_device_t;
 

diff --git a/linux-core/drm_drawable.c b/linux-core/drm_drawable.c
index b540a0e..d599430 100644 (file)
--- a/linux-core/drm_drawable.c
+++ b/linux-core/drm_drawable.c
@@ -44,82 +44,38 @@ 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;
-       drm_drawable_info_t **info = dev->drw_info;
-       unsigned int info_length = dev->drw_info_length;
+       struct drm_drawable_list *draw_info;
        drm_draw_t draw;
-
-       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;
+       int new_id = 0;
+       int ret;
+
+       draw_info = drm_calloc(1, sizeof(struct drm_drawable_list), DRM_MEM_BUFS);
+       if (!draw_info)
+               return -ENOMEM;
+
+again:
+       if (idr_pre_get(&dev->drw_idr, GFP_KERNEL) == 0) {
+               DRM_ERROR("Out of memory expanding drawable idr\n");
+               drm_free(draw_info, sizeof(struct drm_drawable_list), DRM_MEM_BUFS);
+               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;
+       ret = idr_get_new_above(&dev->drw_idr, draw_info, 1, &new_id);
+       if (ret == -EAGAIN) {
+               spin_unlock_irqrestore(&dev->drw_lock, irqflags);
+               goto again;
        }
 
-       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;
-       }
+       list_add(&draw_info->head, &dev->drwlist);
 
        spin_unlock_irqrestore(&dev->drw_lock, irqflags);
 
+       draw_info->id = new_id;
+       draw.handle = new_id;
+
+       DRM_DEBUG("%d\n", draw.handle);
+
        DRM_COPY_TO_USER_IOCTL((drm_draw_t __user *)data, draw, sizeof(draw));
 
        return 0;
@@ -132,98 +88,25 @@ int drm_rmdraw(DRM_IOCTL_ARGS)
 {
        DRM_DEVICE;
        drm_draw_t draw;
-       int id, idx;
-       unsigned int shift;
        unsigned long irqflags;
-       u32 *bitfield = dev->drw_bitfield;
-       unsigned int bitfield_length = dev->drw_bitfield_length;
-       drm_drawable_info_t **info = dev->drw_info;
-       unsigned int info_length = dev->drw_info_length;
+       struct drm_drawable_list *draw_info;
 
        DRM_COPY_FROM_USER_IOCTL(draw, (drm_draw_t __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))) {
+       draw_info = idr_find(&dev->drw_idr, draw.handle);
+       if (!draw_info) {
                DRM_DEBUG("No such drawable %d\n", draw.handle);
-               return 0;
+               return -EINVAL;
        }
 
        spin_lock_irqsave(&dev->drw_lock, irqflags);
 
-       bitfield[idx] &= ~(1 << shift);
+       list_del(&draw_info->head);
+       idr_remove(&dev->drw_idr, draw.handle);
+       drm_free(draw_info, sizeof(struct drm_drawable_list), DRM_MEM_BUFS);
 
        spin_unlock_irqrestore(&dev->drw_lock, irqflags);
-
-       if (info[id]) {
-               drm_free(info[id]->rects, info[id]->num_rects *
-                        sizeof(drm_clip_rect_t), 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;
-               }
-
-               spin_unlock_irqrestore(&dev->drw_lock, irqflags);
-       }
-
        DRM_DEBUG("%d\n", draw.handle);
        return 0;
 }
@@ -231,36 +114,22 @@ int drm_rmdraw(DRM_IOCTL_ARGS)
 int drm_update_drawable_info(DRM_IOCTL_ARGS) {
        DRM_DEVICE;
        drm_update_draw_t update;
-       unsigned int id, idx, shift, bitfield_length = dev->drw_bitfield_length;
-       u32 *bitfield = dev->drw_bitfield;
        unsigned long irqflags;
        drm_drawable_info_t *info;
        drm_clip_rect_t *rects;
+       struct drm_drawable_list *draw_info;
        int err;
 
        DRM_COPY_FROM_USER_IOCTL(update, (drm_update_draw_t __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))) {
+       draw_info = idr_find(&dev->drw_idr, update.handle);
+       if (!draw_info) {
                DRM_ERROR("No such drawable %d\n", update.handle);
                return DRM_ERR(EINVAL);
        }
 
-       info = dev->drw_info[id];
-
-       if (!info) {
-               info = drm_calloc(1, sizeof(drm_drawable_info_t), DRM_MEM_BUFS);
-
-               if (!info) {
-                       DRM_ERROR("Failed to allocate drawable info memory\n");
-                       return DRM_ERR(ENOMEM);
-               }
-       }
+       info = &draw_info->info;
 
        switch (update.type) {
        case DRM_DRAWABLE_CLIPRECTS:
@@ -295,12 +164,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 +178,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(drm_clip_rect_t), DRM_MEM_BUFS);
+       if (rects != info->rects)
+               drm_free(rects, update.num * sizeof(drm_clip_rect_t),
+                        DRM_MEM_BUFS);
 
        return err;
 }
@@ -323,19 +189,13 @@ error:
  * Caller must hold the drawable spinlock!
  */
 drm_drawable_info_t *drm_get_drawable_info(drm_device_t *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))) {
+       struct drm_drawable_list *draw_info;
+       draw_info = idr_find(&dev->drw_idr, id);
+       if (!draw_info) {
                DRM_DEBUG("No such drawable %d\n", id);
                return NULL;
        }
 
-       return dev->drw_info[id];
+       return &draw_info->info;
 }
 EXPORT_SYMBOL(drm_get_drawable_info);

diff --git a/linux-core/drm_drv.c b/linux-core/drm_drv.c
index 8754a8e..f64959f 100644 (file)
--- a/linux-core/drm_drv.c
+++ b/linux-core/drm_drv.c
@@ -142,6 +142,7 @@ int drm_lastclose(drm_device_t * dev)
        drm_magic_entry_t *pt, *next;
        drm_map_list_t *r_list, *list_t;
        drm_vma_entry_t *vma, *vma_temp;
+       struct drm_drawable_list *drw_entry, *drw_temp;
        int i;
 
        DRM_DEBUG("\n");
@@ -166,15 +167,13 @@ int drm_lastclose(drm_device_t * dev)
                drm_irq_uninstall(dev);
 
        /* Free drawable information memory */
-       for (i = 0; i < dev->drw_bitfield_length / sizeof(*dev->drw_bitfield);
-            i++) {
-               drm_drawable_info_t *info = drm_get_drawable_info(dev, i);
-
-               if (info) {
-                       drm_free(info->rects, info->num_rects *
-                                sizeof(drm_clip_rect_t), DRM_MEM_BUFS);
-                       drm_free(info, sizeof(*info), DRM_MEM_BUFS);
-               }
+       list_for_each_entry_safe(drw_entry, drw_temp, &dev->drwlist, head) {
+               drm_free(drw_entry->info.rects, drw_entry->info.num_rects *
+                        sizeof(drm_clip_rect_t), DRM_MEM_BUFS);
+
+               idr_remove(&dev->drw_idr, drw_entry->id);
+               list_del(&drw_entry->head);
+               drm_free(drw_entry, sizeof(struct drm_drawable_list), DRM_MEM_BUFS);
        }
 
        mutex_lock(&dev->struct_mutex);

diff --git a/linux-core/drm_fops.c b/linux-core/drm_fops.c
index fce2be9..9625d8f 100644 (file)
--- a/linux-core/drm_fops.c
+++ b/linux-core/drm_fops.c
@@ -82,6 +82,9 @@ static int drm_setup(drm_device_t * dev)
        INIT_LIST_HEAD(&dev->ctxlist);
        INIT_LIST_HEAD(&dev->vmalist);
 
+       INIT_LIST_HEAD(&dev->drwlist);
+       idr_init(&dev->drw_idr);
+       
        dev->sigdata.lock = NULL;
        init_waitqueue_head(&dev->lock.lock_queue);
        dev->queue_count = 0;