From: Kevin E. M. <ke...@us...> - 2001-03-07 19:12:57
|
CVSROOT: /cvsroot/dri Module name: xc Repository: xc/xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/ Changes by: kem@usw-pr-cvs1. 01/03/07 11:14:39 Log message: - Prepare for merge with trunk - Change variable names to be more consistent - Fix bug in per-context creation routine - Fix root-only permissions for get/setsareactx IOCTLs - Back out incomplete gamma changes - Fix some compilation warning messages - Various code cleanups - Disable per-context SAREA example code for Radeon This can be re-enabled when it is actually used by the driver. Look for '#ifdef PER_CONTEXT_SAREA' in the client-side and ddx Radeon driver. Modified files: xc/xc/lib/GL/mesa/src/drv/radeon/: Tag: sarea-1-0-0-branch radeon_context.c radeon_context.h radeon_screen.c radeon_screen.h xc/xc/programs/Xserver/GL/dri/: Tag: sarea-1-0-0-branch dri.c dri.h dristruct.h xc/xc/programs/Xserver/hw/xfree86/drivers/ati/: Tag: sarea-1-0-0-branch r128_dri.c radeon.h radeon_dri.c radeon_dri.h xc/xc/programs/Xserver/hw/xfree86/drivers/glint/: Tag: sarea-1-0-0-branch glint_dri.c glint_dri.h xc/xc/programs/Xserver/hw/xfree86/drivers/i810/: Tag: sarea-1-0-0-branch i810_dri.c xc/xc/programs/Xserver/hw/xfree86/drivers/mga/: Tag: sarea-1-0-0-branch mga_dri.c xc/xc/programs/Xserver/hw/xfree86/drivers/sis/: Tag: sarea-1-0-0-branch sis_dri.c xc/xc/programs/Xserver/hw/xfree86/drivers/sunffb/: Tag: sarea-1-0-0-branch ffb_dri.c xc/xc/programs/Xserver/hw/xfree86/drivers/tdfx/: Tag: sarea-1-0-0-branch tdfx_dri.c xc/xc/programs/Xserver/hw/xfree86/os-support/linux/drm/: Tag: sarea-1-0-0-branch Imakefile xf86drm.c xc/xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/: Tag: sarea-1-0-0-branch Makefile.linux drm.h drmP.h drm_context.h drm_drv.h gamma_dma.c gamma_drv.c gamma_drv.h Revision Changes Path 1.2.12.6 +9 -2 xc/xc/lib/GL/mesa/src/drv/radeon/radeon_context.c 1.5.6.2 +4 -1 xc/xc/lib/GL/mesa/src/drv/radeon/radeon_context.h 1.2.12.6 +4 -1 xc/xc/lib/GL/mesa/src/drv/radeon/radeon_screen.c 1.2.12.5 +2 -0 xc/xc/lib/GL/mesa/src/drv/radeon/radeon_screen.h 1.25.4.3 +49 -57 xc/xc/programs/Xserver/GL/dri/dri.c 1.15.8.3 +2 -2 xc/xc/programs/Xserver/GL/dri/dri.h 1.9.8.3 +3 -3 xc/xc/programs/Xserver/GL/dri/dristruct.h 1.11.2.6 +2 -2 xc/xc/programs/Xserver/hw/xfree86/drivers/ati/r128_dri.c 1.10.2.2 +4 -1 xc/xc/programs/Xserver/hw/xfree86/drivers/ati/radeon.h 1.7.4.8 +27 -16 xc/xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_dri.c 1.2.12.5 +4 -1 xc/xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_dri.h 1.9.2.4 +23 -54 xc/xc/programs/Xserver/hw/xfree86/drivers/glint/glint_dri.c 1.3.50.2 +1 -2 xc/xc/programs/Xserver/hw/xfree86/drivers/glint/glint_dri.h 1.18.2.7 +2 -2 xc/xc/programs/Xserver/hw/xfree86/drivers/i810/i810_dri.c 1.28.2.6 +2 -2 xc/xc/programs/Xserver/hw/xfree86/drivers/mga/mga_dri.c 1.5.10.3 +2 -2 xc/xc/programs/Xserver/hw/xfree86/drivers/sis/sis_dri.c 1.1.48.2 +2 -2 xc/xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_dri.c 1.26.2.6 +2 -2 xc/xc/programs/Xserver/hw/xfree86/drivers/tdfx/tdfx_dri.c 1.8.8.2 +0 -2 xc/xc/programs/Xserver/hw/xfree86/os-support/linux/drm/Imakefile 1.17.2.2 +5 -5 xc/xc/programs/Xserver/hw/xfree86/os-support/linux/drm/xf86drm.c 1.27.2.2 +1 -1 xc/xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/Makefile.linux 1.22.2.3 +2 -6 xc/xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/drm.h 1.31.2.5 +2 -2 xc/xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/drmP.h 1.2.4.2 +12 -12 xc/xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/drm_context.h 1.2.4.2 +48 -48 xc/xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/drm_drv.h 1.12.2.3 +36 -60 xc/xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/gamma_dma.c 1.25.2.2 +3 -3 xc/xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/gamma_drv.c 1.10.2.2 +0 -7 xc/xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/gamma_drv.h |