Merge refs/heads/drm-latest from master.kernel.org:/pub/scm/linux/kernel/git/airlied/drm-2.6

2026-09-26 18:16:26 +00:00 · 2005-08-30 07:45:15 -07:00 · 2005-08-30 07:45:15 -07:00 · 3cb904caa9
commit 3cb904caa9
parent d8971fcb70 7a9aff3cff
57 changed files with 7407 additions and 3243 deletions
--- a/drivers/char/drm/Kconfig
+++ b/drivers/char/drm/Kconfig
--- a/drivers/char/drm/Makefile
+++ b/drivers/char/drm/Makefile
--- a/drivers/char/drm/drm.h
+++ b/drivers/char/drm/drm.h
--- a/drivers/char/drm/drmP.h
+++ b/drivers/char/drm/drmP.h
--- a/drivers/char/drm/drm_agpsupport.c
+++ b/drivers/char/drm/drm_agpsupport.c
--- a/drivers/char/drm/drm_bufs.c
+++ b/drivers/char/drm/drm_bufs.c
--- a/drivers/char/drm/drm_context.c
+++ b/drivers/char/drm/drm_context.c
--- a/drivers/char/drm/drm_drv.c
+++ b/drivers/char/drm/drm_drv.c
--- a/drivers/char/drm/drm_fops.c
+++ b/drivers/char/drm/drm_fops.c
--- a/drivers/char/drm/drm_ioctl.c
+++ b/drivers/char/drm/drm_ioctl.c
--- a/drivers/char/drm/drm_memory.c
+++ b/drivers/char/drm/drm_memory.c
--- a/drivers/char/drm/drm_pci.c
+++ b/drivers/char/drm/drm_pci.c
--- a/drivers/char/drm/drm_pciids.h
+++ b/drivers/char/drm/drm_pciids.h
--- a/drivers/char/drm/drm_proc.c
+++ b/drivers/char/drm/drm_proc.c
--- a/drivers/char/drm/drm_scatter.c
+++ b/drivers/char/drm/drm_scatter.c
--- a/drivers/char/drm/drm_stub.c
+++ b/drivers/char/drm/drm_stub.c
--- a/drivers/char/drm/drm_vm.c
+++ b/drivers/char/drm/drm_vm.c
--- a/drivers/char/drm/ffb_drv.c
+++ b/drivers/char/drm/ffb_drv.c
--- a/drivers/char/drm/gamma_context.h
+++ b/drivers/char/drm/gamma_context.h
--- a/drivers/char/drm/gamma_dma.c
+++ b/drivers/char/drm/gamma_dma.c
--- a/drivers/char/drm/gamma_drm.h
+++ b/drivers/char/drm/gamma_drm.h
--- a/drivers/char/drm/gamma_drv.c
+++ b/drivers/char/drm/gamma_drv.c
--- a/drivers/char/drm/gamma_drv.h
+++ b/drivers/char/drm/gamma_drv.h
--- a/drivers/char/drm/gamma_lists.h
+++ b/drivers/char/drm/gamma_lists.h
--- a/drivers/char/drm/gamma_lock.h
+++ b/drivers/char/drm/gamma_lock.h
--- a/drivers/char/drm/gamma_old_dma.h
+++ b/drivers/char/drm/gamma_old_dma.h
--- a/drivers/char/drm/i810_dma.c
+++ b/drivers/char/drm/i810_dma.c
--- a/drivers/char/drm/i810_drv.c
+++ b/drivers/char/drm/i810_drv.c
--- a/drivers/char/drm/i810_drv.h
+++ b/drivers/char/drm/i810_drv.h
--- a/drivers/char/drm/i830_dma.c
+++ b/drivers/char/drm/i830_dma.c
--- a/drivers/char/drm/i830_drv.c
+++ b/drivers/char/drm/i830_drv.c
--- a/drivers/char/drm/i830_drv.h
+++ b/drivers/char/drm/i830_drv.h
--- a/drivers/char/drm/i915_dma.c
+++ b/drivers/char/drm/i915_dma.c
--- a/drivers/char/drm/i915_drv.c
+++ b/drivers/char/drm/i915_drv.c
--- a/drivers/char/drm/i915_drv.h
+++ b/drivers/char/drm/i915_drv.h
--- a/drivers/char/drm/mga_dma.c
+++ b/drivers/char/drm/mga_dma.c
--- a/drivers/char/drm/mga_drm.h
+++ b/drivers/char/drm/mga_drm.h
--- a/drivers/char/drm/mga_drv.c
+++ b/drivers/char/drm/mga_drv.c
--- a/drivers/char/drm/mga_drv.h
+++ b/drivers/char/drm/mga_drv.h
--- a/drivers/char/drm/mga_ioc32.c
+++ b/drivers/char/drm/mga_ioc32.c
--- a/drivers/char/drm/mga_irq.c
+++ b/drivers/char/drm/mga_irq.c
--- a/drivers/char/drm/mga_state.c
+++ b/drivers/char/drm/mga_state.c
--- a/drivers/char/drm/mga_warp.c
+++ b/drivers/char/drm/mga_warp.c
--- a/drivers/char/drm/r128_cce.c
+++ b/drivers/char/drm/r128_cce.c
--- a/drivers/char/drm/r128_drm.h
+++ b/drivers/char/drm/r128_drm.h
--- a/drivers/char/drm/r300_cmdbuf.c
+++ b/drivers/char/drm/r300_cmdbuf.c
--- a/drivers/char/drm/r300_reg.h
+++ b/drivers/char/drm/r300_reg.h
--- a/drivers/char/drm/radeon_cp.c
+++ b/drivers/char/drm/radeon_cp.c
--- a/drivers/char/drm/radeon_drm.h
+++ b/drivers/char/drm/radeon_drm.h
--- a/drivers/char/drm/radeon_drv.c
+++ b/drivers/char/drm/radeon_drv.c
--- a/drivers/char/drm/radeon_drv.h
+++ b/drivers/char/drm/radeon_drv.h
--- a/drivers/char/drm/radeon_state.c
+++ b/drivers/char/drm/radeon_state.c
--- a/drivers/char/drm/savage_bci.c
+++ b/drivers/char/drm/savage_bci.c
--- a/drivers/char/drm/savage_drm.h
+++ b/drivers/char/drm/savage_drm.h
--- a/drivers/char/drm/savage_drv.c
+++ b/drivers/char/drm/savage_drv.c
--- a/drivers/char/drm/savage_drv.h
+++ b/drivers/char/drm/savage_drv.h
--- a/drivers/char/drm/savage_state.c
+++ b/drivers/char/drm/savage_state.c