Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux...

[linux-2.6] / drivers / char / drm / drm_drawable.c

diff --git a/drivers/char/drm/drm_drawable.c b/drivers/char/drm/drm_drawable.c
index 7857453c4f48cbc1caba399280dbc61a2b5f0e2c..d6cdba5644e2df9345588dcc3df831e1e816e170 100644 (file)
--- a/drivers/char/drm/drm_drawable.c
+++ b/drivers/char/drm/drm_drawable.c
@@ -4,6 +4,7 @@
  *
  * \author Rickard E. (Rik) Faith <faith@valinux.com>
  * \author Gareth Hughes <gareth@valinux.com>
+ * \author Michel Dänzer <michel@tungstengraphics.com>
  */
 
 /*
@@ -11,6 +12,7 @@
  *
  * Copyright 1999 Precision Insight, Inc., Cedar Park, Texas.
  * Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California.
+ * Copyright 2006 Tungsten Graphics, Inc., Bismarck, North Dakota.
  * All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
@@ -35,22 +37,167 @@
 
 #include "drmP.h"
 
-/** No-op. */
-int drm_adddraw(struct inode *inode, struct file *filp,
-               unsigned int cmd, unsigned long arg)
+/**
+ * Allocate drawable ID and memory to store information about it.
+ */
+int drm_adddraw(DRM_IOCTL_ARGS)
+{
+       DRM_DEVICE;
+       unsigned long irqflags;
+       struct drm_draw draw;
+       int new_id = 0;
+       int ret;
+
+again:
+       if (idr_pre_get(&dev->drw_idr, GFP_KERNEL) == 0) {
+               DRM_ERROR("Out of memory expanding drawable idr\n");
+               return -ENOMEM;
+       }
+
+       spin_lock_irqsave(&dev->drw_lock, irqflags);
+       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;
+}
+
+/**
+ * Free drawable ID and memory to store information about it.
+ */
+int drm_rmdraw(DRM_IOCTL_ARGS)
 {
-       drm_draw_t draw;
+       DRM_DEVICE;
+       struct drm_draw draw;
+       unsigned long irqflags;
+
+       DRM_COPY_FROM_USER_IOCTL(draw, (struct drm_draw __user *) data,
+                                sizeof(draw));
+
+       spin_lock_irqsave(&dev->drw_lock, irqflags);
 
-       draw.handle = 0;        /* NOOP */
+       drm_free(drm_get_drawable_info(dev, draw.handle),
+                sizeof(struct drm_drawable_info), DRM_MEM_BUFS);
+
+       idr_remove(&dev->drw_idr, draw.handle);
+
+       spin_unlock_irqrestore(&dev->drw_lock, irqflags);
        DRM_DEBUG("%d\n", draw.handle);
-       if (copy_to_user((drm_draw_t __user *) arg, &draw, sizeof(draw)))
-               return -EFAULT;
        return 0;
 }
 
-/** No-op. */
-int drm_rmdraw(struct inode *inode, struct file *filp,
-              unsigned int cmd, unsigned long arg)
+int drm_update_drawable_info(DRM_IOCTL_ARGS)
+{
+       DRM_DEVICE;
+       struct drm_update_draw update;
+       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));
+
+       info = idr_find(&dev->drw_idr, update.handle);
+       if (!info) {
+               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;
+               }
+       }
+
+       switch (update.type) {
+       case DRM_DRAWABLE_CLIPRECTS:
+               if (update.num != info->num_rects) {
+                       rects = drm_alloc(update.num * sizeof(struct drm_clip_rect),
+                                        DRM_MEM_BUFS);
+               } else
+                       rects = info->rects;
+
+               if (update.num && !rects) {
+                       DRM_ERROR("Failed to allocate cliprect memory\n");
+                       err = DRM_ERR(ENOMEM);
+                       goto error;
+               }
+
+               if (update.num && DRM_COPY_FROM_USER(rects,
+                                                    (struct drm_clip_rect __user *)
+                                                    (unsigned long)update.data,
+                                                    update.num *
+                                                    sizeof(*rects))) {
+                       DRM_ERROR("Failed to copy cliprects from userspace\n");
+                       err = DRM_ERR(EFAULT);
+                       goto error;
+               }
+
+               spin_lock_irqsave(&dev->drw_lock, irqflags);
+
+               if (rects != info->rects) {
+                       drm_free(info->rects, info->num_rects *
+                                sizeof(struct drm_clip_rect), DRM_MEM_BUFS);
+               }
+
+               info->rects = rects;
+               info->num_rects = update.num;
+
+               spin_unlock_irqrestore(&dev->drw_lock, irqflags);
+
+               DRM_DEBUG("Updated %d cliprects for drawable %d\n",
+                         info->num_rects, update.handle);
+               break;
+       default:
+               DRM_ERROR("Invalid update type %d\n", update.type);
+               return DRM_ERR(EINVAL);
+       }
+
+       return 0;
+
+error:
+       if (rects != info->rects)
+               drm_free(rects, update.num * sizeof(struct drm_clip_rect),
+                        DRM_MEM_BUFS);
+
+       return err;
+}
+
+/**
+ * Caller must hold the drawable spinlock!
+ */
+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 0;
+}
+
+void drm_drawable_free_all(struct drm_device *dev)
 {
-       return 0;               /* NOOP */
+       idr_for_each(&dev->drw_idr, drm_drawable_free, NULL);
+       idr_remove_all(&dev->drw_idr);
 }