geemili
/
drm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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
main
Rik Faith 2000-09-29 01:47:11 +00:00
parent b0a7efb5a9
commit 39a659e877
52 changed files with 22 additions and 87 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
linux-core/Makefile.kernel
View File

@ -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 # Makefile for the drm device driver. This driver provides support for
# the Direct Rendering Infrastructure (DRI) in XFree86 4.x. # the Direct Rendering Infrastructure (DRI) in XFree86 4.x.

1
linux-core/README.drm
View File

@ -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: * * For the very latest on DRI development, please see: *

1
linux-core/drmP.h
View File

@ -28,7 +28,6 @@
* Rickard E. (Rik) Faith <faith@valinux.com> * 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_ #ifndef _DRM_P_H_
#define _DRM_P_H_ #define _DRM_P_H_

1
linux-core/i810_dma.c
View File

@ -29,7 +29,6 @@
* Keith Whitwell <keithw@valinux.com> * 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__ #define __NO_VERSION__
#include "drmP.h" #include "drmP.h"

3
linux-core/i810_drv.c
View File

@ -28,7 +28,6 @@
* Jeff Hartmann <jhartmann@valinux.com> * 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 <linux/config.h>
#include "drmP.h" #include "drmP.h"
@ -36,7 +35,7 @@
#define I810_NAME "i810" #define I810_NAME "i810"
#define I810_DESC "Intel I810" #define I810_DESC "Intel I810"
#define I810_DATE "20000910" #define I810_DATE "20000928"
#define I810_MAJOR 1 #define I810_MAJOR 1
#define I810_MINOR 1 #define I810_MINOR 1
#define I810_PATCHLEVEL 0 #define I810_PATCHLEVEL 0

1
linux-core/i810_drv.h
View File

@ -28,7 +28,6 @@
* Jeff Hartmann <jhartmann@valinux.com> * 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_ #ifndef _I810_DRV_H_
#define _I810_DRV_H_ #define _I810_DRV_H_

7
linux-core/mga_drv.c
View File

