From 1c33c6909546e3b51f36c04bba12cc2275149902 Mon Sep 17 00:00:00 2001 From: Rik Faith Date: Thu, 6 Jan 2000 12:55:00 +0000 Subject: Import of XFree86 3.9.17 --- linux/Makefile.kernel | 8 +------- linux/Makefile.linux | 2 +- linux/bufs.c | 2 +- linux/dma.c | 2 +- linux/drm.h | 2 +- linux/drmP.h | 2 +- linux/fops.c | 2 +- linux/gamma_drv.c | 2 +- linux/lists.c | 2 +- linux/lock.c | 2 +- linux/memory.c | 2 +- linux/proc.c | 18 +++++++++--------- linux/tdfx_context.c | 2 +- linux/tdfx_drv.c | 2 +- linux/tdfx_drv.h | 2 +- linux/vm.c | 2 +- 16 files changed, 24 insertions(+), 30 deletions(-) (limited to 'linux') diff --git a/linux/Makefile.kernel b/linux/Makefile.kernel index 57c6c50c..c286d8fd 100644 --- a/linux/Makefile.kernel +++ b/linux/Makefile.kernel @@ -9,6 +9,7 @@ # Note 2! The CFLAGS definitions are now inherited from the # parent makes.. # +# $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/Makefile.kernel,v 1.2 1999/09/27 14:59:24 dawes Exp $ L_TARGET := libdrm.a @@ -21,14 +22,7 @@ ifdef CONFIG_DRM_GAMMA M_OBJS += gamma.o endif -ifdef CONFIG_DRM_TDFX -M_OBJS += tdfx.o -endif - include $(TOPDIR)/Rules.make gamma.o: gamma_drv.o gamma_dma.o $(L_TARGET) $(LD) $(LD_RFLAG) -r -o $@ gamma_drv.o gamma_dma.o -L. -ldrm - -tdfx.o: tdfx_drv.o tdfx_context.o $(L_TARGET) - $(LD) $(LD_RFLAG) -r -o $@ tdfx_drv.o tdfx_context.o -L. -ldrm diff --git a/linux/Makefile.linux b/linux/Makefile.linux index a0bdeb52..95fe7585 100644 --- a/linux/Makefile.linux +++ b/linux/Makefile.linux @@ -25,7 +25,7 @@ # DEALINGS IN THE SOFTWARE. # # $PI: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/generic/Makefile.linux,v 1.23 1999/07/02 17:46:30 faith Exp $ -# $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/generic/Makefile.linux,v 1.3 1999/06/27 14:08:21 dawes Exp $ +# $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/Makefile.linux,v 1.2 1999/12/14 01:33:55 robin Exp $ # .SUFFIXES: diff --git a/linux/bufs.c b/linux/bufs.c index 780c4fb6..72ba990f 100644 --- a/linux/bufs.c +++ b/linux/bufs.c @@ -25,7 +25,7 @@ * DEALINGS IN THE SOFTWARE. * * $PI: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/bufs.c,v 1.8 1999/08/30 13:05:00 faith Exp $ - * $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/bufs.c,v 1.1 1999/09/25 14:37:57 dawes Exp $ + * $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/bufs.c,v 1.2 1999/12/14 01:33:55 robin Exp $ * */ diff --git a/linux/dma.c b/linux/dma.c index ea08a859..9b6aacdb 100644 --- a/linux/dma.c +++ b/linux/dma.c @@ -25,7 +25,7 @@ * DEALINGS IN THE SOFTWARE. * * $PI: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/dma.c,v 1.7 1999/09/16 16:56:18 faith Exp $ - * $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/dma.c,v 1.1 1999/09/25 14:37:58 dawes Exp $ + * $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/dma.c,v 1.2 1999/12/14 01:33:55 robin Exp $ * */ diff --git a/linux/drm.h b/linux/drm.h index 320db51e..6c0b2206 100644 --- a/linux/drm.h +++ b/linux/drm.h @@ -25,7 +25,7 @@ * DEALINGS IN THE SOFTWARE. * * $PI: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/drm.h,v 1.46 1999/08/20 20:00:53 faith Exp $ - * $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/drm.h,v 1.1 1999/09/25 14:37:58 dawes Exp $ + * $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/drm.h,v 1.2 1999/12/14 01:33:56 robin Exp $ * * Acknowledgements: * Dec 1999, Richard Henderson , move to generic cmpxchg. diff --git a/linux/drmP.h b/linux/drmP.h index 966e6e05..e01cf28b 100644 --- a/linux/drmP.h +++ b/linux/drmP.h @@ -25,7 +25,7 @@ * DEALINGS IN THE SOFTWARE. * * $PI: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/drmP.h,v 1.58 1999/08/30 13:05:00 faith Exp $ - * $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/drmP.h,v 1.1 1999/09/25 14:37:59 dawes Exp $ + * $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/drmP.h,v 1.2 1999/12/14 01:33:56 robin Exp $ * */ diff --git a/linux/fops.c b/linux/fops.c index 47eacb83..39bfdbb8 100644 --- a/linux/fops.c +++ b/linux/fops.c @@ -25,7 +25,7 @@ * DEALINGS IN THE SOFTWARE. * * $PI: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/fops.c,v 1.3 1999/08/20 15:36:45 faith Exp $ - * $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/fops.c,v 1.1 1999/09/25 14:37:59 dawes Exp $ + * $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/fops.c,v 1.2 1999/12/14 01:33:56 robin Exp $ * */ diff --git a/linux/gamma_drv.c b/linux/gamma_drv.c index 0ae7814c..b7998ae8 100644 --- a/linux/gamma_drv.c +++ b/linux/gamma_drv.c @@ -25,7 +25,7 @@ * DEALINGS IN THE SOFTWARE. * * $PI: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/gamma_drv.c,v 1.17 1999/08/30 13:05:00 faith Exp $ - * $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/gamma_drv.c,v 1.1 1999/09/25 14:38:00 dawes Exp $ + * $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/gamma_drv.c,v 1.2 1999/12/14 01:33:57 robin Exp $ * */ diff --git a/linux/lists.c b/linux/lists.c index b84561f2..442bb2a6 100644 --- a/linux/lists.c +++ b/linux/lists.c @@ -25,7 +25,7 @@ * DEALINGS IN THE SOFTWARE. * * $PI: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/lists.c,v 1.3 1999/08/20 15:07:02 faith Exp $ - * $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/lists.c,v 1.1 1999/09/25 14:38:01 dawes Exp $ + * $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/lists.c,v 1.2 1999/12/14 01:33:57 robin Exp $ * */ diff --git a/linux/lock.c b/linux/lock.c index e8c1eff1..f80d45d3 100644 --- a/linux/lock.c +++ b/linux/lock.c @@ -25,7 +25,7 @@ * DEALINGS IN THE SOFTWARE. * * $PI: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/lock.c,v 1.5 1999/08/30 13:05:00 faith Exp $ - * $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/lock.c,v 1.1 1999/09/25 14:38:01 dawes Exp $ + * $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/lock.c,v 1.2 1999/12/14 01:33:57 robin Exp $ * */ diff --git a/linux/memory.c b/linux/memory.c index af8d510b..4e5ceb9e 100644 --- a/linux/memory.c +++ b/linux/memory.c @@ -25,7 +25,7 @@ * DEALINGS IN THE SOFTWARE. * * $PI: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/memory.c,v 1.4 1999/08/20 20:00:53 faith Exp $ - * $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/memory.c,v 1.1 1999/09/25 14:38:02 dawes Exp $ + * $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/memory.c,v 1.2 1999/12/14 01:33:57 robin Exp $ * */ diff --git a/linux/proc.c b/linux/proc.c index f946bdcc..edb4f0ae 100644 --- a/linux/proc.c +++ b/linux/proc.c @@ -25,7 +25,7 @@ * DEALINGS IN THE SOFTWARE. * * $PI: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/proc.c,v 1.4 1999/08/20 15:36:46 faith Exp $ - * $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/proc.c,v 1.1 1999/09/25 14:38:02 dawes Exp $ + * $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/proc.c,v 1.2 1999/12/14 01:33:58 robin Exp $ * */ @@ -79,26 +79,26 @@ int drm_proc_init(drm_device_t *dev) struct proc_dir_entry *ent; int i, j; - drm_root = create_proc_entry("dri", S_IFDIR, NULL); + drm_root = create_proc_entry("graphics", S_IFDIR, NULL); if (!drm_root) { - DRM_ERROR("Cannot create /proc/dri\n"); + DRM_ERROR("Cannot create /proc/graphics\n"); return -1; } /* Instead of doing this search, we should - add some global support for /proc/dri. */ + add some global support for /proc/graphics. */ for (i = 0; i < 8; i++) { - sprintf(drm_slot_name, "dri/%d", i); + sprintf(drm_slot_name, "graphics/%d", i); drm_dev_root = create_proc_entry(drm_slot_name, S_IFDIR, NULL); if (!drm_dev_root) { DRM_ERROR("Cannot create /proc/%s\n", drm_slot_name); - remove_proc_entry("dri", NULL); + remove_proc_entry("graphics", NULL); } if (drm_dev_root->nlink == 2) break; drm_dev_root = NULL; } if (!drm_dev_root) { - DRM_ERROR("Cannot find slot in /proc/dri\n"); + DRM_ERROR("Cannot find slot in /proc/graphics\n"); return -1; } @@ -112,7 +112,7 @@ int drm_proc_init(drm_device_t *dev) remove_proc_entry(drm_proc_list[i].name, drm_dev_root); remove_proc_entry(drm_slot_name, NULL); - remove_proc_entry("dri", NULL); + remove_proc_entry("graphics", NULL); return -1; } ent->read_proc = drm_proc_list[i].f; @@ -135,7 +135,7 @@ int drm_proc_cleanup(void) } remove_proc_entry(drm_slot_name, NULL); } - remove_proc_entry("dri", NULL); + remove_proc_entry("graphics", NULL); remove_proc_entry(DRM_NAME, NULL); } drm_root = drm_dev_root = NULL; diff --git a/linux/tdfx_context.c b/linux/tdfx_context.c index 0c3c541d..29e75ab5 100644 --- a/linux/tdfx_context.c +++ b/linux/tdfx_context.c @@ -25,7 +25,7 @@ * DEALINGS IN THE SOFTWARE. * * $PI$ - * $XFree86$ + * $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/tdfx_context.c,v 1.1 1999/12/14 01:49:21 robin Exp $ * */ diff --git a/linux/tdfx_drv.c b/linux/tdfx_drv.c index da1a3540..31924254 100644 --- a/linux/tdfx_drv.c +++ b/linux/tdfx_drv.c @@ -25,7 +25,7 @@ * DEALINGS IN THE SOFTWARE. * * $PI$ - * $XFree86$ + * $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/tdfx_drv.c,v 1.1 1999/12/14 01:49:22 robin Exp $ * */ diff --git a/linux/tdfx_drv.h b/linux/tdfx_drv.h index bdff05ee..aad3aa19 100644 --- a/linux/tdfx_drv.h +++ b/linux/tdfx_drv.h @@ -25,7 +25,7 @@ * DEALINGS IN THE SOFTWARE. * * $PI$ - * $XFree86$ + * $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/tdfx_drv.h,v 1.1 1999/12/14 01:49:22 robin Exp $ * */ diff --git a/linux/vm.c b/linux/vm.c index d649a6e7..6267addb 100644 --- a/linux/vm.c +++ b/linux/vm.c @@ -25,7 +25,7 @@ * DEALINGS IN THE SOFTWARE. * * $PI: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/vm.c,v 1.7 1999/08/21 02:48:34 faith Exp $ - * $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/vm.c,v 1.1 1999/09/25 14:38:02 dawes Exp $ + * $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/vm.c,v 1.2 1999/12/14 01:33:58 robin Exp $ * */ -- cgit v1.2.3