- Fix up merge.
authorGareth Hughes <gareth@users.sourceforge.net>
Thu, 15 Feb 2001 10:26:03 +0000 (10:26 +0000)
committerGareth Hughes <gareth@users.sourceforge.net>
Thu, 15 Feb 2001 10:26:03 +0000 (10:26 +0000)
- Update date stamps.

linux-core/mga_drv.c
linux-core/r128_drv.c
linux-core/radeon_drv.c
linux-core/tdfx_drv.c
linux/gamma_drv.c
linux/mga_dma.c
linux/mga_drv.c
linux/r128_bufs.c [deleted file]
linux/r128_drv.c
linux/radeon_drv.c
linux/tdfx_drv.c

index b498a3e..7898c74 100644 (file)
@@ -38,7 +38,7 @@
 
 #define DRIVER_NAME            "mga"
 #define DRIVER_DESC            "Matrox G200/G400"
-#define DRIVER_DATE            "20010212"
+#define DRIVER_DATE            "20010215"
 
 #define DRIVER_MAJOR           3
 #define DRIVER_MINOR           0
index 08de203..3bd27ae 100644 (file)
@@ -38,7 +38,7 @@
 
 #define DRIVER_NAME            "r128"
 #define DRIVER_DESC            "ATI Rage 128"
-#define DRIVER_DATE            "20010214"
+#define DRIVER_DATE            "20010215"
 
 #define DRIVER_MAJOR           2
 #define DRIVER_MINOR           1
index da04610..43f6e2e 100644 (file)
@@ -36,7 +36,7 @@
 
 #define DRIVER_NAME            "radeon"
 #define DRIVER_DESC            "ATI Radeon"
-#define DRIVER_DATE            "20010214"
+#define DRIVER_DATE            "20010215"
 
 #define DRIVER_MAJOR           1
 #define DRIVER_MINOR           0
index 9bb7b84..e8d7955 100644 (file)
@@ -38,7 +38,7 @@
 
 #define DRIVER_NAME            "tdfx"
 #define DRIVER_DESC            "3dfx Banshee/Voodoo3+"
-#define DRIVER_DATE            "20010214"
+#define DRIVER_DATE            "20010215"
 
 #define DRIVER_MAJOR           1
 #define DRIVER_MINOR           0
index 79e8ad1..c24d5a3 100644 (file)
@@ -38,7 +38,7 @@
 
 #define DRIVER_NAME            "gamma"
 #define DRIVER_DESC            "3DLabs gamma"
-#define DRIVER_DATE            "20010208"
+#define DRIVER_DATE            "20010215"
 
 #define DRIVER_MAJOR           1
 #define DRIVER_MINOR           0
