Audit calls to schedule() Remove tags from files shared with Linux kernel

    tree Remove debugging statements to make debugging more useful Other
    minor cleanups in preparation for sync with Linux 2.4.0-test9-pre7

diff --git a/linux-core/Makefile.kernel b/linux-core/Makefile.kernel
index 0791af4..b1b8d97 100644 (file)
--- a/linux-core/Makefile.kernel
+++ b/linux-core/Makefile.kernel
@@ -1,4 +1,3 @@
-# $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/Makefile.kernel,v 1.8 2000/08/28 02:43:14 tsi Exp $
 #
 # Makefile for the drm device driver.  This driver provides support for
 # the Direct Rendering Infrastructure (DRI) in XFree86 4.x.

diff --git a/linux-core/README.drm b/linux-core/README.drm
index 97dd0d8..5c293fb 100644 (file)
--- a/linux-core/README.drm
+++ b/linux-core/README.drm
@@ -1,4 +1,3 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/README.drm,v 1.4 2000/08/28 02:43:14 tsi Exp $ */
 
 ************************************************************
 * For the very latest on DRI development, please see:      *

diff --git a/linux-core/drmP.h b/linux-core/drmP.h
index 69cf63d..1f88341 100644 (file)
--- a/linux-core/drmP.h
+++ b/linux-core/drmP.h
@@ -28,7 +28,6 @@
  *    Rickard E. (Rik) Faith <faith@valinux.com>
  * 
  */
-/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/drmP.h,v 1.9 2000/08/28 02:43:14 tsi Exp $ */
 
 #ifndef _DRM_P_H_
 #define _DRM_P_H_

diff --git a/linux-core/i810_dma.c b/linux-core/i810_dma.c
index 11d9973..26fe0c1 100644 (file)
--- a/linux-core/i810_dma.c
+++ b/linux-core/i810_dma.c
@@ -29,7 +29,6 @@
  *          Keith Whitwell <keithw@valinux.com>
  *
  */
-/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/i810_dma.c,v 1.6 2000/08/28 02:43:15 tsi Exp $ */
 
 #define __NO_VERSION__
 #include "drmP.h"

diff --git a/linux-core/i810_drv.c b/linux-core/i810_drv.c
index 5d4a9c1..ed880c4 100644 (file)
--- a/linux-core/i810_drv.c
+++ b/linux-core/i810_drv.c
@@ -28,7 +28,6 @@
  *         Jeff Hartmann <jhartmann@valinux.com>
  *
  */
-/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/i810_drv.c,v 1.5 2000/08/28 02:43:15 tsi Exp $ */
 
 #include <linux/config.h>
 #include "drmP.h"
@@ -36,7 +35,7 @@
 
 #define I810_NAME       "i810"
 #define I810_DESC       "Intel I810"
-#define I810_DATE       "20000910"
+#define I810_DATE       "20000928"
 #define I810_MAJOR      1
 #define I810_MINOR      1
 #define I810_PATCHLEVEL         0

diff --git a/linux-core/i810_drv.h b/linux-core/i810_drv.h
index 9f46be5..1c95740 100644 (file)
--- a/linux-core/i810_drv.h
+++ b/linux-core/i810_drv.h
@@ -28,7 +28,6 @@
  *         Jeff Hartmann <jhartmann@valinux.com>
  *
  */
-/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/i810_drv.h,v 1.5 2000/08/28 02:43:15 tsi Exp $ */
 
 #ifndef _I810_DRV_H_
 #define _I810_DRV_H_

diff --git a/linux-core/mga_drv.c b/linux-core/mga_drv.c
index a8cf0c7..4aaac62 100644 (file)
--- a/linux-core/mga_drv.c
+++ b/linux-core/mga_drv.c
@@ -29,7 +29,6 @@
  *
  *
  */
-/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/mga_drv.c,v 1.4 2000/08/28 02:43:15 tsi Exp $ */
 
 #include <linux/config.h>
 #include "drmP.h"
@@ -37,10 +36,10 @@
 
 #define MGA_NAME        "mga"
 #define MGA_DESC        "Matrox G200/G400"
-#define MGA_DATE        "20000910"
+#define MGA_DATE        "20000928"
 #define MGA_MAJOR       2
 #define MGA_MINOR       0
-#define MGA_PATCHLEVEL  0
+#define MGA_PATCHLEVEL  1
 
 static drm_device_t          mga_device;
 drm_ctx_t                    mga_res_ctx;
