From: Nathan H. <na...@us...> - 2000-11-17 04:49:08
|
CVSROOT: /cvsroot/dri Module name: xc Repository: xc/xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/ Changes by: na...@sl.... 00/11/16 20:49:06 Modified files: xc/xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/: Tag: tdfx-3-0-0-branch Makefile.linux agpsupport.c compat-pre24.h drmP.h gamma_drv.c i810_drv.c memory.c mga_bufs.c mga_drv.c r128_drm.h r128_drv.c r128_drv.h sis_context.c sis_drv.c sis_mm.c tdfx_drv.c Revision Changes Path 1.19.2.2 +3 -0 xc/xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/Makefile.linux 1.12.2.1 +50 -70 xc/xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/agpsupport.c 1.1.18.1 +4 -0 xc/xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/compat-pre24.h 1.27.2.2 +5 -22 xc/xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/drmP.h 1.22.2.1 +2 -2 xc/xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/gamma_drv.c 1.22.2.1 +3 -4 xc/xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/i810_drv.c 1.14.2.1 +26 -38 xc/xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/memory.c 1.6.2.2 +0 -1 xc/xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/mga_bufs.c 1.23.2.1 +3 -4 xc/xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/mga_drv.c 1.3.28.2 +3 -3 xc/xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/r128_drm.h 1.23.2.1 +3 -4 xc/xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/r128_drv.c 1.11.2.2 +1 -1 xc/xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/r128_drv.h 1.3.2.1 +22 -14 xc/xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/sis_context.c 1.7.2.1 +11 -12 xc/xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/sis_drv.c 1.5.2.2 +12 -7 xc/xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/sis_mm.c 1.22.2.2 +3 -3 xc/xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/tdfx_drv.c Log message: Merge trunk DRM with the tdfx 3.0 branch. |