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, 539 insertions, 0 deletions

diff --git a/drivers/char/drm/drm_proc.c b/drivers/char/drm/drm_proc.c
new file mode 100644
index 000000000000..6e06e8c6a516
--- /dev/null
+++ b/drivers/char/drm/drm_proc.c
@@ -0,0 +1,539 @@
+/**
+ * \file drm_proc.h 
+ * /proc support for DRM
+ *
+ * \author Rickard E. (Rik) Faith <faith@valinux.com>
+ * \author Gareth Hughes <gareth@valinux.com>
+ *
+ * \par Acknowledgements:
+ *    Matthew J Sottek <matthew.j.sottek@intel.com> sent in a patch to fix
+ *    the problem with the proc files not outputting all their information.
+ */
+
+/*
+ * Created: Mon Jan 11 09:48:47 1999 by faith@valinux.com
+ *
+ * Copyright 1999 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
+ * VA LINUX SYSTEMS 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.
+ */
+
+#include "drmP.h"
+
+static int         drm_name_info(char *buf, char **start, off_t offset,
+                                  int request, int *eof, void *data);
+static int         drm_vm_info(char *buf, char **start, off_t offset,
+                                int request, int *eof, void *data);
+static int         drm_clients_info(char *buf, char **start, off_t offset,
+                                     int request, int *eof, void *data);
+static int         drm_queues_info(char *buf, char **start, off_t offset,
+                                    int request, int *eof, void *data);
+static int         drm_bufs_info(char *buf, char **start, off_t offset,
+                                  int request, int *eof, void *data);
+#if DRM_DEBUG_CODE
+static int         drm_vma_info(char *buf, char **start, off_t offset,
+                                 int request, int *eof, void *data);
+#endif
+
+/**
+ * Proc file list.
+ */
+struct drm_proc_list {
+        const char *name;       /**< file name */
+        int        (*f)(char *, char **, off_t, int, int *, void *);    /**< proc callback*/
+} drm_proc_list[] = {
+        { "name",    drm_name_info    },
+        { "mem",     drm_mem_info     },
+        { "vm",      drm_vm_info      },
+        { "clients", drm_clients_info },
+        { "queues",  drm_queues_info  },
+        { "bufs",    drm_bufs_info    },
+#if DRM_DEBUG_CODE
+        { "vma",     drm_vma_info     },
+#endif
+};
+#define DRM_PROC_ENTRIES (sizeof(drm_proc_list)/sizeof(drm_proc_list[0]))
+
+/**
+ * Initialize the DRI proc filesystem for a device.
+ *
+ * \param dev DRM device.
+ * \param minor device minor number.
+ * \param root DRI proc dir entry.
+ * \param dev_root resulting DRI device proc dir entry.
+ * \return root entry pointer on success, or NULL on failure.
+ * 
+ * Create the DRI proc root entry "/proc/dri", the device proc root entry
+ * "/proc/dri/%minor%/", and each entry in proc_list as
+ * "/proc/dri/%minor%/%name%".
+ */
+int drm_proc_init(drm_device_t *dev, int minor,
+                    struct proc_dir_entry *root,
+                    struct proc_dir_entry **dev_root)
+{
+        struct proc_dir_entry *ent;
+        int                   i, j;
+        char                  name[64];
+
+        sprintf(name, "%d", minor);
+        *dev_root = create_proc_entry(name, S_IFDIR, root);
+        if (!*dev_root) {
+                DRM_ERROR("Cannot create /proc/dri/%s\n", name);
+                return -1;
+        }
+
+        for (i = 0; i < DRM_PROC_ENTRIES; i++) {
+                ent = create_proc_entry(drm_proc_list[i].name,
+                                        S_IFREG|S_IRUGO, *dev_root);
+                if (!ent) {
+                        DRM_ERROR("Cannot create /proc/dri/%s/%s\n",
+                                  name, drm_proc_list[i].name);
+                        for (j = 0; j < i; j++)
+                                remove_proc_entry(drm_proc_list[i].name,
+                                                  *dev_root);
+                        remove_proc_entry(name, root);
+                        return -1;
+                }
+                ent->read_proc = drm_proc_list[i].f;
+                ent->data      = dev;
+        }
+
+        return 0;
+}
+
+
+/**
+ * Cleanup the proc filesystem resources.
+ *
+ * \param minor device minor number.
+ * \param root DRI proc dir entry.
+ * \param dev_root DRI device proc dir entry.
+ * \return always zero.
+ *
+ * Remove all proc entries created by proc_init().
+ */
+int drm_proc_cleanup(int minor, struct proc_dir_entry *root,
+                      struct proc_dir_entry *dev_root)
+{
+        int  i;
+        char name[64];
+
+        if (!root || !dev_root) return 0;
+
+        for (i = 0; i < DRM_PROC_ENTRIES; i++)
+                remove_proc_entry(drm_proc_list[i].name, dev_root);
+        sprintf(name, "%d", minor);
+        remove_proc_entry(name, root);
+
+        return 0;
+}
+
+/**
+ * Called when "/proc/dri/.../name" is read.
+ * 
+ * \param buf output buffer.
+ * \param start start of output data.
+ * \param offset requested start offset.
+ * \param request requested number of bytes.
+ * \param eof whether there is no more data to return.
+ * \param data private data.
+ * \return number of written bytes.
+ * 
+ * Prints the device name together with the bus id if available.
+ */
+static int drm_name_info(char *buf, char **start, off_t offset, int request,
+                          int *eof, void *data)
+{
+        drm_device_t *dev = (drm_device_t *)data;
+        int          len  = 0;
+
+        if (offset > DRM_PROC_LIMIT) {
+                *eof = 1;
+                return 0;
+        }
+
+        *start = &buf[offset];
+        *eof   = 0;
+
+        if (dev->unique) {
+                DRM_PROC_PRINT("%s %s %s\n",
+                               dev->driver->pci_driver.name, pci_name(dev->pdev), dev->unique);
+        } else {
+                DRM_PROC_PRINT("%s %s\n", dev->driver->pci_driver.name, pci_name(dev->pdev));
+        }
+
+        if (len > request + offset) return request;
+        *eof = 1;
+        return len - offset;
+}
+
+/**
+ * Called when "/proc/dri/.../vm" is read.
+ * 
+ * \param buf output buffer.
+ * \param start start of output data.
+ * \param offset requested start offset.
+ * \param request requested number of bytes.
+ * \param eof whether there is no more data to return.
+ * \param data private data.
+ * \return number of written bytes.
+ * 
+ * Prints information about all mappings in drm_device::maplist.
+ */
+static int drm__vm_info(char *buf, char **start, off_t offset, int request,
+                         int *eof, void *data)
+{
+        drm_device_t *dev = (drm_device_t *)data;
+        int          len  = 0;
+        drm_map_t    *map;
+        drm_map_list_t *r_list;
+        struct list_head *list;
+
+                                /* Hardcoded from _DRM_FRAME_BUFFER,
+                                   _DRM_REGISTERS, _DRM_SHM, _DRM_AGP, and
+                                   _DRM_SCATTER_GATHER. */
+        const char   *types[] = { "FB", "REG", "SHM", "AGP", "SG" };
+        const char   *type;
+        int          i;
+
+        if (offset > DRM_PROC_LIMIT) {
+                *eof = 1;
+                return 0;
+        }
+
+        *start = &buf[offset];
+        *eof   = 0;
+
+        DRM_PROC_PRINT("slot     offset       size type flags    "
+                       "address mtrr\n\n");
+        i = 0;
+        if (dev->maplist != NULL) list_for_each(list, &dev->maplist->head) {
+                r_list = list_entry(list, drm_map_list_t, head);
+                map = r_list->map;
+                if(!map) continue;
+                if (map->type < 0 || map->type > 4) type = "??";
+                else                                type = types[map->type];
+                DRM_PROC_PRINT("%4d 0x%08lx 0x%08lx %4.4s  0x%02x 0x%08lx ",
+                               i,
+                               map->offset,
+                               map->size,
+                               type,
+                               map->flags,
+                               (unsigned long)map->handle);
+                if (map->mtrr < 0) {
+                        DRM_PROC_PRINT("none\n");
+                } else {
+                        DRM_PROC_PRINT("%4d\n", map->mtrr);
+                }
+                i++;
+        }
+
+        if (len > request + offset) return request;
+        *eof = 1;
+        return len - offset;
+}
+
+/**
+ * Simply calls _vm_info() while holding the drm_device::struct_sem lock.
+ */
+static int drm_vm_info(char *buf, char **start, off_t offset, int request,
+                        int *eof, void *data)
+{
+        drm_device_t *dev = (drm_device_t *)data;
+        int          ret;
+
+        down(&dev->struct_sem);
+        ret = drm__vm_info(buf, start, offset, request, eof, data);
+        up(&dev->struct_sem);
+        return ret;
+}
+
+/**
+ * Called when "/proc/dri/.../queues" is read.
+ * 
+ * \param buf output buffer.
+ * \param start start of output data.
+ * \param offset requested start offset.
+ * \param request requested number of bytes.
+ * \param eof whether there is no more data to return.
+ * \param data private data.
+ * \return number of written bytes.
+ */
+static int drm__queues_info(char *buf, char **start, off_t offset,
+                             int request, int *eof, void *data)
+{
+        drm_device_t *dev = (drm_device_t *)data;
+        int          len  = 0;
+        int          i;
+        drm_queue_t  *q;
+
+        if (offset > DRM_PROC_LIMIT) {
+                *eof = 1;
+                return 0;
+        }
+
+        *start = &buf[offset];
+        *eof   = 0;
+
+        DRM_PROC_PRINT("  ctx/flags   use   fin"
+                       "   blk/rw/rwf  wait    flushed     queued"
+                       "      locks\n\n");
+        for (i = 0; i < dev->queue_count; i++) {
+                q = dev->queuelist[i];
+                atomic_inc(&q->use_count);
+                DRM_PROC_PRINT_RET(atomic_dec(&q->use_count),
+                                   "%5d/0x%03x %5d %5d"
+                                   " %5d/%c%c/%c%c%c %5Zd\n",
+                                   i,
+                                   q->flags,
+                                   atomic_read(&q->use_count),
+                                   atomic_read(&q->finalization),
+                                   atomic_read(&q->block_count),
+                                   atomic_read(&q->block_read) ? 'r' : '-',
+                                   atomic_read(&q->block_write) ? 'w' : '-',
+                                   waitqueue_active(&q->read_queue) ? 'r':'-',
+                                   waitqueue_active(&q->write_queue) ? 'w':'-',
+                                   waitqueue_active(&q->flush_queue) ? 'f':'-',
+                                   DRM_BUFCOUNT(&q->waitlist));
+                atomic_dec(&q->use_count);
+        }
+
+        if (len > request + offset) return request;
+        *eof = 1;
+        return len - offset;
+}
+
+/**
+ * Simply calls _queues_info() while holding the drm_device::struct_sem lock.
+ */
+static int drm_queues_info(char *buf, char **start, off_t offset, int request,
+                            int *eof, void *data)
+{
+        drm_device_t *dev = (drm_device_t *)data;
+        int          ret;
+
+        down(&dev->struct_sem);
+        ret = drm__queues_info(buf, start, offset, request, eof, data);
+        up(&dev->struct_sem);
+        return ret;
+}
+
+/**
+ * Called when "/proc/dri/.../bufs" is read.
+ * 
+ * \param buf output buffer.
+ * \param start start of output data.
+ * \param offset requested start offset.
+ * \param request requested number of bytes.
+ * \param eof whether there is no more data to return.
+ * \param data private data.
+ * \return number of written bytes.
+ */
+static int drm__bufs_info(char *buf, char **start, off_t offset, int request,
+                           int *eof, void *data)
+{
+        drm_device_t     *dev = (drm_device_t *)data;
+        int              len  = 0;
+        drm_device_dma_t *dma = dev->dma;
+        int              i;
+
+        if (!dma || offset > DRM_PROC_LIMIT) {
+                *eof = 1;
+                return 0;
+        }
+
+        *start = &buf[offset];
+        *eof   = 0;
+
+        DRM_PROC_PRINT(" o     size count  free  segs pages    kB\n\n");
+        for (i = 0; i <= DRM_MAX_ORDER; i++) {
+                if (dma->bufs[i].buf_count)
+                        DRM_PROC_PRINT("%2d %8d %5d %5d %5d %5d %5ld\n",
+                                       i,
+                                       dma->bufs[i].buf_size,
+                                       dma->bufs[i].buf_count,
+                                       atomic_read(&dma->bufs[i]
+                                                   .freelist.count),
+                                       dma->bufs[i].seg_count,
+                                       dma->bufs[i].seg_count
+                                       *(1 << dma->bufs[i].page_order),
+                                       (dma->bufs[i].seg_count
+                                        * (1 << dma->bufs[i].page_order))
+                                       * PAGE_SIZE / 1024);
+        }
+        DRM_PROC_PRINT("\n");
+        for (i = 0; i < dma->buf_count; i++) {
+                if (i && !(i%32)) DRM_PROC_PRINT("\n");
+                DRM_PROC_PRINT(" %d", dma->buflist[i]->list);
+        }
+        DRM_PROC_PRINT("\n");
+
+        if (len > request + offset) return request;
+        *eof = 1;
+        return len - offset;
+}
+
+/**
+ * Simply calls _bufs_info() while holding the drm_device::struct_sem lock.
+ */
+static int drm_bufs_info(char *buf, char **start, off_t offset, int request,
+                          int *eof, void *data)
+{
+        drm_device_t *dev = (drm_device_t *)data;
+        int          ret;
+
+        down(&dev->struct_sem);
+        ret = drm__bufs_info(buf, start, offset, request, eof, data);
+        up(&dev->struct_sem);
+        return ret;
+}
+
+/**
+ * Called when "/proc/dri/.../clients" is read.
+ * 
+ * \param buf output buffer.
+ * \param start start of output data.
+ * \param offset requested start offset.
+ * \param request requested number of bytes.
+ * \param eof whether there is no more data to return.
+ * \param data private data.
+ * \return number of written bytes.
+ */
+static int drm__clients_info(char *buf, char **start, off_t offset,
+                              int request, int *eof, void *data)
+{
+        drm_device_t *dev = (drm_device_t *)data;
+        int          len  = 0;
+        drm_file_t   *priv;
+
+        if (offset > DRM_PROC_LIMIT) {
+                *eof = 1;
+                return 0;
+        }
+
+        *start = &buf[offset];
+        *eof   = 0;
+
+        DRM_PROC_PRINT("a dev   pid    uid      magic     ioctls\n\n");
+        for (priv = dev->file_first; priv; priv = priv->next) {
+                DRM_PROC_PRINT("%c %3d %5d %5d %10u %10lu\n",
+                               priv->authenticated ? 'y' : 'n',
+                               priv->minor,
+                               priv->pid,
+                               priv->uid,
+                               priv->magic,
+                               priv->ioctl_count);
+        }
+
+        if (len > request + offset) return request;
+        *eof = 1;
+        return len - offset;
+}
+
+/**
+ * Simply calls _clients_info() while holding the drm_device::struct_sem lock.
+ */
+static int drm_clients_info(char *buf, char **start, off_t offset,
+                             int request, int *eof, void *data)
+{
+        drm_device_t *dev = (drm_device_t *)data;
+        int          ret;
+
+        down(&dev->struct_sem);
+        ret = drm__clients_info(buf, start, offset, request, eof, data);
+        up(&dev->struct_sem);
+        return ret;
+}
+
+#if DRM_DEBUG_CODE
+
+static int drm__vma_info(char *buf, char **start, off_t offset, int request,
+                          int *eof, void *data)
+{
+        drm_device_t          *dev = (drm_device_t *)data;
+        int                   len  = 0;
+        drm_vma_entry_t       *pt;
+        struct vm_area_struct *vma;
+#if defined(__i386__)
+        unsigned int          pgprot;
+#endif
+
+        if (offset > DRM_PROC_LIMIT) {
+                *eof = 1;
+                return 0;
+        }
+
+        *start = &buf[offset];
+        *eof   = 0;
+
+        DRM_PROC_PRINT("vma use count: %d, high_memory = %p, 0x%08lx\n",
+                       atomic_read(&dev->vma_count),
+                       high_memory, virt_to_phys(high_memory));
+        for (pt = dev->vmalist; pt; pt = pt->next) {
+                if (!(vma = pt->vma)) continue;
+                DRM_PROC_PRINT("\n%5d 0x%08lx-0x%08lx %c%c%c%c%c%c 0x%08lx",
+                               pt->pid,
+                               vma->vm_start,
+                               vma->vm_end,
+                               vma->vm_flags & VM_READ     ? 'r' : '-',
+                               vma->vm_flags & VM_WRITE    ? 'w' : '-',
+                               vma->vm_flags & VM_EXEC     ? 'x' : '-',
+                               vma->vm_flags & VM_MAYSHARE ? 's' : 'p',
+                               vma->vm_flags & VM_LOCKED   ? 'l' : '-',
+                               vma->vm_flags & VM_IO       ? 'i' : '-',
+                               VM_OFFSET(vma));
+
+#if defined(__i386__)
+                pgprot = pgprot_val(vma->vm_page_prot);
+                DRM_PROC_PRINT(" %c%c%c%c%c%c%c%c%c",
+                               pgprot & _PAGE_PRESENT  ? 'p' : '-',
+                               pgprot & _PAGE_RW       ? 'w' : 'r',
+                               pgprot & _PAGE_USER     ? 'u' : 's',
+                               pgprot & _PAGE_PWT      ? 't' : 'b',
+                               pgprot & _PAGE_PCD      ? 'u' : 'c',
+                               pgprot & _PAGE_ACCESSED ? 'a' : '-',
+                               pgprot & _PAGE_DIRTY    ? 'd' : '-',
+                               pgprot & _PAGE_PSE      ? 'm' : 'k',
+                               pgprot & _PAGE_GLOBAL   ? 'g' : 'l' );
+#endif
+                DRM_PROC_PRINT("\n");
+        }
+
+        if (len > request + offset) return request;
+        *eof = 1;
+        return len - offset;
+}
+
+static int drm_vma_info(char *buf, char **start, off_t offset, int request,
+                         int *eof, void *data)
+{
+        drm_device_t *dev = (drm_device_t *)data;
+        int          ret;
+
+        down(&dev->struct_sem);
+        ret = drm__vma_info(buf, start, offset, request, eof, data);
+        up(&dev->struct_sem);
+        return ret;
+}
+#endif
+
+