@@ -524,6 +523,7 @@ int mga_release(struct inode *inode, struct file *filp)
                DECLARE_WAITQUEUE(entry, current);
                add_wait_queue(&dev->lock.lock_queue, &entry);
                for (;;) {
+                       current->state = TASK_INTERRUPTIBLE;
                        if (!dev->lock.hw_lock) {
                                /* Device has been unregistered */
                                retcode = -EINTR;
@@ -538,7 +538,6 @@ int mga_release(struct inode *inode, struct file *filp)
                        }
                                /* Contention */
                        atomic_inc(&dev->total_sleeps);
-                       current->state = TASK_INTERRUPTIBLE;
                        schedule();
                        if (signal_pending(current)) {
                                retcode = -ERESTARTSYS;

diff --git a/linux-core/r128_drv.c b/linux-core/r128_drv.c
index dcb766a..7ae4980 100644 (file)
--- a/linux-core/r128_drv.c
+++ b/linux-core/r128_drv.c
@@ -28,7 +28,6 @@
  *          Kevin E. Martin <martin@valinux.com>
  *
  */
-/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/r128_drv.c,v 1.3 2000/08/28 02:43:16 tsi Exp $ */
 
 #include <linux/config.h>
 #include "drmP.h"
@@ -36,7 +35,7 @@
 
 #define R128_NAME       "r128"
 #define R128_DESC       "ATI Rage 128"
-#define R128_DATE       "20000910"
+#define R128_DATE       "20000928"
 #define R128_MAJOR      1
 #define R128_MINOR      0
 #define R128_PATCHLEVEL  0

diff --git a/linux-core/sis_drv.c b/linux-core/sis_drv.c
index 0b1990b..2f98e32 100644 (file)
--- a/linux-core/sis_drv.c
+++ b/linux-core/sis_drv.c
@@ -24,7 +24,6 @@
  * DEALINGS IN THE SOFTWARE.
  *
  */
-/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/sis_drv.c,v 1.5 2000/09/22 11:35:47 alanh Exp $ */
 
 #include <linux/config.h>
 #include "drmP.h"
@@ -575,6 +574,7 @@ int sis_lock(struct inode *inode, struct file *filp, unsigned int cmd,
 #endif
                 add_wait_queue(&dev->lock.lock_queue, &entry);
                 for (;;) {
+                        current->state = TASK_INTERRUPTIBLE;
                         if (!dev->lock.hw_lock) {
                                 /* Device has been unregistered */
                                 ret = -EINTR;
@@ -590,7 +590,6 @@ int sis_lock(struct inode *inode, struct file *filp, unsigned int cmd,
                         
                                 /* Contention */
                         atomic_inc(&dev->total_sleeps);
-                        current->state = TASK_INTERRUPTIBLE;
 #if 1
                        current->policy |= SCHED_YIELD;
 #endif

diff --git a/linux-core/tdfx_drv.c b/linux-core/tdfx_drv.c
index d8f5bcc..5f2c804 100644 (file)
--- a/linux-core/tdfx_drv.c
+++ b/linux-core/tdfx_drv.c
@@ -1,4 +1,4 @@
-/* tdfx.c -- tdfx driver -*- linux-c -*-
+/* tdfx_drv.c -- tdfx driver -*- linux-c -*-
  * Created: Thu Oct  7 10:38:32 1999 by faith@precisioninsight.com
  *
  * Copyright 1999 Precision Insight, Inc., Cedar Park, Texas.
@@ -29,7 +29,6 @@
  *    Daryll Strauss <daryll@valinux.com>
  *
  */
-/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/tdfx_drv.c,v 1.6 2000/08/28 02:43:16 tsi Exp $ */
 
 #include <linux/config.h>
 #include "drmP.h"
@@ -37,7 +36,7 @@
 
 #define TDFX_NAME       "tdfx"
 #define TDFX_DESC       "3dfx Banshee/Voodoo3+"
-#define TDFX_DATE       "20000910"
+#define TDFX_DATE       "20000928"
 #define TDFX_MAJOR      1
 #define TDFX_MINOR      0
 #define TDFX_PATCHLEVEL  0

diff --git a/linux/Makefile.kernel b/linux/Makefile.kernel
index 0791af4..b1b8d97 100644 (file)
--- a/linux/Makefile.kernel
+++ b/linux/Makefile.kernel
@@ -1,4 +1,3 @@
-# $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/Makefile.kernel,v 1.8 2000/08/28 02:43:14 tsi Exp $
 #
 # Makefile for the drm device driver.  This driver provides support for
 # the Direct Rendering Infrastructure (DRI) in XFree86 4.x.

diff --git a/linux/Makefile.linux b/linux/Makefile.linux
index 5f0465a..b76cbea 100644 (file)
--- a/linux/Makefile.linux
+++ b/linux/Makefile.linux
@@ -24,7 +24,6 @@
 # ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 # DEALINGS IN THE SOFTWARE.
 # 
-# $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/Makefile.linux,v 1.11 2000/09/01 02:31:38 tsi Exp $
 #
 # ***** NOTE NOTE NOTE NOTE NOTE *****
 # To override the automatic Linux source tree determination, pass the
@@ -50,7 +49,6 @@
 
 MODS=           gamma.o tdfx.o r128.o
 LIBS=           libdrm.a
-PROGS=         drmstat
 
 DRMOBJS=       init.o memory.o proc.o auth.o context.o drawable.o bufs.o \
                lists.o lock.o ioctl.o fops.o vm.o dma.o ctxbitmap.o
@@ -65,9 +63,6 @@ TDFXHEADERS=    tdfx_drv.h $(DRMHEADERS)
 R128OBJS=      r128_drv.o r128_dma.o r128_bufs.o r128_context.o
 R128HEADERS=   r128_drv.h r128_drm.h $(DRMHEADERS)
 
-PROGOBJS=       drmstat.po xf86drm.po xf86drmHash.po xf86drmRandom.po sigio.po
-PROGHEADERS=    xf86drm.h $(DRMHEADERS)
-
 INC=           /usr/include
 
 CFLAGS=                -O2 $(WARNINGS)
@@ -227,9 +222,6 @@ i810.o: $(I810OBJS) $(LIBS)
        $(LD) -r $^ -o $@
 endif
 
-drmstat: $(PROGOBJS)
-       $(CC) $(PRGCFLAGS) $^ $(PRGLIBS) -o $@
-
 .PHONY: ChangeLog
 ChangeLog:
        @rm -f Changelog
@@ -243,9 +235,6 @@ ChangeLog:
 %.o: %.c
        $(CC) $(MODCFLAGS) -I$(TREE) -c $< -o $@
 
-%.po: %.c
-       $(CC) $(PRGCFLAGS) -DDRM_USE_MALLOC -c $< -o $@
-
 $(DRMOBJS): $(DRMHEADERS)
 $(GAMMAOBJS): $(GAMMAHEADERS)
 $(TDFXOBJS): $(TDFXHEADERS)
@@ -254,7 +243,6 @@ ifeq ($(AGP),1)
 $(MGAOBJS): $(MGAHEADERS)
 $(I810OBJS): $(I810HEADERS)
 endif
-$(PROGOBJS): $(PROGHEADERS)
 
 clean:
-       rm -f *.o *.a *.po *~ core $(PROGS)
+       rm -f *.o *.a *~ core

diff --git a/linux/README.drm b/linux/README.drm
index 97dd0d8..5c293fb 100644 (file)
--- a/linux/README.drm
+++ b/linux/README.drm
@@ -1,4 +1,3 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/README.drm,v 1.4 2000/08/28 02:43:14 tsi Exp $ */
 
 ************************************************************
 * For the very latest on DRI development, please see:      *

diff --git a/linux/agpsupport.c b/linux/agpsupport.c
index c63f690..24fd59c 100644 (file)
--- a/linux/agpsupport.c
+++ b/linux/agpsupport.c
@@ -28,8 +28,6 @@
  *
  */
 
-/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/agpsupport.c,v 1.4 2000/08/28 02:43:14 tsi Exp $ */
-
 #define __NO_VERSION__
 #include "drmP.h"
 #include <linux/module.h>

diff --git a/linux/auth.c b/linux/auth.c
index ad719cf..80bb4b6 100644 (file)
--- a/linux/auth.c
+++ b/linux/auth.c
@@ -28,7 +28,6 @@
  *    Rickard E. (Rik) Faith <faith@valinux.com>
  *
  */
-/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/auth.c,v 1.5 2000/08/28 02:43:14 tsi Exp $ */
 
 #define __NO_VERSION__
 #include "drmP.h"

diff --git a/linux/bufs.c b/linux/bufs.c
index 679a096..28e0eb5 100644 (file)
--- a/linux/bufs.c
+++ b/linux/bufs.c
@@ -28,7 +28,6 @@
  *    Rickard E. (Rik) Faith <faith@valinux.com>
  *
  */
-/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/bufs.c,v 1.8 2000/08/28 02:43:14 tsi Exp $ */
 
 #define __NO_VERSION__
 #include <linux/config.h>

diff --git a/linux/drm.h b/linux/drm.h
index 6cfe88f..7177147 100644 (file)
--- a/linux/drm.h
+++ b/linux/drm.h
@@ -31,7 +31,6 @@
  * Dec 1999, Richard Henderson <rth@twiddle.net>, move to generic cmpxchg.
  *
  */
-/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/drm.h,v 1.9 2000/08/24 22:20:18 tsi Exp $ */
 
 #ifndef _DRM_H_
 #define _DRM_H_

diff --git a/linux/drmP.h b/linux/drmP.h
index 69cf63d..1f88341 100644 (file)
--- a/linux/drmP.h
+++ b/linux/drmP.h
@@ -28,7 +28,6 @@
  *    Rickard E. (Rik) Faith <faith@valinux.com>
  * 
  */
-/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/drmP.h,v 1.9 2000/08/28 02:43:14 tsi Exp $ */
 
 #ifndef _DRM_P_H_
 #define _DRM_P_H_

diff --git a/linux/fops.c b/linux/fops.c
index e6110a3..8e373e5 100644 (file)
--- a/linux/fops.c
+++ b/linux/fops.c
@@ -29,7 +29,6 @@
  *    Daryll Strauss <daryll@valinux.com>
  *
  */
-/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/fops.c,v 1.9 2000/08/28 02:43:14 tsi Exp $ */
 
 #define __NO_VERSION__
 #include "drmP.h"

diff --git a/linux/gamma_dma.c b/linux/gamma_dma.c
index 77b0779..4ab6728 100644 (file)
--- a/linux/gamma_dma.c
+++ b/linux/gamma_dma.c
@@ -542,10 +542,9 @@ static int gamma_dma_send_buffers(drm_device_t *dev, drm_dma_t *d)
        
        if (d->flags & _DRM_DMA_BLOCK) {
                DRM_DEBUG("%d waiting\n", current->pid);
-               current->state = TASK_INTERRUPTIBLE;
                for (;;) {
-                       if (!last_buf->waiting
-                           && !last_buf->pending)
+                       current->state = TASK_INTERRUPTIBLE;
+                       if (!last_buf->waiting && !last_buf->pending)
                                break; /* finished */
                        schedule();
                        if (signal_pending(current)) {

diff --git a/linux/gamma_drv.c b/linux/gamma_drv.c
index 44dded0..dba974c 100644 (file)
--- a/linux/gamma_drv.c
+++ b/linux/gamma_drv.c
@@ -28,7 +28,6 @@
  *    Rickard E. (Rik) Faith <faith@valinux.com>
  *
  */
-/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/gamma_drv.c,v 1.8 2000/08/28 02:43:14 tsi Exp $ */
 
 #include <linux/config.h>
 #include "drmP.h"

diff --git a/linux/gamma_drv.h b/linux/gamma_drv.h
index f8bbe07..e9ce395 100644 (file)
--- a/linux/gamma_drv.h
+++ b/linux/gamma_drv.h
@@ -28,7 +28,6 @@
  *    Rickard E. (Rik) Faith <faith@valinux.com>
  * 
  */
-/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/gamma_drv.h,v 1.6 2000/08/28 02:43:15 tsi Exp $ */
 
 #ifndef _GAMMA_DRV_H_
 #define _GAMMA_DRV_H_

diff --git a/linux/i810_context.c b/linux/i810_context.c
index 259c299..c331bee 100644 (file)
--- a/linux/i810_context.c
+++ b/linux/i810_context.c
@@ -28,7 +28,6 @@
  *         Jeff Hartmann <jhartmann@valinux.com>
  *
  */
-/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/i810_context.c,v 1.3 2000/08/28 02:43:15 tsi Exp $ */
 
 #define __NO_VERSION__
 #include "drmP.h"

diff --git a/linux/i810_dma.c b/linux/i810_dma.c
index 11d9973..26fe0c1 100644 (file)
--- a/linux/i810_dma.c
+++ b/linux/i810_dma.c
@@ -29,7 +29,6 @@
  *          Keith Whitwell <keithw@valinux.com>
  *
  */
-/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/i810_dma.c,v 1.6 2000/08/28 02:43:15 tsi Exp $ */
 
 #define __NO_VERSION__
 #include "drmP.h"

diff --git a/linux/i810_drv.c b/linux/i810_drv.c
index 5d4a9c1..ed880c4 100644 (file)
--- a/linux/i810_drv.c
+++ b/linux/i810_drv.c
@@ -28,7 +28,6 @@
  *         Jeff Hartmann <jhartmann@valinux.com>
  *
  */
-/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/i810_drv.c,v 1.5 2000/08/28 02:43:15 tsi Exp $ */
 
 #include <linux/config.h>
 #include "drmP.h"
@@ -36,7 +35,7 @@
 
 #define I810_NAME       "i810"
 #define I810_DESC       "Intel I810"
-#define I810_DATE       "20000910"
+#define I810_DATE       "20000928"
 #define I810_MAJOR      1
 #define I810_MINOR      1
 #define I810_PATCHLEVEL         0

diff --git a/linux/i810_drv.h b/linux/i810_drv.h
index 9f46be5..1c95740 100644 (file)
--- a/linux/i810_drv.h
+++ b/linux/i810_drv.h
@@ -28,7 +28,6 @@
  *         Jeff Hartmann <jhartmann@valinux.com>
  *
  */
-/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/i810_drv.h,v 1.5 2000/08/28 02:43:15 tsi Exp $ */
 
 #ifndef _I810_DRV_H_
 #define _I810_DRV_H_

diff --git a/linux/init.c b/linux/init.c
index 81cbd8f..8de3dac 100644 (file)
--- a/linux/init.c
+++ b/linux/init.c
@@ -28,7 +28,6 @@
  *    Rickard E. (Rik) Faith <faith@valinux.com>
  *
  */
-/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/init.c,v 1.5 2000/08/28 02:43:15 tsi Exp $ */
 
 #define __NO_VERSION__
 #include "drmP.h"

diff --git a/linux/memory.c b/linux/memory.c
index 36d424f..34d19b2 100644 (file)
--- a/linux/memory.c
+++ b/linux/memory.c
@@ -28,7 +28,6 @@
  *    Rickard E. (Rik) Faith <faith@valinux.com>
  *
  */
-/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/memory.c,v 1.8 2000/08/28 02:43:15 tsi Exp $ */
 
 #define __NO_VERSION__
 #include <linux/config.h>

diff --git a/linux/mga_context.c b/linux/mga_context.c
index 1494d5d..5125cff 100644 (file)
--- a/linux/mga_context.c
+++ b/linux/mga_context.c
@@ -28,7 +28,6 @@
  *        Jeff Hartmann <jhartmann@valinux.com>
  *
  */
-/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/mga_context.c,v 1.4 2000/08/28 02:43:15 tsi Exp $ */
 
 #define __NO_VERSION__
 #include "drmP.h"

diff --git a/linux/mga_dma.c b/linux/mga_dma.c
index 9f12a2b..6adffb8 100644 (file)
--- a/linux/mga_dma.c
+++ b/linux/mga_dma.c
@@ -29,7 +29,6 @@
  *         Keith Whitwell <keithw@valinux.com>
  *
  */
-/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/mga_dma.c,v 1.5 2000/08/28 02:43:15 tsi Exp $ */
 
 #define __NO_VERSION__
 #include "drmP.h"
@@ -84,7 +83,7 @@ static void mga_delay(void)
 
 static int mga_freelist_init(drm_device_t *dev)
 {
-       drm_device_dma_t *dma = dev->dma;
+       drm_device_dma_t *dma = dev->dma;
        drm_buf_t *buf;
        drm_mga_buf_priv_t *buf_priv;
        drm_mga_private_t *dev_priv = (drm_mga_private_t *)dev->dev_private;
@@ -766,8 +765,7 @@ static int mga_dma_initialize(drm_device_t *dev, drm_mga_init_t *init) {
                MGA_WRITE(MGAREG_PRIMEND, ((phys_head + num_dwords * 4) |
                                           PDEA_pagpxfer_enable));
 
-                               /* Do we need a looping check? */
-               while(MGA_READ(MGAREG_DWGSYNC) != 0x0100);
+               while(MGA_READ(MGAREG_DWGSYNC) != 0x0100) ;
        }
 
        if(mga_freelist_init(dev) != 0) {

diff --git a/linux/mga_drv.c b/linux/mga_drv.c
index a8cf0c7..4aaac62 100644 (file)
--- a/linux/mga_drv.c
+++ b/linux/mga_drv.c
@@ -29,7 +29,6 @@
  *
  *
  */
-/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/mga_drv.c,v 1.4 2000/08/28 02:43:15 tsi Exp $ */
 
 #include <linux/config.h>
 #include "drmP.h"
@@ -37,10 +36,10 @@
 
 #define MGA_NAME        "mga"
 #define MGA_DESC        "Matrox G200/G400"
-#define MGA_DATE        "20000910"
+#define MGA_DATE        "20000928"
 #define MGA_MAJOR       2
 #define MGA_MINOR       0
-#define MGA_PATCHLEVEL  0
+#define MGA_PATCHLEVEL  1
 
 static drm_device_t          mga_device;
 drm_ctx_t                    mga_res_ctx;
@@ -524,6 +523,7 @@ int mga_release(struct inode *inode, struct file *filp)
                DECLARE_WAITQUEUE(entry, current);
                add_wait_queue(&dev->lock.lock_queue, &entry);
                for (;;) {
+                       current->state = TASK_INTERRUPTIBLE;
                        if (!dev->lock.hw_lock) {
                                /* Device has been unregistered */
                                retcode = -EINTR;
@@ -538,7 +538,6 @@ int mga_release(struct inode *inode, struct file *filp)
                        }
                                /* Contention */
                        atomic_inc(&dev->total_sleeps);
-                       current->state = TASK_INTERRUPTIBLE;
                        schedule();
                        if (signal_pending(current)) {
                                retcode = -ERESTARTSYS;

diff --git a/linux/mga_drv.h b/linux/mga_drv.h
index 61b7bfc..e37cc2e 100644 (file)
--- a/linux/mga_drv.h
+++ b/linux/mga_drv.h
@@ -28,7 +28,6 @@
  *         Jeff Hartmann <jhartmann@valinux.com>
  *
  */
-/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/mga_drv.h,v 1.4 2000/08/28 02:43:15 tsi Exp $ */
 
 #ifndef _MGA_DRV_H_
 #define _MGA_DRV_H_

diff --git a/linux/mga_state.c b/linux/mga_state.c
index c5766dd..9bbd254 100644 (file)
--- a/linux/mga_state.c
+++ b/linux/mga_state.c
@@ -28,7 +28,6 @@
  *         Keith Whitwell <keithw@valinux.com>
  *
  */
-/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/mga_state.c,v 1.5 2000/08/28 02:43:15 tsi Exp $ */
 
 #define __NO_VERSION__
 #include "drmP.h"

diff --git a/linux/picker.c b/linux/picker.c
index 492e535..77519a5 100644 (file)
--- a/linux/picker.c
+++ b/linux/picker.c
@@ -1,6 +1,6 @@
 /* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/picker.c,v 1.3 2000/09/01 02:31:40 tsi Exp $ */
 
-#include <linux/autoconf.h>
+#include <linux/config.h>
 #include <linux/version.h>
 
 #ifndef CONFIG_SMP

diff --git a/linux/proc.c b/linux/proc.c
index f585e91..ca062a0 100644 (file)
--- a/linux/proc.c
+++ b/linux/proc.c
@@ -27,7 +27,6 @@
  * Authors:
  *    Rickard E. (Rik) Faith <faith@valinux.com>
  */
-/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/proc.c,v 1.9 2000/08/28 02:43:15 tsi Exp $ */
 
 #define __NO_VERSION__
 #include "drmP.h"

diff --git a/linux/r128_bufs.c b/linux/r128_bufs.c
index 1712aa5..7e76441 100644 (file)
--- a/linux/r128_bufs.c
+++ b/linux/r128_bufs.c
@@ -29,7 +29,6 @@
  *         Jeff Hartmann <jhartmann@valinux.com>
  * 
  */
-/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/r128_bufs.c,v 1.3 2000/08/28 02:43:16 tsi Exp $ */
 
 #define __NO_VERSION__
 #include <linux/config.h>

diff --git a/linux/r128_context.c b/linux/r128_context.c
index 9ac4ad8..9cadadb 100644 (file)
--- a/linux/r128_context.c
+++ b/linux/r128_context.c
@@ -27,7 +27,6 @@
  * Author: Rickard E. (Rik) Faith <faith@valinux.com>
  *
  */
-/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/r128_context.c,v 1.3 2000/08/28 02:43:16 tsi Exp $ */
 
 #define __NO_VERSION__
 #include "drmP.h"

diff --git a/linux/r128_drv.c b/linux/r128_drv.c
index dcb766a..7ae4980 100644 (file)
--- a/linux/r128_drv.c
+++ b/linux/r128_drv.c
@@ -28,7 +28,6 @@
  *          Kevin E. Martin <martin@valinux.com>
  *
  */
-/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/r128_drv.c,v 1.3 2000/08/28 02:43:16 tsi Exp $ */
 
 #include <linux/config.h>
 #include "drmP.h"
@@ -36,7 +35,7 @@
 
 #define R128_NAME       "r128"
 #define R128_DESC       "ATI Rage 128"
-#define R128_DATE       "20000910"
+#define R128_DATE       "20000928"
 #define R128_MAJOR      1
 #define R128_MINOR      0
 #define R128_PATCHLEVEL  0

diff --git a/linux/r128_drv.h b/linux/r128_drv.h
index 860dbf9..63b98c7 100644 (file)
--- a/linux/r128_drv.h
+++ b/linux/r128_drv.h
@@ -28,7 +28,6 @@
  *          Kevin E. Martin <martin@valinux.com>
  *
  */
-/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/r128_drv.h,v 1.4 2000/08/28 02:43:16 tsi Exp $ */
 
 #ifndef _R128_DRV_H_
 #define _R128_DRV_H_

diff --git a/linux/sis_context.c b/linux/sis_context.c
index e13bd85..f2fdf6d 100644 (file)
--- a/linux/sis_context.c
+++ b/linux/sis_context.c
@@ -30,7 +30,6 @@
  *    Sung-Ching Lin <sclin@sis.com.tw>
  * 
  */
-/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/sis_context.c,v 1.3 2000/09/22 11:35:47 alanh Exp $ */
 
 #define __NO_VERSION__
 #include "drmP.h"

diff --git a/linux/sis_drm.h b/linux/sis_drm.h
index dd14a5a..73807f3 100644 (file)
--- a/linux/sis_drm.h
+++ b/linux/sis_drm.h
@@ -1,4 +1,3 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/sis_drm_public.h,v 1.2 2000/08/04 03:51:47 tsi Exp $ */
 
 #ifndef _sis_drm_public_h_
 #define _sis_drm_public_h_

diff --git a/linux/sis_drv.c b/linux/sis_drv.c
index 0b1990b..2f98e32 100644 (file)
--- a/linux/sis_drv.c
+++ b/linux/sis_drv.c
@@ -24,7 +24,6 @@
  * DEALINGS IN THE SOFTWARE.
  *
  */
-/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/sis_drv.c,v 1.5 2000/09/22 11:35:47 alanh Exp $ */
 
 #include <linux/config.h>
 #include "drmP.h"
@@ -575,6 +574,7 @@ int sis_lock(struct inode *inode, struct file *filp, unsigned int cmd,
 #endif
                 add_wait_queue(&dev->lock.lock_queue, &entry);
                 for (;;) {
+                        current->state = TASK_INTERRUPTIBLE;
                         if (!dev->lock.hw_lock) {
                                 /* Device has been unregistered */
                                 ret = -EINTR;
@@ -590,7 +590,6 @@ int sis_lock(struct inode *inode, struct file *filp, unsigned int cmd,
                         
                                 /* Contention */
                         atomic_inc(&dev->total_sleeps);
-                        current->state = TASK_INTERRUPTIBLE;
 #if 1
                        current->policy |= SCHED_YIELD;
 #endif

diff --git a/linux/sis_drv.h b/linux/sis_drv.h
index 8dd25e0..8c4e291 100644 (file)
--- a/linux/sis_drv.h
+++ b/linux/sis_drv.h
@@ -24,7 +24,6 @@
  * DEALINGS IN THE SOFTWARE.
  * 
  */
-/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/sis_drv.h,v 1.3 2000/09/22 11:35:47 alanh Exp $ */
 
 #ifndef _SIS_DRV_H_
 #define _SIS_DRV_H_

diff --git a/linux/sis_ds.c b/linux/sis_ds.c
index a946a41..6143ad8 100644 (file)
--- a/linux/sis_ds.c
+++ b/linux/sis_ds.c
@@ -27,7 +27,6 @@
  *    Sung-Ching Lin <sclin@sis.com.tw>
  * 
  */
-/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/sis_ds.c,v 1.2 2000/09/22 11:35:47 alanh Exp $ */
 
 #define __NO_VERSION__
 #include <linux/module.h>
@@ -163,7 +162,6 @@ int setDestroy(set_t *set)
  * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  *
  */
-/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/sis_ds.c,v 1.2 2000/09/22 11:35:47 alanh Exp $ */
 
 #define ISFREE(bptr) ((bptr)->free)
 

diff --git a/linux/sis_ds.h b/linux/sis_ds.h
index 59d58b8..c3367db 100644 (file)
--- a/linux/sis_ds.h
+++ b/linux/sis_ds.h
@@ -27,7 +27,6 @@
  *    Sung-Ching Lin <sclin@sis.com.tw>
  * 
  */
-/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/sis_ds.h,v 1.3 2000/09/22 11:35:47 alanh Exp $ */
 
 #ifndef _sis_ds_h_
 #define _sis_ds_h_

diff --git a/linux/sis_mm.c b/linux/sis_mm.c
index f60da78..e6e8ed7 100644 (file)
--- a/linux/sis_mm.c
+++ b/linux/sis_mm.c
@@ -27,7 +27,6 @@
  *    Sung-Ching Lin <sclin@sis.com.tw>
  * 
  */
-/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/sis_mm.c,v 1.4 2000/09/22 11:35:47 alanh Exp $ */
 
 #define __NO_VERSION__
 #include "drmP.h"

diff --git a/linux/tdfx_context.c b/linux/tdfx_context.c
index 9c07ed8..1fd7331 100644 (file)
--- a/linux/tdfx_context.c
+++ b/linux/tdfx_context.c
@@ -29,7 +29,6 @@
  *    Daryll Strauss <daryll@valinux.com>
  * 
  */
-/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/tdfx_context.c,v 1.5 2000/08/28 02:43:16 tsi Exp $ */
 
 #define __NO_VERSION__
 #include "drmP.h"

diff --git a/linux/tdfx_drv.c b/linux/tdfx_drv.c
index d8f5bcc..5f2c804 100644 (file)
--- a/linux/tdfx_drv.c
+++ b/linux/tdfx_drv.c
@@ -1,4 +1,4 @@
-/* tdfx.c -- tdfx driver -*- linux-c -*-
+/* tdfx_drv.c -- tdfx driver -*- linux-c -*-
  * Created: Thu Oct  7 10:38:32 1999 by faith@precisioninsight.com
  *
  * Copyright 1999 Precision Insight, Inc., Cedar Park, Texas.
@@ -29,7 +29,6 @@
  *    Daryll Strauss <daryll@valinux.com>
  *
  */
-/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/tdfx_drv.c,v 1.6 2000/08/28 02:43:16 tsi Exp $ */
 
 #include <linux/config.h>
 #include "drmP.h"
@@ -37,7 +36,7 @@
 
 #define TDFX_NAME       "tdfx"
 #define TDFX_DESC       "3dfx Banshee/Voodoo3+"
-#define TDFX_DATE       "20000910"
+#define TDFX_DATE       "20000928"
 #define TDFX_MAJOR      1
 #define TDFX_MINOR      0
 #define TDFX_PATCHLEVEL  0

diff --git a/linux/tdfx_drv.h b/linux/tdfx_drv.h
index e6ec7aa..bee840e 100644 (file)
--- a/linux/tdfx_drv.h
+++ b/linux/tdfx_drv.h
@@ -29,7 +29,6 @@
  *    Daryll Strauss <daryll@valinux.com>
  * 
  */
-/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/tdfx_drv.h,v 1.5 2000/08/28 02:43:16 tsi Exp $ */
 
 #ifndef _TDFX_DRV_H_
 #define _TDFX_DRV_H_

diff --git a/linux/vm.c b/linux/vm.c
index 4c78be8..964921b 100644 (file)
--- a/linux/vm.c
+++ b/linux/vm.c
@@ -28,7 +28,6 @@
  *    Rickard E. (Rik) Faith <faith@valinux.com>
  *
  */
-/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/vm.c,v 1.8 2000/08/28 02:43:16 tsi Exp $ */
 
 #define __NO_VERSION__
 #include "drmP.h"

diff --git a/shared-core/drm.h b/shared-core/drm.h
index 6cfe88f..7177147 100644 (file)
--- a/shared-core/drm.h
+++ b/shared-core/drm.h
@@ -31,7 +31,6 @@
  * Dec 1999, Richard Henderson <rth@twiddle.net>, move to generic cmpxchg.
  *
  */
-/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/drm.h,v 1.9 2000/08/24 22:20:18 tsi Exp $ */
 
 #ifndef _DRM_H_
 #define _DRM_H_

diff --git a/shared/drm.h b/shared/drm.h
index 6cfe88f..7177147 100644 (file)
--- a/shared/drm.h
+++ b/shared/drm.h
@@ -31,7 +31,6 @@
  * Dec 1999, Richard Henderson <rth@twiddle.net>, move to generic cmpxchg.
  *
  */
-/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/drm.h,v 1.9 2000/08/24 22:20:18 tsi Exp $ */
 
 #ifndef _DRM_H_
 #define _DRM_H_