Date: Sat, 16 Apr 2005 03:14:56 GMT From: Eric Anholt <anholt@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 75304 for review Message-ID: <200504160314.j3G3Eu28024776@repoman.freebsd.org>
index | next in thread | raw e-mail
http://perforce.freebsd.org/chv.cgi?CH=75304 Change 75304 by anholt@anholt_leguin on 2005/04/16 03:14:38 MF DRI CVS (2005-04-15) Affected files ... .. //depot/projects/drm-merge-vendor/sys/dev/drm/ati_pcigart.c#2 edit .. //depot/projects/drm-merge-vendor/sys/dev/drm/drmP.h#3 edit .. //depot/projects/drm-merge-vendor/sys/dev/drm/drm_agpsupport.c#2 edit .. //depot/projects/drm-merge-vendor/sys/dev/drm/drm_atomic.h#2 edit .. //depot/projects/drm-merge-vendor/sys/dev/drm/drm_auth.c#2 edit .. //depot/projects/drm-merge-vendor/sys/dev/drm/drm_bufs.c#2 edit .. //depot/projects/drm-merge-vendor/sys/dev/drm/drm_context.c#2 edit .. //depot/projects/drm-merge-vendor/sys/dev/drm/drm_dma.c#2 edit .. //depot/projects/drm-merge-vendor/sys/dev/drm/drm_drawable.c#2 edit .. //depot/projects/drm-merge-vendor/sys/dev/drm/drm_drv.c#3 edit .. //depot/projects/drm-merge-vendor/sys/dev/drm/drm_fops.c#2 edit .. //depot/projects/drm-merge-vendor/sys/dev/drm/drm_ioctl.c#2 edit .. //depot/projects/drm-merge-vendor/sys/dev/drm/drm_irq.c#2 edit .. //depot/projects/drm-merge-vendor/sys/dev/drm/drm_linux_list.h#3 edit .. //depot/projects/drm-merge-vendor/sys/dev/drm/drm_lock.c#2 edit .. //depot/projects/drm-merge-vendor/sys/dev/drm/drm_memory.c#2 edit .. //depot/projects/drm-merge-vendor/sys/dev/drm/drm_pci.c#2 edit .. //depot/projects/drm-merge-vendor/sys/dev/drm/drm_scatter.c#2 edit .. //depot/projects/drm-merge-vendor/sys/dev/drm/drm_sysctl.c#2 edit .. //depot/projects/drm-merge-vendor/sys/dev/drm/drm_vm.c#2 edit .. //depot/projects/drm-merge-vendor/sys/dev/drm/i915_drv.c#2 edit .. //depot/projects/drm-merge-vendor/sys/dev/drm/mach64_drv.c#2 edit .. //depot/projects/drm-merge-vendor/sys/dev/drm/mga_drv.c#3 edit .. //depot/projects/drm-merge-vendor/sys/dev/drm/r128_drv.c#3 edit .. //depot/projects/drm-merge-vendor/sys/dev/drm/radeon_drv.c#3 edit .. //depot/projects/drm-merge-vendor/sys/dev/drm/savage_drv.c#2 edit .. //depot/projects/drm-merge-vendor/sys/dev/drm/sis_drv.c#3 edit .. //depot/projects/drm-merge-vendor/sys/dev/drm/tdfx_drv.c#3 edit Differences ... ==== //depot/projects/drm-merge-vendor/sys/dev/drm/ati_pcigart.c#2 (text+ko) ==== @@ -1,6 +1,7 @@ /* ati_pcigart.h -- ATI PCI GART support -*- linux-c -*- * Created: Wed Dec 13 21:52:19 2000 by gareth@valinux.com - * + */ +/*- * Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California. * All Rights Reserved. * ==== //depot/projects/drm-merge-vendor/sys/dev/drm/drmP.h#3 (text+ko) ==== @@ -1,6 +1,7 @@ /* drmP.h -- Private header for Direct Rendering Manager -*- linux-c -*- * Created: Mon Jan 4 10:05:05 1999 by faith@precisioninsight.com - * + */ +/*- * Copyright 1999 Precision Insight, Inc., Cedar Park, Texas. * Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California. * All rights reserved. ==== //depot/projects/drm-merge-vendor/sys/dev/drm/drm_agpsupport.c#2 (text+ko) ==== @@ -1,6 +1,7 @@ /* drm_agpsupport.h -- DRM support for AGP/GART backend -*- linux-c -*- * Created: Mon Dec 13 09:56:45 1999 by faith@precisioninsight.com - * + */ +/*- * Copyright 1999 Precision Insight, Inc., Cedar Park, Texas. * Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California. * All Rights Reserved. ==== //depot/projects/drm-merge-vendor/sys/dev/drm/drm_atomic.h#2 (text+ko) ==== @@ -5,7 +5,7 @@ * \author Eric Anholt <anholt@FreeBSD.org> */ -/* +/*- * Copyright 2004 Eric Anholt * All Rights Reserved. * ==== //depot/projects/drm-merge-vendor/sys/dev/drm/drm_auth.c#2 (text+ko) ==== @@ -1,6 +1,7 @@ /* drm_auth.h -- IOCTLs for authentication -*- linux-c -*- * Created: Tue Feb 2 08:37:54 1999 by faith@valinux.com - * + */ +/*- * Copyright 1999 Precision Insight, Inc., Cedar Park, Texas. * Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California. * All Rights Reserved. ==== //depot/projects/drm-merge-vendor/sys/dev/drm/drm_bufs.c#2 (text+ko) ==== @@ -1,6 +1,7 @@ /* drm_bufs.h -- Generic buffer template -*- linux-c -*- * Created: Thu Nov 23 03:10:50 2000 by gareth@valinux.com - * + */ +/*- * Copyright 1999, 2000 Precision Insight, Inc., Cedar Park, Texas. * Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California. * All Rights Reserved. @@ -979,8 +980,13 @@ #ifdef __FreeBSD__ vaddr = round_page((vm_offset_t)vms->vm_daddr + MAXDSIZ); +#if __FreeBSD_version >= 600023 retcode = vm_mmap(&vms->vm_map, &vaddr, size, PROT_READ | PROT_WRITE, + VM_PROT_ALL, MAP_SHARED, OBJT_DEVICE, kdev, foff ); +#else + retcode = vm_mmap(&vms->vm_map, &vaddr, size, PROT_READ | PROT_WRITE, VM_PROT_ALL, MAP_SHARED, SLIST_FIRST(&kdev->si_hlist), foff ); +#endif #elif defined(__NetBSD__) || defined(__OpenBSD__) vaddr = round_page((vaddr_t)vms->vm_daddr + MAXDSIZ); retcode = uvm_mmap(&vms->vm_map, &vaddr, size, ==== //depot/projects/drm-merge-vendor/sys/dev/drm/drm_context.c#2 (text+ko) ==== @@ -1,6 +1,7 @@ /* drm_context.h -- IOCTLs for generic contexts -*- linux-c -*- * Created: Fri Nov 24 18:31:37 2000 by gareth@valinux.com - * + */ +/*- * Copyright 1999, 2000 Precision Insight, Inc., Cedar Park, Texas. * Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California. * All Rights Reserved. ==== //depot/projects/drm-merge-vendor/sys/dev/drm/drm_dma.c#2 (text+ko) ==== @@ -1,6 +1,7 @@ /* drm_dma.c -- DMA IOCTL and function support -*- linux-c -*- * Created: Fri Mar 19 14:30:16 1999 by faith@valinux.com - * + */ +/*- * Copyright 1999, 2000 Precision Insight, Inc., Cedar Park, Texas. * Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California. * All Rights Reserved. ==== //depot/projects/drm-merge-vendor/sys/dev/drm/drm_drawable.c#2 (text+ko) ==== @@ -1,6 +1,7 @@ /* drm_drawable.h -- IOCTLs for drawables -*- linux-c -*- * Created: Tue Feb 2 08:37:54 1999 by faith@valinux.com - * + */ +/*- * Copyright 1999 Precision Insight, Inc., Cedar Park, Texas. * Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California. * All Rights Reserved. ==== //depot/projects/drm-merge-vendor/sys/dev/drm/drm_drv.c#3 (text+ko) ==== @@ -1,6 +1,7 @@ /* drm_drv.h -- Generic driver template -*- linux-c -*- * Created: Thu Nov 23 03:10:50 2000 by gareth@valinux.com - * + */ +/*- * Copyright 1999, 2000 Precision Insight, Inc., Cedar Park, Texas. * Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California. * All Rights Reserved. ==== //depot/projects/drm-merge-vendor/sys/dev/drm/drm_fops.c#2 (text+ko) ==== @@ -1,6 +1,7 @@ /* drm_fops.h -- File operations for DRM -*- linux-c -*- * Created: Mon Jan 4 08:58:31 1999 by faith@valinux.com - * + */ +/*- * Copyright 1999 Precision Insight, Inc., Cedar Park, Texas. * Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California. * All Rights Reserved. ==== //depot/projects/drm-merge-vendor/sys/dev/drm/drm_ioctl.c#2 (text+ko) ==== @@ -1,6 +1,7 @@ /* drm_ioctl.h -- IOCTL processing for DRM -*- linux-c -*- * Created: Fri Jan 8 09:01:26 1999 by faith@valinux.com - * + */ +/*- * Copyright 1999 Precision Insight, Inc., Cedar Park, Texas. * Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California. * All Rights Reserved. ==== //depot/projects/drm-merge-vendor/sys/dev/drm/drm_irq.c#2 (text+ko) ==== @@ -1,6 +1,7 @@ /* drm_dma.c -- DMA IOCTL and function support * Created: Fri Oct 18 2003 by anholt@FreeBSD.org - * + */ +/*- * Copyright 2003 Eric Anholt * All Rights Reserved. * ==== //depot/projects/drm-merge-vendor/sys/dev/drm/drm_linux_list.h#3 (text+ko) ==== @@ -1,6 +1,7 @@ /* drm_linux_list.h -- linux list functions for the BSDs. * Created: Mon Apr 7 14:30:16 1999 by anholt@FreeBSD.org - * + */ +/*- * Copyright 2003 Eric Anholt * All Rights Reserved. * @@ -25,6 +26,7 @@ * * Authors: * Eric Anholt <anholt@FreeBSD.org> + * */ struct list_head { ==== //depot/projects/drm-merge-vendor/sys/dev/drm/drm_lock.c#2 (text+ko) ==== @@ -1,6 +1,7 @@ /* lock.c -- IOCTLs for locking -*- linux-c -*- * Created: Tue Feb 2 08:37:54 1999 by faith@valinux.com - * + */ +/*- * Copyright 1999 Precision Insight, Inc., Cedar Park, Texas. * Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California. * All Rights Reserved. ==== //depot/projects/drm-merge-vendor/sys/dev/drm/drm_memory.c#2 (text+ko) ==== @@ -1,7 +1,8 @@ /* drm_memory.h -- Memory management wrappers for DRM -*- linux-c -*- * Created: Thu Feb 4 14:00:34 1999 by faith@valinux.com - * - * Copyright 1999 Precision Insight, Inc., Cedar Park, Texas. + */ +/*- + *Copyright 1999 Precision Insight, Inc., Cedar Park, Texas. * Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California. * All Rights Reserved. * ==== //depot/projects/drm-merge-vendor/sys/dev/drm/drm_pci.c#2 (text+ko) ==== @@ -5,7 +5,7 @@ * \author Eric Anholt <anholt@FreeBSD.org> */ -/* +/*- * Copyright 2003 Eric Anholt. * All Rights Reserved. * ==== //depot/projects/drm-merge-vendor/sys/dev/drm/drm_scatter.c#2 (text+ko) ==== @@ -1,6 +1,6 @@ /* drm_scatter.h -- IOCTLs to manage scatter/gather memory -*- linux-c -*- - * Created: Mon Dec 18 23:20:54 2000 by gareth@valinux.com - * + * Created: Mon Dec 18 23:20:54 2000 by gareth@valinux.com */ +/*- * Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California. * All Rights Reserved. * ==== //depot/projects/drm-merge-vendor/sys/dev/drm/drm_sysctl.c#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* +/*- * Copyright 2003 Eric Anholt * All Rights Reserved. * ==== //depot/projects/drm-merge-vendor/sys/dev/drm/drm_vm.c#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* +/*- * Copyright 2003 Eric Anholt * All Rights Reserved. * ==== //depot/projects/drm-merge-vendor/sys/dev/drm/i915_drv.c#2 (text+ko) ==== @@ -1,6 +1,7 @@ /* i915_drv.c -- ATI Radeon driver -*- linux-c -*- * Created: Wed Feb 14 17:10:04 2001 by gareth@valinux.com - * + */ +/*- * Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California. * All Rights Reserved. * ==== //depot/projects/drm-merge-vendor/sys/dev/drm/mach64_drv.c#2 (text+ko) ==== @@ -1,6 +1,7 @@ /* mach64_drv.c -- ATI Rage 128 driver -*- linux-c -*- * Created: Mon Dec 13 09:47:27 1999 by faith@precisioninsight.com - * + */ +/*- * Copyright 1999 Precision Insight, Inc., Cedar Park, Texas. * Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California. * All Rights Reserved. ==== //depot/projects/drm-merge-vendor/sys/dev/drm/mga_drv.c#3 (text+ko) ==== @@ -1,6 +1,7 @@ /* mga_drv.c -- Matrox G200/G400 driver -*- linux-c -*- * Created: Mon Dec 13 01:56:22 1999 by jhartmann@precisioninsight.com - * + */ +/*- * Copyright 1999 Precision Insight, Inc., Cedar Park, Texas. * Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California. * All Rights Reserved. ==== //depot/projects/drm-merge-vendor/sys/dev/drm/r128_drv.c#3 (text+ko) ==== @@ -1,6 +1,7 @@ /* r128_drv.c -- ATI Rage 128 driver -*- linux-c -*- * Created: Mon Dec 13 09:47:27 1999 by faith@precisioninsight.com - * + */ +/*- * Copyright 1999 Precision Insight, Inc., Cedar Park, Texas. * Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California. * All Rights Reserved. ==== //depot/projects/drm-merge-vendor/sys/dev/drm/radeon_drv.c#3 (text+ko) ==== @@ -1,6 +1,7 @@ /* radeon_drv.c -- ATI Radeon driver -*- linux-c -*- * Created: Wed Feb 14 17:10:04 2001 by gareth@valinux.com - * + */ +/*- * Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California. * All Rights Reserved. * ==== //depot/projects/drm-merge-vendor/sys/dev/drm/savage_drv.c#2 (text+ko) ==== @@ -1,5 +1,6 @@ /* savage_drv.c -- Savage DRI driver - * + */ +/*- * Copyright 2005 Eric Anholt * All Rights Reserved. * ==== //depot/projects/drm-merge-vendor/sys/dev/drm/sis_drv.c#3 (text+ko) ==== @@ -1,5 +1,6 @@ /* sis.c -- sis driver -*- linux-c -*- - * + */ +/*- * Copyright 1999 Precision Insight, Inc., Cedar Park, Texas. * Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California. * All Rights Reserved. ==== //depot/projects/drm-merge-vendor/sys/dev/drm/tdfx_drv.c#3 (text+ko) ==== @@ -1,6 +1,7 @@ /* tdfx_drv.c -- tdfx driver -*- linux-c -*- * Created: Thu Oct 7 10:38:32 1999 by faith@precisioninsight.com - * + */ +/*- * Copyright 1999 Precision Insight, Inc., Cedar Park, Texas. * Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California. * All Rights Reserved.help
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200504160314.j3G3Eu28024776>