@@ -101,4 +101,3 @@ do {                                                                        \
 #endif
 
 #include "drm_drv.h"
-
index 9fafa29..c54a588 100644 (file)
@@ -288,8 +288,8 @@ static int mga_freelist_init( drm_device_t *dev )
        drm_mga_buf_priv_t *buf_priv;
        drm_mga_freelist_t *entry;
        int i;
-       DRM_INFO( "%s: count=%d\n",
-                 __FUNCTION__, dma->buf_count );
+       DRM_DEBUG( "%s: count=%d\n",
+                  __FUNCTION__, dma->buf_count );
 
        dev_priv->head = DRM(alloc)( sizeof(drm_mga_freelist_t),
                                     DRM_MEM_DRIVER );
index b498a3e..7898c74 100644 (file)
@@ -38,7 +38,7 @@
 
 #define DRIVER_NAME            "mga"
 #define DRIVER_DESC            "Matrox G200/G400"
-#define DRIVER_DATE            "20010212"
+#define DRIVER_DATE            "20010215"
 
 #define DRIVER_MAJOR           3
 #define DRIVER_MINOR           0
diff --git a/linux/r128_bufs.c b/linux/r128_bufs.c
deleted file mode 100644 (file)
index 3c549e1..0000000
+++ /dev/null
@@ -1,310 +0,0 @@
-/* r128_bufs.c -- IOCTLs to manage buffers -*- linux-c -*-
- * Created: Wed Apr 12 16:19:08 2000 by kevin@precisioninsight.com
- *
- * Copyright 2000 Precision Insight, Inc., Cedar Park, Texas.
- * Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California.
- * 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: Kevin E. Martin <martin@valinux.com>
- *          Rickard E. (Rik) Faith <faith@valinux.com>
- *         Jeff Hartmann <jhartmann@valinux.com>
- *
- */
-
-#define __NO_VERSION__
-#include <linux/config.h>
-#include "drmP.h"
-#include "r128_drv.h"
-#include "linux/un.h"
-
-
-#if defined(CONFIG_AGP) || defined(CONFIG_AGP_MODULE)
-int r128_addbufs_agp(struct inode *inode, struct file *filp, unsigned int cmd,
-                    unsigned long arg)
-{
-       drm_file_t       *priv = filp->private_data;
-       drm_device_t     *dev  = priv->dev;
-       drm_device_dma_t *dma  = dev->dma;
-       drm_buf_desc_t    request;
-       drm_buf_entry_t  *entry;
-       drm_buf_t        *buf;
-       unsigned long     offset;
-       unsigned long     agp_offset;
-       int               count;
-       int               order;
-       int               size;
-       int               alignment;
-       int               page_order;
-       int               total;
-       int               byte_count;
-       int               i;
-
-       if (!dma) return -EINVAL;
-
-       if (copy_from_user(&request,
-                          (drm_buf_desc_t *)arg,
-                          sizeof(request)))
-               return -EFAULT;
-
-       count      = request.count;
-       order      = drm_order(request.size);
-       size       = 1 << order;
-
-       alignment  = (request.flags & _DRM_PAGE_ALIGN) ? PAGE_ALIGN(size):size;
-       page_order = order - PAGE_SHIFT > 0 ? order - PAGE_SHIFT : 0;
-       total      = PAGE_SIZE << page_order;
-
-       byte_count = 0;
-       agp_offset = request.agp_start;
-
-       DRM_DEBUG("count:      %d\n",  count);
-       DRM_DEBUG("order:      %d\n",  order);
-       DRM_DEBUG("size:       %d\n",  size);
-       DRM_DEBUG("agp_offset: %ld\n", agp_offset);
-       DRM_DEBUG("alignment:  %d\n",  alignment);
-       DRM_DEBUG("page_order: %d\n",  page_order);
-       DRM_DEBUG("total:      %d\n",  total);
-
-       if (order < DRM_MIN_ORDER || order > DRM_MAX_ORDER) return -EINVAL;
-       if (dev->queue_count) return -EBUSY; /* Not while in use */
-
-       spin_lock(&dev->count_lock);
-       if (dev->buf_use) {
-               spin_unlock(&dev->count_lock);
-               return -EBUSY;
-       }
-       atomic_inc(&dev->buf_alloc);
-       spin_unlock(&dev->count_lock);
-
-       down(&dev->struct_sem);
-       entry = &dma->bufs[order];
-       if (entry->buf_count) {
-               up(&dev->struct_sem);
-               atomic_dec(&dev->buf_alloc);
-               return -ENOMEM; /* May only call once for each order */
-       }
-
-       entry->buflist = drm_alloc(count * sizeof(*entry->buflist),
-                                  DRM_MEM_BUFS);
-       if (!entry->buflist) {
-               up(&dev->struct_sem);
-               atomic_dec(&dev->buf_alloc);
-               return -ENOMEM;
-       }
-       memset(entry->buflist, 0, count * sizeof(*entry->buflist));
-
-       entry->buf_size   = size;
-       entry->page_order = page_order;
-       offset            = 0;
-
-       for (offset = 0;
-            entry->buf_count < count;
-            offset += alignment, ++entry->buf_count) {
-               buf          = &entry->buflist[entry->buf_count];
-               buf->idx     = dma->buf_count + entry->buf_count;
-               buf->total   = alignment;
-               buf->order   = order;
-               buf->used    = 0;
-               buf->offset  = (dma->byte_count + offset);
-               buf->bus_address = agp_offset + offset;
-               buf->address = (void *)(agp_offset + offset + dev->agp->base);
-               buf->next    = NULL;
-               buf->waiting = 0;
-               buf->pending = 0;
-               init_waitqueue_head(&buf->dma_wait);
-               buf->pid     = 0;
-
-               buf->dev_priv_size = sizeof(drm_r128_buf_priv_t);
-               buf->dev_private   = drm_alloc(sizeof(drm_r128_buf_priv_t),
-                                              DRM_MEM_BUFS);
-               memset(buf->dev_private, 0, buf->dev_priv_size);
-
-#if DRM_DMA_HISTOGRAM
-               buf->time_queued     = 0;
-               buf->time_dispatched = 0;
-               buf->time_completed  = 0;
-               buf->time_freed      = 0;
-#endif
-
-               byte_count += PAGE_SIZE << page_order;
-
-               DRM_DEBUG("buffer %d @ %p\n",
-                         entry->buf_count, buf->address);
-       }
-
-       DRM_DEBUG("byte_count: %d\n", byte_count);
-
-       dma->buflist = drm_realloc(dma->buflist,
-                                  dma->buf_count * sizeof(*dma->buflist),
-                                  (dma->buf_count + entry->buf_count)
-                                  * sizeof(*dma->buflist),
-                                  DRM_MEM_BUFS);
-       for (i = dma->buf_count; i < dma->buf_count + entry->buf_count; i++)
-               dma->buflist[i] = &entry->buflist[i - dma->buf_count];
-
-       dma->buf_count  += entry->buf_count;
-       dma->byte_count += byte_count;
-
-       drm_freelist_create(&entry->freelist, entry->buf_count);
-       for (i = 0; i < entry->buf_count; i++) {
-               drm_freelist_put(dev, &entry->freelist, &entry->buflist[i]);
-       }
-
-       up(&dev->struct_sem);
-
-       request.count = entry->buf_count;
-       request.size  = size;
-
-       if (copy_to_user((drm_buf_desc_t *)arg,
-                        &request,
-                        sizeof(request)))
-               return -EFAULT;
-
-       dma->flags = _DRM_DMA_USE_AGP;
-
-       atomic_dec(&dev->buf_alloc);
-       return 0;
-}
-#endif
-
-int r128_addbufs(struct inode *inode, struct file *filp, unsigned int cmd,
-                unsigned long arg)
-{
-       drm_file_t              *priv           = filp->private_data;
-       drm_device_t            *dev            = priv->dev;
-       drm_r128_private_t      *dev_priv       = dev->dev_private;
-       drm_buf_desc_t          request;
-
-       if (!dev_priv || dev_priv->is_pci) return -EINVAL;
-
-       if (copy_from_user(&request,
-                          (drm_buf_desc_t *)arg,
-                          sizeof(request)))
-               return -EFAULT;
-
-#if defined(CONFIG_AGP) || defined(CONFIG_AGP_MODULE)
-       if (request.flags & _DRM_AGP_BUFFER)
-               return r128_addbufs_agp(inode, filp, cmd, arg);
-       else
-#endif
-               return -EINVAL;
-}
-
-int r128_mapbufs(struct inode *inode, struct file *filp, unsigned int cmd,
-                unsigned long arg)
-{
-       drm_file_t              *priv           = filp->private_data;
-       drm_device_t            *dev            = priv->dev;
-       drm_r128_private_t      *dev_priv       = dev->dev_private;
-       drm_device_dma_t        *dma            = dev->dma;
-       int                      retcode        = 0;
-       const int                zero           = 0;
-       unsigned long            virtual;
-       unsigned long            address;
-       drm_buf_map_t            request;
-       int                      i;
-
-       if (!dma || !dev_priv || dev_priv->is_pci) return -EINVAL;
-
-       DRM_DEBUG("\n");
-
-       spin_lock(&dev->count_lock);
-       if (atomic_read(&dev->buf_alloc)) {
-               spin_unlock(&dev->count_lock);
-               return -EBUSY;
-       }
-       ++dev->buf_use;         /* Can't allocate more after this call */
-       spin_unlock(&dev->count_lock);
-
-       if (copy_from_user(&request,
-                          (drm_buf_map_t *)arg,
-                          sizeof(request)))
-               return -EFAULT;
-
-       if (request.count >= dma->buf_count) {
-               if (dma->flags & _DRM_DMA_USE_AGP) {
-                       drm_map_t *map;
-
-                       map = dev_priv->buffers;
-                       if (!map) {
-                               retcode = -EINVAL;
-                               goto done;
-                       }
-
-                       down(&current->mm->mmap_sem);
-                       virtual = do_mmap(filp, 0, map->size,
-                                         PROT_READ|PROT_WRITE,
-                                         MAP_SHARED,
-                                         (unsigned long)map->offset);
-                       up(&current->mm->mmap_sem);
-               } else {
-                       down(&current->mm->mmap_sem);
-                       virtual = do_mmap(filp, 0, dma->byte_count,
-                                         PROT_READ|PROT_WRITE, MAP_SHARED, 0);
-                       up(&current->mm->mmap_sem);
-               }
-               if (virtual > -1024UL) {
-                       /* Real error */
-                       retcode = (signed long)virtual;
-                       goto done;
-               }
-               request.virtual = (void *)virtual;
-
-               for (i = 0; i < dma->buf_count; i++) {
-                       if (copy_to_user(&request.list[i].idx,
-                                        &dma->buflist[i]->idx,
-                                        sizeof(request.list[0].idx))) {
-                               retcode = -EFAULT;
-                               goto done;
-                       }
-                       if (copy_to_user(&request.list[i].total,
-                                        &dma->buflist[i]->total,
-                                        sizeof(request.list[0].total))) {
-                               retcode = -EFAULT;
-                               goto done;
-                       }
-                       if (copy_to_user(&request.list[i].used,
-                                        &zero,
-                                        sizeof(zero))) {
-                               retcode = -EFAULT;
-                               goto done;
-                       }
-                       address = virtual + dma->buflist[i]->offset;
-                       if (copy_to_user(&request.list[i].address,
-                                        &address,
-                                        sizeof(address))) {
-                               retcode = -EFAULT;
-                               goto done;
-                       }
-               }
-       }
- done:
-       request.count = dma->buf_count;
-       DRM_DEBUG("%d buffers, retcode = %d\n", request.count, retcode);
-
-       if (copy_to_user((drm_buf_map_t *)arg,
-                        &request,
-                        sizeof(request)))
-               return -EFAULT;
-
-       return retcode;
-}
index 08de203..3bd27ae 100644 (file)
@@ -38,7 +38,7 @@
 
 #define DRIVER_NAME            "r128"
 #define DRIVER_DESC            "ATI Rage 128"
-#define DRIVER_DATE            "20010214"
+#define DRIVER_DATE            "20010215"
 
 #define DRIVER_MAJOR           2
 #define DRIVER_MINOR           1
index da04610..43f6e2e 100644 (file)
@@ -36,7 +36,7 @@
 
 #define DRIVER_NAME            "radeon"
 #define DRIVER_DESC            "ATI Radeon"
-#define DRIVER_DATE            "20010214"
+#define DRIVER_DATE            "20010215"
 
 #define DRIVER_MAJOR           1
 #define DRIVER_MINOR           0
index 9bb7b84..e8d7955 100644 (file)
@@ -38,7 +38,7 @@
 
 #define DRIVER_NAME            "tdfx"
 #define DRIVER_DESC            "3dfx Banshee/Voodoo3+"
-#define DRIVER_DATE            "20010214"
+#define DRIVER_DATE            "20010215"
 
 #define DRIVER_MAJOR           1
 #define DRIVER_MINOR           0