@ -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 <linux/config.h>
#include "drmP.h" #include "drmP.h"
@ -37,10 +36,10 @@
#define MGA_NAME "mga" #define MGA_NAME "mga"
#define MGA_DESC "Matrox G200/G400" #define MGA_DESC "Matrox G200/G400"
#define MGA_DATE "20000910" #define MGA_DATE "20000928"
#define MGA_MAJOR 2 #define MGA_MAJOR 2
#define MGA_MINOR 0 #define MGA_MINOR 0
#define MGA_PATCHLEVEL 0 #define MGA_PATCHLEVEL 1
static drm_device_t mga_device; static drm_device_t mga_device;
drm_ctx_t mga_res_ctx; drm_ctx_t mga_res_ctx;
@ -524,6 +523,7 @@ int mga_release(struct inode *inode, struct file *filp)
DECLARE_WAITQUEUE(entry, current); DECLARE_WAITQUEUE(entry, current);
add_wait_queue(&dev->lock.lock_queue, &entry); add_wait_queue(&dev->lock.lock_queue, &entry);
for (;;) { for (;;) {
current->state = TASK_INTERRUPTIBLE;
if (!dev->lock.hw_lock) { if (!dev->lock.hw_lock) {
/* Device has been unregistered */ /* Device has been unregistered */
retcode = -EINTR; retcode = -EINTR;
@ -538,7 +538,6 @@ int mga_release(struct inode *inode, struct file *filp)
} }
/* Contention */ /* Contention */
atomic_inc(&dev->total_sleeps); atomic_inc(&dev->total_sleeps);
current->state = TASK_INTERRUPTIBLE;
schedule(); schedule();
if (signal_pending(current)) { if (signal_pending(current)) {
retcode = -ERESTARTSYS; retcode = -ERESTARTSYS;

3
linux-core/r128_drv.c
View File

@ -28,7 +28,6 @@
* Kevin E. Martin <martin@valinux.com> * 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 <linux/config.h>
#include "drmP.h" #include "drmP.h"
@ -36,7 +35,7 @@
#define R128_NAME "r128" #define R128_NAME "r128"
#define R128_DESC "ATI Rage 128" #define R128_DESC "ATI Rage 128"
#define R128_DATE "20000910" #define R128_DATE "20000928"
#define R128_MAJOR 1 #define R128_MAJOR 1
#define R128_MINOR 0 #define R128_MINOR 0
#define R128_PATCHLEVEL 0 #define R128_PATCHLEVEL 0

3
linux-core/sis_drv.c
View File

@ -24,7 +24,6 @@
* DEALINGS IN THE SOFTWARE. * 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 <linux/config.h>
#include "drmP.h" #include "drmP.h"
@ -575,6 +574,7 @@ int sis_lock(struct inode *inode, struct file *filp, unsigned int cmd,
#endif #endif
add_wait_queue(&dev->lock.lock_queue, &entry); add_wait_queue(&dev->lock.lock_queue, &entry);
for (;;) { for (;;) {
current->state = TASK_INTERRUPTIBLE;
if (!dev->lock.hw_lock) { if (!dev->lock.hw_lock) {
/* Device has been unregistered */ /* Device has been unregistered */
ret = -EINTR; ret = -EINTR;
@ -590,7 +590,6 @@ int sis_lock(struct inode *inode, struct file *filp, unsigned int cmd,
/* Contention */ /* Contention */
atomic_inc(&dev->total_sleeps); atomic_inc(&dev->total_sleeps);
current->state = TASK_INTERRUPTIBLE;
#if 1 #if 1
current->policy |= SCHED_YIELD; current->policy |= SCHED_YIELD;
#endif #endif

5
linux-core/tdfx_drv.c
View File

@ -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 * Created: Thu Oct 7 10:38:32 1999 by faith@precisioninsight.com
* *
* Copyright 1999 Precision Insight, Inc., Cedar Park, Texas. * Copyright 1999 Precision Insight, Inc., Cedar Park, Texas.
@ -29,7 +29,6 @@
* Daryll Strauss <daryll@valinux.com> * 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 <linux/config.h>
#include "drmP.h" #include "drmP.h"
@ -37,7 +36,7 @@
#define TDFX_NAME "tdfx" #define TDFX_NAME "tdfx"
#define TDFX_DESC "3dfx Banshee/Voodoo3+" #define TDFX_DESC "3dfx Banshee/Voodoo3+"
#define TDFX_DATE "20000910" #define TDFX_DATE "20000928"
#define TDFX_MAJOR 1 #define TDFX_MAJOR 1
#define TDFX_MINOR 0 #define TDFX_MINOR 0
#define TDFX_PATCHLEVEL 0 #define TDFX_PATCHLEVEL 0

1
linux/Makefile.kernel
View File

@ -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 # Makefile for the drm device driver. This driver provides support for
# the Direct Rendering Infrastructure (DRI) in XFree86 4.x. # the Direct Rendering Infrastructure (DRI) in XFree86 4.x.

14
linux/Makefile.linux
View File

@ -24,7 +24,6 @@
# ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER # ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
# DEALINGS IN THE SOFTWARE. # 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 ***** # ***** NOTE NOTE NOTE NOTE NOTE *****
# To override the automatic Linux source tree determination, pass the # To override the automatic Linux source tree determination, pass the
@ -50,7 +49,6 @@
MODS= gamma.o tdfx.o r128.o MODS= gamma.o tdfx.o r128.o
LIBS= libdrm.a LIBS= libdrm.a
PROGS= drmstat
DRMOBJS= init.o memory.o proc.o auth.o context.o drawable.o bufs.o \ 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 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 R128OBJS= r128_drv.o r128_dma.o r128_bufs.o r128_context.o
R128HEADERS= r128_drv.h r128_drm.h $(DRMHEADERS) 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 INC= /usr/include
CFLAGS= -O2 $(WARNINGS) CFLAGS= -O2 $(WARNINGS)
@ -227,9 +222,6 @@ i810.o: $(I810OBJS) $(LIBS)
$(LD) -r $^ -o $@ $(LD) -r $^ -o $@
endif endif
drmstat: $(PROGOBJS)
$(CC) $(PRGCFLAGS) $^ $(PRGLIBS) -o $@
.PHONY: ChangeLog .PHONY: ChangeLog
ChangeLog: ChangeLog:
@rm -f Changelog @rm -f Changelog
@ -243,9 +235,6 @@ ChangeLog:
%.o: %.c %.o: %.c
$(CC) $(MODCFLAGS) -I$(TREE) -c $< -o $@ $(CC) $(MODCFLAGS) -I$(TREE) -c $< -o $@
%.po: %.c
$(CC) $(PRGCFLAGS) -DDRM_USE_MALLOC -c $< -o $@
$(DRMOBJS): $(DRMHEADERS) $(DRMOBJS): $(DRMHEADERS)
$(GAMMAOBJS): $(GAMMAHEADERS) $(GAMMAOBJS): $(GAMMAHEADERS)
$(TDFXOBJS): $(TDFXHEADERS) $(TDFXOBJS): $(TDFXHEADERS)
@ -254,7 +243,6 @@ ifeq ($(AGP),1)
$(MGAOBJS): $(MGAHEADERS) $(MGAOBJS): $(MGAHEADERS)
$(I810OBJS): $(I810HEADERS) $(I810OBJS): $(I810HEADERS)
endif endif
$(PROGOBJS): $(PROGHEADERS)
clean: clean:
rm -f *.o *.a *.po *~ core $(PROGS) rm -f *.o *.a *~ core

1
linux/README.drm
View File

@ -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: * * For the very latest on DRI development, please see: *

2
linux/agpsupport.c
View File

@ -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__ #define __NO_VERSION__
#include "drmP.h" #include "drmP.h"
#include <linux/module.h> #include <linux/module.h>

1
linux/auth.c
View File

@ -28,7 +28,6 @@
* Rickard E. (Rik) Faith <faith@valinux.com> * 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__ #define __NO_VERSION__
#include "drmP.h" #include "drmP.h"

1
linux/bufs.c
View File

@ -28,7 +28,6 @@
* Rickard E. (Rik) Faith <faith@valinux.com> * 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__ #define __NO_VERSION__
#include <linux/config.h> #include <linux/config.h>

1
linux/drm.h
View File

@ -31,7 +31,6 @@
* Dec 1999, Richard Henderson <rth@twiddle.net>, move to generic cmpxchg. * 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_ #ifndef _DRM_H_
#define _DRM_H_ #define _DRM_H_

1
linux/drmP.h
View File

@ -28,7 +28,6 @@
* Rickard E. (Rik) Faith <faith@valinux.com> * 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_ #ifndef _DRM_P_H_
#define _DRM_P_H_ #define _DRM_P_H_

1
linux/fops.c
View File

@ -29,7 +29,6 @@
* Daryll Strauss <daryll@valinux.com> * 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__ #define __NO_VERSION__
#include "drmP.h" #include "drmP.h"

5
linux/gamma_dma.c
View File

@ -542,10 +542,9 @@ static int gamma_dma_send_buffers(drm_device_t *dev, drm_dma_t *d)
if (d->flags & _DRM_DMA_BLOCK) { if (d->flags & _DRM_DMA_BLOCK) {
DRM_DEBUG("%d waiting\n", current->pid); DRM_DEBUG("%d waiting\n", current->pid);
current->state = TASK_INTERRUPTIBLE;
for (;;) { for (;;) {
if (!last_buf->waiting current->state = TASK_INTERRUPTIBLE;
&& !last_buf->pending) if (!last_buf->waiting && !last_buf->pending)
break; /* finished */ break; /* finished */
schedule(); schedule();
if (signal_pending(current)) { if (signal_pending(current)) {

1
linux/gamma_drv.c
View File

@ -28,7 +28,6 @@
* Rickard E. (Rik) Faith <faith@valinux.com> * 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 <linux/config.h>
#include "drmP.h" #include "drmP.h"

1
linux/gamma_drv.h
View File

@ -28,7 +28,6 @@
* Rickard E. (Rik) Faith <faith@valinux.com> * 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_ #ifndef _GAMMA_DRV_H_
#define _GAMMA_DRV_H_ #define _GAMMA_DRV_H_

1
linux/i810_context.c
View File

@ -28,7 +28,6 @@
* Jeff Hartmann <jhartmann@valinux.com> * 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__ #define __NO_VERSION__
#include "drmP.h" #include "drmP.h"

1
linux/i810_dma.c
View File

@ -29,7 +29,6 @@
* Keith Whitwell <keithw@valinux.com> * 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__ #define __NO_VERSION__
#include "drmP.h" #include "drmP.h"

3
linux/i810_drv.c
View File

@ -28,7 +28,6 @@
* Jeff Hartmann <jhartmann@valinux.com> * 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 <linux/config.h>
#include "drmP.h" #include "drmP.h"
@ -36,7 +35,7 @@
#define I810_NAME "i810" #define I810_NAME "i810"
#define I810_DESC "Intel I810" #define I810_DESC "Intel I810"
#define I810_DATE "20000910" #define I810_DATE "20000928"
#define I810_MAJOR 1 #define I810_MAJOR 1
#define I810_MINOR 1 #define I810_MINOR 1
#define I810_PATCHLEVEL 0 #define I810_PATCHLEVEL 0

1
linux/i810_drv.h
View File

@ -28,7 +28,6 @@
* Jeff Hartmann <jhartmann@valinux.com> * 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_ #ifndef _I810_DRV_H_
#define _I810_DRV_H_ #define _I810_DRV_H_

1
linux/init.c
View File

@ -28,7 +28,6 @@
* Rickard E. (Rik) Faith <faith@valinux.com> * 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__ #define __NO_VERSION__
#include "drmP.h" #include "drmP.h"

1
linux/memory.c
View File

@ -28,7 +28,6 @@
* Rickard E. (Rik) Faith <faith@valinux.com> * 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__ #define __NO_VERSION__
#include <linux/config.h> #include <linux/config.h>

1
linux/mga_context.c
View File

@ -28,7 +28,6 @@
* Jeff Hartmann <jhartmann@valinux.com> * 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__ #define __NO_VERSION__
#include "drmP.h" #include "drmP.h"

6
linux/mga_dma.c
View File

@ -29,7 +29,6 @@
* Keith Whitwell <keithw@valinux.com> * 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__ #define __NO_VERSION__
#include "drmP.h" #include "drmP.h"
@ -84,7 +83,7 @@ static void mga_delay(void)
static int mga_freelist_init(drm_device_t *dev) 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_buf_t *buf;
drm_mga_buf_priv_t *buf_priv; drm_mga_buf_priv_t *buf_priv;
drm_mga_private_t *dev_priv = (drm_mga_private_t *)dev->dev_private; 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) | MGA_WRITE(MGAREG_PRIMEND, ((phys_head + num_dwords * 4) |
PDEA_pagpxfer_enable)); 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) { if(mga_freelist_init(dev) != 0) {

7
linux/mga_drv.c
View File

@ -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 <linux/config.h>
#include "drmP.h" #include "drmP.h"
@ -37,10 +36,10 @@
#define MGA_NAME "mga" #define MGA_NAME "mga"
#define MGA_DESC "Matrox G200/G400" #define MGA_DESC "Matrox G200/G400"
#define MGA_DATE "20000910" #define MGA_DATE "20000928"
#define MGA_MAJOR 2 #define MGA_MAJOR 2
#define MGA_MINOR 0 #define MGA_MINOR 0
#define MGA_PATCHLEVEL 0 #define MGA_PATCHLEVEL 1
static drm_device_t mga_device; static drm_device_t mga_device;
drm_ctx_t mga_res_ctx; drm_ctx_t mga_res_ctx;
@ -524,6 +523,7 @@ int mga_release(struct inode *inode, struct file *filp)
DECLARE_WAITQUEUE(entry, current); DECLARE_WAITQUEUE(entry, current);
add_wait_queue(&dev->lock.lock_queue, &entry); add_wait_queue(&dev->lock.lock_queue, &entry);
for (;;) { for (;;) {
current->state = TASK_INTERRUPTIBLE;
if (!dev->lock.hw_lock) { if (!dev->lock.hw_lock) {
/* Device has been unregistered */ /* Device has been unregistered */
retcode = -EINTR; retcode = -EINTR;
@ -538,7 +538,6 @@ int mga_release(struct inode *inode, struct file *filp)
} }
/* Contention */ /* Contention */
atomic_inc(&dev->total_sleeps); atomic_inc(&dev->total_sleeps);
current->state = TASK_INTERRUPTIBLE;
schedule(); schedule();
if (signal_pending(current)) { if (signal_pending(current)) {
retcode = -ERESTARTSYS; retcode = -ERESTARTSYS;

1
linux/mga_drv.h
View File

@ -28,7 +28,6 @@
* Jeff Hartmann <jhartmann@valinux.com> * 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_ #ifndef _MGA_DRV_H_
#define _MGA_DRV_H_ #define _MGA_DRV_H_

1
linux/mga_state.c
View File

@ -28,7 +28,6 @@
* Keith Whitwell <keithw@valinux.com> * 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__ #define __NO_VERSION__
#include "drmP.h" #include "drmP.h"

2
linux/picker.c
View File

@ -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 $ */ /* $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> #include <linux/version.h>
#ifndef CONFIG_SMP #ifndef CONFIG_SMP

1
linux/proc.c
View File

@ -27,7 +27,6 @@
* Authors: * Authors:
* Rickard E. (Rik) Faith <faith@valinux.com> * 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__ #define __NO_VERSION__
#include "drmP.h" #include "drmP.h"

1
linux/r128_bufs.c
View File

@ -29,7 +29,6 @@
* Jeff Hartmann <jhartmann@valinux.com> * 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__ #define __NO_VERSION__
#include <linux/config.h> #include <linux/config.h>

1
linux/r128_context.c
View File

@ -27,7 +27,6 @@
* Author: Rickard E. (Rik) Faith <faith@valinux.com> * 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__ #define __NO_VERSION__
#include "drmP.h" #include "drmP.h"

3
linux/r128_drv.c
View File

@ -28,7 +28,6 @@
* Kevin E. Martin <martin@valinux.com> * 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 <linux/config.h>
#include "drmP.h" #include "drmP.h"
@ -36,7 +35,7 @@
#define R128_NAME "r128" #define R128_NAME "r128"
#define R128_DESC "ATI Rage 128" #define R128_DESC "ATI Rage 128"
#define R128_DATE "20000910" #define R128_DATE "20000928"
#define R128_MAJOR 1 #define R128_MAJOR 1
#define R128_MINOR 0 #define R128_MINOR 0
#define R128_PATCHLEVEL 0 #define R128_PATCHLEVEL 0

1
linux/r128_drv.h
View File

@ -28,7 +28,6 @@
* Kevin E. Martin <martin@valinux.com> * 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_ #ifndef _R128_DRV_H_
#define _R128_DRV_H_ #define _R128_DRV_H_

1
linux/sis_context.c
View File

@ -30,7 +30,6 @@
* Sung-Ching Lin <sclin@sis.com.tw> * 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__ #define __NO_VERSION__
#include "drmP.h" #include "drmP.h"

1
linux/sis_drm.h
View File

@ -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_ #ifndef _sis_drm_public_h_
#define _sis_drm_public_h_ #define _sis_drm_public_h_

3
linux/sis_drv.c
View File

@ -24,7 +24,6 @@
* DEALINGS IN THE SOFTWARE. * 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 <linux/config.h>
#include "drmP.h" #include "drmP.h"
@ -575,6 +574,7 @@ int sis_lock(struct inode *inode, struct file *filp, unsigned int cmd,
#endif #endif
add_wait_queue(&dev->lock.lock_queue, &entry); add_wait_queue(&dev->lock.lock_queue, &entry);
for (;;) { for (;;) {
current->state = TASK_INTERRUPTIBLE;
if (!dev->lock.hw_lock) { if (!dev->lock.hw_lock) {
/* Device has been unregistered */ /* Device has been unregistered */
ret = -EINTR; ret = -EINTR;
@ -590,7 +590,6 @@ int sis_lock(struct inode *inode, struct file *filp, unsigned int cmd,
/* Contention */ /* Contention */
atomic_inc(&dev->total_sleeps); atomic_inc(&dev->total_sleeps);
current->state = TASK_INTERRUPTIBLE;
#if 1 #if 1
current->policy |= SCHED_YIELD; current->policy |= SCHED_YIELD;
#endif #endif

1
linux/sis_drv.h
View File

@ -24,7 +24,6 @@
* DEALINGS IN THE SOFTWARE. * 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_ #ifndef _SIS_DRV_H_
#define _SIS_DRV_H_ #define _SIS_DRV_H_

2
linux/sis_ds.c
View File

@ -27,7 +27,6 @@
* Sung-Ching Lin <sclin@sis.com.tw> * 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__ #define __NO_VERSION__
#include <linux/module.h> #include <linux/module.h>
@ -163,7 +162,6 @@ int setDestroy(set_t *set)
* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * 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) #define ISFREE(bptr) ((bptr)->free)

1
linux/sis_ds.h
View File

@ -27,7 +27,6 @@
* Sung-Ching Lin <sclin@sis.com.tw> * 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_ #ifndef _sis_ds_h_
#define _sis_ds_h_ #define _sis_ds_h_

1
linux/sis_mm.c
View File

@ -27,7 +27,6 @@
* Sung-Ching Lin <sclin@sis.com.tw> * 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__ #define __NO_VERSION__
#include "drmP.h" #include "drmP.h"

1
linux/tdfx_context.c
View File

@ -29,7 +29,6 @@
* Daryll Strauss <daryll@valinux.com> * 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__ #define __NO_VERSION__
#include "drmP.h" #include "drmP.h"

5
linux/tdfx_drv.c
View File

@ -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 * Created: Thu Oct 7 10:38:32 1999 by faith@precisioninsight.com
* *
* Copyright 1999 Precision Insight, Inc., Cedar Park, Texas. * Copyright 1999 Precision Insight, Inc., Cedar Park, Texas.
@ -29,7 +29,6 @@
* Daryll Strauss <daryll@valinux.com> * 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 <linux/config.h>
#include "drmP.h" #include "drmP.h"
@ -37,7 +36,7 @@
#define TDFX_NAME "tdfx" #define TDFX_NAME "tdfx"
#define TDFX_DESC "3dfx Banshee/Voodoo3+" #define TDFX_DESC "3dfx Banshee/Voodoo3+"
#define TDFX_DATE "20000910" #define TDFX_DATE "20000928"
#define TDFX_MAJOR 1 #define TDFX_MAJOR 1
#define TDFX_MINOR 0 #define TDFX_MINOR 0
#define TDFX_PATCHLEVEL 0 #define TDFX_PATCHLEVEL 0

1
linux/tdfx_drv.h
View File

@ -29,7 +29,6 @@
* Daryll Strauss <daryll@valinux.com> * 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_ #ifndef _TDFX_DRV_H_
#define _TDFX_DRV_H_ #define _TDFX_DRV_H_

1
linux/vm.c
View File

@ -28,7 +28,6 @@
* Rickard E. (Rik) Faith <faith@valinux.com> * 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__ #define __NO_VERSION__
#include "drmP.h" #include "drmP.h"

1
shared-core/drm.h
View File

@ -31,7 +31,6 @@
* Dec 1999, Richard Henderson <rth@twiddle.net>, move to generic cmpxchg. * 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_ #ifndef _DRM_H_
#define _DRM_H_ #define _DRM_H_

1
shared/drm.h
View File

@ -31,7 +31,6 @@
* Dec 1999, Richard Henderson <rth@twiddle.net>, move to generic cmpxchg. * 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_ #ifndef _DRM_H_
#define _DRM_H_ #define _DRM_H_