From: Alan H. <al...@us...> - 2001-09-25 09:35:47
|
CVSROOT: /cvsroot/dri Module name: xc Repository: xc/xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/ Changes by: alanh@usw-pr-cvs1. 01/09/25 02:35:37 Log message: merge with latest trunk code. Modified files: xc/xc/lib/GL/mesa/src/drv/r128/: Tag: bsd-2-0-0-branch r128_context.h xc/xc/programs/Xserver/hw/xfree86/drivers/ati/: Tag: bsd-2-0-0-branch r128.h r128_dri.c r128_driver.c r128_video.c xc/xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/: Tag: bsd-2-0-0-branch ati_pcigart.h drmP.h drm_agpsupport.h drm_context.h drm_drv.h drm_ioctl.h drm_scatter.h drm_vm.h r128_cce.c radeon_cp.c Revision Changes Path 1.22.2.2 +1 -6 xc/xc/lib/GL/mesa/src/drv/r128/r128_context.h 1.9.2.6 +1 -0 xc/xc/programs/Xserver/hw/xfree86/drivers/ati/r128.h 1.17.2.7 +4 -1 xc/xc/programs/Xserver/hw/xfree86/drivers/ati/r128_dri.c 1.16.2.5 +5 -0 xc/xc/programs/Xserver/hw/xfree86/drivers/ati/r128_driver.c 1.8.2.2 +153 -24 xc/xc/programs/Xserver/hw/xfree86/drivers/ati/r128_video.c 1.2.2.4 +2 -12 xc/xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/ati_pcigart.h 1.36.2.31 +3 -3 xc/xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/drmP.h 1.4.2.3 +8 -0 xc/xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/drm_agpsupport.h 1.4.6.16 +1 -1 xc/xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/drm_context.h 1.9.2.31 +1 -0 xc/xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/drm_drv.h 1.4.2.14 +2 -2 xc/xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/drm_ioctl.h 1.2.2.4 +0 -6 xc/xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/drm_scatter.h 1.5.2.5 +38 -14 xc/xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/drm_vm.h 1.10.2.15 +0 -9 xc/xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/r128_cce.c 1.11.2.14 +3 -13 xc/xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/radeon_cp.c |