From: Gareth H. <ga...@so...> - 2001-02-15 08:11:32
|
CVSROOT: /cvsroot/dri Module name: xc Repository: xc/xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/ Changes by: gareth@usw-pr-cvs1. 01/02/15 00:12:15 Modified files: xc/xc/lib/GL/dri/drm/: Imakefile xc/xc/lib/GL/mesa/src/drv/mga/: Imakefile mga_xmesa.c mga_xmesa.h mgabuffers.c mgacontext.h mgadd.c mgaeltpath.c mgafastpath.c mgaioctl.c mgaioctl.h mgapixel.c mgastate.c mgatex.c mgatexmem.c xc/xc/lib/GL/mesa/src/drv/r128/: r128_dd.c r128_ioctl.c xc/xc/lib/GL/mesa/src/drv/radeon/: radeon_ioctl.c xc/xc/programs/Xserver/hw/xfree86/drivers/mga/: Imakefile mga.h mga_dri.c mga_dri.h mga_driver.c mga_macros.h mga_reg.h mga_storm.c mga_wrap.c xc/xc/programs/Xserver/hw/xfree86/os-support/: xf86drm.h xf86drmMga.h xc/xc/programs/Xserver/hw/xfree86/os-support/linux/drm/: xf86drm.c xf86drmMga.c xc/xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/: Makefile.kernel Makefile.linux drm.h drmP.h gamma_dma.c gamma_drv.c gamma_drv.h i810_dma.c i810_drv.c i810_drv.h mga_dma.c mga_drm.h mga_drv.c mga_drv.h mga_state.c r128_cce.c r128_drm.h r128_drv.c r128_drv.h r128_state.c radeon_cp.c radeon_drv.c radeon_drv.h radeon_state.c tdfx_drv.c Added files: xc/xc/programs/Xserver/hw/xfree86/drivers/mga/: mga_dripriv.h mga_sarea.h xc/xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/: dristat.c drm_agpsupport.h drm_auth.h drm_bufs.h drm_context.h drm_dma.h drm_drawable.h drm_drv.h drm_fops.h drm_init.h drm_ioctl.h drm_lists.h drm_lock.h drm_memory.h drm_proc.h drm_stub.h drm_vm.h gamma.h gamma_context.c gamma_drm.c i810.h mga.h mga_ucode.h mga_warp.c r128.h radeon.h tdfx.h Removed files: xc/xc/programs/Xserver/hw/xfree86/drivers/mga/: mga_warp.c xc/xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/: agpsupport.c auth.c bufs.c context.c ctxbitmap.c dma.c drawable.c fops.c i810_bufs.c i810_context.c init.c ioctl.c lists.c lock.c memory.c mga_bufs.c mga_context.c proc.c r128_context.c radeon_bufs.c radeon_context.c tdfx_context.c tdfx_drv.h vm.c Revision Changes Path 1.14 +4 -2 xc/xc/lib/GL/dri/drm/Imakefile 1.22 +16 -9 xc/xc/lib/GL/mesa/src/drv/mga/Imakefile 1.22 +71 -48 xc/xc/lib/GL/mesa/src/drv/mga/mga_xmesa.c 1.11 +9 -15 xc/xc/lib/GL/mesa/src/drv/mga/mga_xmesa.h 1.11 +38 -40 xc/xc/lib/GL/mesa/src/drv/mga/mgabuffers.c 1.4 +55 -49 xc/xc/lib/GL/mesa/src/drv/mga/mgacontext.h 1.21 +75 -27 xc/xc/lib/GL/mesa/src/drv/mga/mgadd.c 1.7 +48 -49 xc/xc/lib/GL/mesa/src/drv/mga/mgaeltpath.c 1.12 +18 -20 xc/xc/lib/GL/mesa/src/drv/mga/mgafastpath.c 1.16 +197 -185 xc/xc/lib/GL/mesa/src/drv/mga/mgaioctl.c 1.10 +22 -10 xc/xc/lib/GL/mesa/src/drv/mga/mgaioctl.h 1.4 +93 -85 xc/xc/lib/GL/mesa/src/drv/mga/mgapixel.c 1.18 +156 -157 xc/xc/lib/GL/mesa/src/drv/mga/mgastate.c 1.18 +144 -144 xc/xc/lib/GL/mesa/src/drv/mga/mgatex.c 1.4 +71 -71 xc/xc/lib/GL/mesa/src/drv/mga/mgatexmem.c 1.18 +2 -2 xc/xc/lib/GL/mesa/src/drv/r128/r128_dd.c 1.8 +1 -1 xc/xc/lib/GL/mesa/src/drv/r128/r128_ioctl.c 1.5 +1 -1 xc/xc/lib/GL/mesa/src/drv/radeon/radeon_ioctl.c 1.10 +4 -5 xc/xc/programs/Xserver/hw/xfree86/drivers/mga/Imakefile 1.17 +52 -34 xc/xc/programs/Xserver/hw/xfree86/drivers/mga/mga.h 1.28 +983 -755 xc/xc/programs/Xserver/hw/xfree86/drivers/mga/mga_dri.c 1.6 +77 -82 xc/xc/programs/Xserver/hw/xfree86/drivers/mga/mga_dri.h 1.21 +170 -217 xc/xc/programs/Xserver/hw/xfree86/drivers/mga/mga_driver.c 1.8 +2 -1 xc/xc/programs/Xserver/hw/xfree86/drivers/mga/mga_macros.h 1.5 +6 -7 xc/xc/programs/Xserver/hw/xfree86/drivers/mga/mga_reg.h 1.11 +376 -284 xc/xc/programs/Xserver/hw/xfree86/drivers/mga/mga_storm.c 1.8 +99 -101 xc/xc/programs/Xserver/hw/xfree86/drivers/mga/mga_wrap.c 1.12 +24 -9 xc/xc/programs/Xserver/hw/xfree86/os-support/xf86drm.h 1.6 +51 -131 xc/xc/programs/Xserver/hw/xfree86/os-support/xf86drmMga.h 1.17 +37 -27 xc/xc/programs/Xserver/hw/xfree86/os-support/linux/drm/xf86drm.c 1.4 +253 -60 xc/xc/programs/Xserver/hw/xfree86/os-support/linux/drm/xf86drmMga.c 1.22 +2 -2 xc/xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/Makefile.kernel 1.27 +29 -21 xc/xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/Makefile.linux 1.22 +67 -20 xc/xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/drm.h 1.31 +272 -213 xc/xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/drmP.h 1.12 +68 -165 xc/xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/gamma_dma.c 1.24 +65 -532 xc/xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/gamma_drv.c 1.10 +18 -0 xc/xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/gamma_drv.h 1.19 +159 -237 xc/xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/i810_dma.c 1.24 +72 -618 xc/xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/i810_drv.c 1.10 +10 -50 xc/xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/i810_drv.h 1.26 +510 -856 xc/xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/mga_dma.c 1.7 +212 -187 xc/xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/mga_drm.h 1.27 +69 -637 xc/xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/mga_drv.c 1.18 +551 -473 xc/xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/mga_drv.h 1.23 +723 -805 xc/xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/mga_state.c 1.6 +14 -14 xc/xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/r128_cce.c 1.10 +0 -6 xc/xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/r128_drm.h 1.31 +82 -671 xc/xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/r128_drv.c 1.18 +9 -45 xc/xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/r128_drv.h 1.7 +1 -0 xc/xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/r128_state.c 1.5 +13 -12 xc/xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/radeon_cp.c 1.3 +84 -673 xc/xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/radeon_drv.c 1.4 +1 -37 xc/xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/radeon_drv.h 1.6 +1 -0 xc/xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/radeon_state.c 1.25 +28 -661 xc/xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/tdfx_drv.c Log message: Merge mga-1-0-0-branch into trunk. |