Linux-2.6.12-rc2v2.6.12-rc2

Initial git repository build. I'm not bothering with the full history,
even though we have it. We can create a separate "historical" git
archive of that later if we want to, and in the meantime it's about
3.2GB when imported into git - space that would just make the early
git days unnecessarily complicated, when we don't have a lot of good
infrastructure for it.

Let it rip!

1 files changed, 417 insertions, 0 deletions

diff --git a/drivers/char/drm/sis_mm.c b/drivers/char/drm/sis_mm.c
new file mode 100644
index 000000000000..6610c5576d22
--- /dev/null
+++ b/drivers/char/drm/sis_mm.c
@@ -0,0 +1,417 @@
+/* sis_mm.c -- Private header for Direct Rendering Manager -*- linux-c -*-
+ * Created: Mon Jan  4 10:05:05 1999 by sclin@sis.com.tw
+ *
+ * Copyright 2000 Silicon Integrated Systems Corp, Inc., HsinChu, Taiwan.
+ * All rights reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ * 
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ * 
+ * Authors:
+ *    Sung-Ching Lin <sclin@sis.com.tw>
+ * 
+ */
+
+#include "drmP.h"
+#include "sis_drm.h"
+#include "sis_drv.h"
+#include "sis_ds.h"
+#if defined(__linux__) && defined(CONFIG_FB_SIS)
+#include <video/sisfb.h>
+#endif
+
+#define MAX_CONTEXT 100
+#define VIDEO_TYPE 0 
+#define AGP_TYPE 1
+
+typedef struct {
+        int used;
+        int context;
+        set_t *sets[2]; /* 0 for video, 1 for AGP */
+} sis_context_t;
+
+static sis_context_t global_ppriv[MAX_CONTEXT];
+
+
+static int add_alloc_set(int context, int type, unsigned int val)
+{
+        int i, retval = 0;
+        
+        for (i = 0; i < MAX_CONTEXT; i++) {
+                if (global_ppriv[i].used && global_ppriv[i].context == context)
+                {
+                        retval = setAdd(global_ppriv[i].sets[type], val);
+                        break;
+                }
+        }
+        return retval;
+}
+
+static int del_alloc_set(int context, int type, unsigned int val)
+{  
+        int i, retval = 0;
+
+        for (i = 0; i < MAX_CONTEXT; i++) {
+                if (global_ppriv[i].used && global_ppriv[i].context == context)
+                {
+                        retval = setDel(global_ppriv[i].sets[type], val);
+                        break;
+                }
+        }
+        return retval;
+}
+
+/* fb management via fb device */ 
+#if defined(__linux__) && defined(CONFIG_FB_SIS)
+
+static int sis_fb_init( DRM_IOCTL_ARGS )
+{
+        return 0;
+}
+
+static int sis_fb_alloc( DRM_IOCTL_ARGS )
+{
+        drm_sis_mem_t fb;
+        struct sis_memreq req;
+        drm_sis_mem_t __user *argp = (void __user *)data;
+        int retval = 0;
+
+        DRM_COPY_FROM_USER_IOCTL(fb, argp, sizeof(fb));
+
+        req.size = fb.size;
+        sis_malloc(&req);
+        if (req.offset) {
+                /* TODO */
+                fb.offset = req.offset;
+                fb.free = req.offset;
+                if (!add_alloc_set(fb.context, VIDEO_TYPE, fb.free)) {
+                        DRM_DEBUG("adding to allocation set fails\n");
+                        sis_free(req.offset);
+                        retval = DRM_ERR(EINVAL);
+                }
+        } else {  
+                fb.offset = 0;
+                fb.size = 0;
+                fb.free = 0;
+        }
+
+        DRM_COPY_TO_USER_IOCTL(argp, fb, sizeof(fb));
+
+        DRM_DEBUG("alloc fb, size = %d, offset = %d\n", fb.size, req.offset);
+
+        return retval;
+}
+
+static int sis_fb_free( DRM_IOCTL_ARGS )
+{
+        drm_sis_mem_t fb;
+        int retval = 0;
+
+        DRM_COPY_FROM_USER_IOCTL(fb, (drm_sis_mem_t __user *)data, sizeof(fb));
+
+        if (!fb.free)
+                return DRM_ERR(EINVAL);
+
+        if (!del_alloc_set(fb.context, VIDEO_TYPE, fb.free))
+                retval = DRM_ERR(EINVAL);
+        sis_free((u32)fb.free);
+
+        DRM_DEBUG("free fb, offset = %lu\n", fb.free);
+
+        return retval;
+}
+
+#else
+
+/* Called by the X Server to initialize the FB heap.  Allocations will fail
+ * unless this is called.  Offset is the beginning of the heap from the
+ * framebuffer offset (MaxXFBMem in XFree86).
+ *
+ * Memory layout according to Thomas Winischofer:
+ * |------------------|DDDDDDDDDDDDDDDDDDDDDDDDDDDDD|HHHH|CCCCCCCCCCC|
+ *
+ *    X driver/sisfb                                  HW-   Command-
+ *  framebuffer memory           DRI heap           Cursor   queue
+ */
+static int sis_fb_init( DRM_IOCTL_ARGS )
+{
+        DRM_DEVICE;
+        drm_sis_private_t *dev_priv = dev->dev_private;
+        drm_sis_fb_t fb;
+
+        DRM_COPY_FROM_USER_IOCTL(fb, (drm_sis_fb_t __user *)data, sizeof(fb));
+
+        if (dev_priv == NULL) {
+                dev->dev_private = drm_calloc(1, sizeof(drm_sis_private_t),
+                    DRM_MEM_DRIVER);
+                dev_priv = dev->dev_private;
+                if (dev_priv == NULL)
+                        return ENOMEM;
+        }
+
+        if (dev_priv->FBHeap != NULL)
+                return DRM_ERR(EINVAL);
+
+        dev_priv->FBHeap = mmInit(fb.offset, fb.size);
+
+        DRM_DEBUG("offset = %u, size = %u", fb.offset, fb.size);
+
+        return 0;
+}
+
+static int sis_fb_alloc( DRM_IOCTL_ARGS )
+{
+        DRM_DEVICE;
+        drm_sis_private_t *dev_priv = dev->dev_private;
+        drm_sis_mem_t __user *argp = (void __user *)data;
+        drm_sis_mem_t fb;
+        PMemBlock block;
+        int retval = 0;
+
+        if (dev_priv == NULL || dev_priv->FBHeap == NULL)
+                return DRM_ERR(EINVAL);
+  
+        DRM_COPY_FROM_USER_IOCTL(fb, argp, sizeof(fb));
+  
+        block = mmAllocMem(dev_priv->FBHeap, fb.size, 0, 0);
+        if (block) {
+                /* TODO */
+                fb.offset = block->ofs;
+                fb.free = (unsigned long)block;
+                if (!add_alloc_set(fb.context, VIDEO_TYPE, fb.free)) {
+                        DRM_DEBUG("adding to allocation set fails\n");
+                        mmFreeMem((PMemBlock)fb.free);
+                        retval = DRM_ERR(EINVAL);
+                }
+        } else {
+                fb.offset = 0;
+                fb.size = 0;
+                fb.free = 0;
+        }
+
+        DRM_COPY_TO_USER_IOCTL(argp, fb, sizeof(fb));
+
+        DRM_DEBUG("alloc fb, size = %d, offset = %d\n", fb.size, fb.offset);
+
+        return retval;
+}
+
+static int sis_fb_free( DRM_IOCTL_ARGS )
+{
+        DRM_DEVICE;
+        drm_sis_private_t *dev_priv = dev->dev_private;
+        drm_sis_mem_t fb;
+
+        if (dev_priv == NULL || dev_priv->FBHeap == NULL)
+                return DRM_ERR(EINVAL);
+
+        DRM_COPY_FROM_USER_IOCTL(fb, (drm_sis_mem_t __user *)data, sizeof(fb));
+
+        if (!mmBlockInHeap(dev_priv->FBHeap, (PMemBlock)fb.free))
+                return DRM_ERR(EINVAL);
+
+        if (!del_alloc_set(fb.context, VIDEO_TYPE, fb.free))
+                return DRM_ERR(EINVAL);
+        mmFreeMem((PMemBlock)fb.free);
+
+        DRM_DEBUG("free fb, free = 0x%lx\n", fb.free);
+
+        return 0;
+}
+
+#endif
+
+/* agp memory management */ 
+
+static int sis_ioctl_agp_init( DRM_IOCTL_ARGS )
+{
+        DRM_DEVICE;
+        drm_sis_private_t *dev_priv = dev->dev_private;
+        drm_sis_agp_t agp;
+
+        if (dev_priv == NULL) {
+                dev->dev_private = drm_calloc(1, sizeof(drm_sis_private_t),
+                    DRM_MEM_DRIVER);
+                dev_priv = dev->dev_private;
+                if (dev_priv == NULL)
+                        return ENOMEM;
+        }
+
+        if (dev_priv->AGPHeap != NULL)
+                return DRM_ERR(EINVAL);
+
+        DRM_COPY_FROM_USER_IOCTL(agp, (drm_sis_agp_t __user *)data, sizeof(agp));
+
+        dev_priv->AGPHeap = mmInit(agp.offset, agp.size);
+
+        DRM_DEBUG("offset = %u, size = %u", agp.offset, agp.size);
+  
+        return 0;
+}
+
+static int sis_ioctl_agp_alloc( DRM_IOCTL_ARGS )
+{
+        DRM_DEVICE;
+        drm_sis_private_t *dev_priv = dev->dev_private;
+        drm_sis_mem_t __user *argp = (void __user *)data;
+        drm_sis_mem_t agp;
+        PMemBlock block;
+        int retval = 0;
+   
+        if (dev_priv == NULL || dev_priv->AGPHeap == NULL)
+                return DRM_ERR(EINVAL);
+  
+        DRM_COPY_FROM_USER_IOCTL(agp, argp, sizeof(agp));
+  
+        block = mmAllocMem(dev_priv->AGPHeap, agp.size, 0, 0);
+        if (block) {
+                /* TODO */
+                agp.offset = block->ofs;
+                agp.free = (unsigned long)block;
+                if (!add_alloc_set(agp.context, AGP_TYPE, agp.free)) {
+                        DRM_DEBUG("adding to allocation set fails\n");
+                        mmFreeMem((PMemBlock)agp.free);
+                        retval = -1;
+                }
+        } else {  
+                agp.offset = 0;
+                agp.size = 0;
+                agp.free = 0;
+        }
+
+        DRM_COPY_TO_USER_IOCTL(argp, agp, sizeof(agp));
+
+        DRM_DEBUG("alloc agp, size = %d, offset = %d\n", agp.size, agp.offset);
+
+        return retval;
+}
+
+static int sis_ioctl_agp_free( DRM_IOCTL_ARGS )
+{
+        DRM_DEVICE;
+        drm_sis_private_t *dev_priv = dev->dev_private;
+        drm_sis_mem_t agp;
+
+        if (dev_priv == NULL || dev_priv->AGPHeap == NULL)
+                return DRM_ERR(EINVAL);
+
+        DRM_COPY_FROM_USER_IOCTL(agp, (drm_sis_mem_t __user *)data, sizeof(agp));
+
+        if (!mmBlockInHeap(dev_priv->AGPHeap, (PMemBlock)agp.free))
+                return DRM_ERR(EINVAL);
+
+        mmFreeMem((PMemBlock)agp.free);
+        if (!del_alloc_set(agp.context, AGP_TYPE, agp.free))
+                return DRM_ERR(EINVAL);
+
+        DRM_DEBUG("free agp, free = 0x%lx\n", agp.free);
+
+        return 0;
+}
+
+int sis_init_context(struct drm_device *dev, int context)
+{
+        int i;
+
+        for (i = 0; i < MAX_CONTEXT ; i++) {
+                if (global_ppriv[i].used &&
+                    (global_ppriv[i].context == context))
+                        break;
+        }
+
+        if (i >= MAX_CONTEXT) {
+                for (i = 0; i < MAX_CONTEXT ; i++) {
+                        if (!global_ppriv[i].used) {
+                                global_ppriv[i].context = context;
+                                global_ppriv[i].used = 1;
+                                global_ppriv[i].sets[0] = setInit();
+                                global_ppriv[i].sets[1] = setInit();
+                                DRM_DEBUG("init allocation set, socket=%d, "
+                                    "context = %d\n", i, context);
+                                break;
+                        }
+                }
+                if ((i >= MAX_CONTEXT) || (global_ppriv[i].sets[0] == NULL) ||
+                    (global_ppriv[i].sets[1] == NULL))
+                {
+                        return 0;
+                }
+        }
+        
+        return 1;
+}
+
+int sis_final_context(struct drm_device *dev, int context)
+{
+        int i;
+
+        for (i=0; i<MAX_CONTEXT; i++) {
+                if (global_ppriv[i].used &&
+                    (global_ppriv[i].context == context))
+                        break;
+        }
+
+        if (i < MAX_CONTEXT) {
+                set_t *set;
+                unsigned int item;
+                int retval;
+
+                DRM_DEBUG("find socket %d, context = %d\n", i, context);
+
+                /* Video Memory */
+                set = global_ppriv[i].sets[0];
+                retval = setFirst(set, &item);
+                while (retval) {
+                        DRM_DEBUG("free video memory 0x%x\n", item);
+#if defined(__linux__) && defined(CONFIG_FB_SIS)
+                        sis_free(item);
+#else
+                        mmFreeMem((PMemBlock)item);
+#endif
+                        retval = setNext(set, &item);
+                }
+                setDestroy(set);
+
+                /* AGP Memory */
+                set = global_ppriv[i].sets[1];
+                retval = setFirst(set, &item);
+                while (retval) {
+                        DRM_DEBUG("free agp memory 0x%x\n", item);
+                        mmFreeMem((PMemBlock)item);
+                        retval = setNext(set, &item);
+                }
+                setDestroy(set);
+
+                global_ppriv[i].used = 0;         
+        }
+        
+        return 1;
+}
+
+drm_ioctl_desc_t sis_ioctls[] = {
+        [DRM_IOCTL_NR(DRM_SIS_FB_ALLOC)]  = { sis_fb_alloc,        1, 0 },
+        [DRM_IOCTL_NR(DRM_SIS_FB_FREE)]   = { sis_fb_free,         1, 0 },
+        [DRM_IOCTL_NR(DRM_SIS_AGP_INIT)]  = { sis_ioctl_agp_init,  1, 1 },
+        [DRM_IOCTL_NR(DRM_SIS_AGP_ALLOC)] = { sis_ioctl_agp_alloc, 1, 0 },
+        [DRM_IOCTL_NR(DRM_SIS_AGP_FREE)]  = { sis_ioctl_agp_free,  1, 0 },
+        [DRM_IOCTL_NR(DRM_SIS_FB_INIT)]   = { sis_fb_init,         1, 1 }
+};
+
+int sis_max_ioctl = DRM_ARRAY_SIZE(sis_ioctls);
+