From owner-p4-projects@FreeBSD.ORG Sat Apr 16 03:36:24 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EB33416A4D0; Sat, 16 Apr 2005 03:36:23 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id AE76716A4CE for ; Sat, 16 Apr 2005 03:36:23 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E40C843D31 for ; Sat, 16 Apr 2005 03:36:22 +0000 (GMT) (envelope-from anholt@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j3G3aMeX025527 for ; Sat, 16 Apr 2005 03:36:22 GMT (envelope-from anholt@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j3G3aMUN025524 for perforce@freebsd.org; Sat, 16 Apr 2005 03:36:22 GMT (envelope-from anholt@freebsd.org) Date: Sat, 16 Apr 2005 03:36:22 GMT Message-Id: <200504160336.j3G3aMUN025524@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to anholt@freebsd.org using -f From: Eric Anholt To: Perforce Change Reviews Subject: PERFORCE change 75305 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 16 Apr 2005 03:36:24 -0000 http://perforce.freebsd.org/chv.cgi?CH=75305 Change 75305 by anholt@anholt_leguin on 2005/04/16 03:36:19 IF drm-merge-vendor@75304 Affected files ... .. //depot/projects/drm-merge/sys/dev/drm/ati_pcigart.c#3 integrate .. //depot/projects/drm-merge/sys/dev/drm/drmP.h#5 integrate .. //depot/projects/drm-merge/sys/dev/drm/drm_agpsupport.c#3 integrate .. //depot/projects/drm-merge/sys/dev/drm/drm_atomic.h#2 integrate .. //depot/projects/drm-merge/sys/dev/drm/drm_auth.c#3 integrate .. //depot/projects/drm-merge/sys/dev/drm/drm_bufs.c#4 integrate .. //depot/projects/drm-merge/sys/dev/drm/drm_context.c#3 integrate .. //depot/projects/drm-merge/sys/dev/drm/drm_dma.c#3 integrate .. //depot/projects/drm-merge/sys/dev/drm/drm_drawable.c#3 integrate .. //depot/projects/drm-merge/sys/dev/drm/drm_drv.c#3 integrate .. //depot/projects/drm-merge/sys/dev/drm/drm_fops.c#3 integrate .. //depot/projects/drm-merge/sys/dev/drm/drm_ioctl.c#3 integrate .. //depot/projects/drm-merge/sys/dev/drm/drm_irq.c#3 integrate .. //depot/projects/drm-merge/sys/dev/drm/drm_linux_list.h#4 integrate .. //depot/projects/drm-merge/sys/dev/drm/drm_lock.c#3 integrate .. //depot/projects/drm-merge/sys/dev/drm/drm_memory.c#3 integrate .. //depot/projects/drm-merge/sys/dev/drm/drm_pci.c#3 integrate .. //depot/projects/drm-merge/sys/dev/drm/drm_scatter.c#3 integrate .. //depot/projects/drm-merge/sys/dev/drm/drm_sysctl.c#3 integrate .. //depot/projects/drm-merge/sys/dev/drm/drm_vm.c#3 integrate .. //depot/projects/drm-merge/sys/dev/drm/i915_drv.c#2 integrate .. //depot/projects/drm-merge/sys/dev/drm/mach64_drv.c#3 integrate .. //depot/projects/drm-merge/sys/dev/drm/mga_drv.c#5 integrate .. //depot/projects/drm-merge/sys/dev/drm/r128_drv.c#5 integrate .. //depot/projects/drm-merge/sys/dev/drm/radeon_drv.c#5 integrate .. //depot/projects/drm-merge/sys/dev/drm/savage_drv.c#2 integrate .. //depot/projects/drm-merge/sys/dev/drm/sis_drv.c#5 integrate .. //depot/projects/drm-merge/sys/dev/drm/tdfx_drv.c#5 integrate Differences ... ==== //depot/projects/drm-merge/sys/dev/drm/ati_pcigart.c#3 (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/sys/dev/drm/drmP.h#5 (text+ko) ==== @@ -1,5 +1,6 @@ /* drmP.h -- Private header for Direct Rendering Manager -*- linux-c -*- - * Created: Mon Jan 4 10:05:05 1999 by faith@precisioninsight.com */ + * 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. ==== //depot/projects/drm-merge/sys/dev/drm/drm_agpsupport.c#3 (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/sys/dev/drm/drm_atomic.h#2 (text+ko) ==== @@ -5,7 +5,7 @@ * \author Eric Anholt */ -/* +/*- * Copyright 2004 Eric Anholt * All Rights Reserved. * ==== //depot/projects/drm-merge/sys/dev/drm/drm_auth.c#3 (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/sys/dev/drm/drm_bufs.c#4 (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. ==== //depot/projects/drm-merge/sys/dev/drm/drm_context.c#3 (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/sys/dev/drm/drm_dma.c#3 (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/sys/dev/drm/drm_drawable.c#3 (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/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/sys/dev/drm/drm_fops.c#3 (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/sys/dev/drm/drm_ioctl.c#3 (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/sys/dev/drm/drm_irq.c#3 (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/sys/dev/drm/drm_linux_list.h#4 (text+ko) ==== @@ -1,5 +1,6 @@ /* drm_linux_list.h -- linux list functions for the BSDs. - * Created: Mon Apr 7 14:30:16 1999 by anholt@FreeBSD.org */ + * Created: Mon Apr 7 14:30:16 1999 by anholt@FreeBSD.org + */ /*- * Copyright 2003 Eric Anholt * All Rights Reserved. ==== //depot/projects/drm-merge/sys/dev/drm/drm_lock.c#3 (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/sys/dev/drm/drm_memory.c#3 (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/sys/dev/drm/drm_pci.c#3 (text+ko) ==== @@ -5,7 +5,7 @@ * \author Eric Anholt */ -/* +/*- * Copyright 2003 Eric Anholt. * All Rights Reserved. * ==== //depot/projects/drm-merge/sys/dev/drm/drm_scatter.c#3 (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/sys/dev/drm/drm_sysctl.c#3 (text+ko) ==== @@ -1,4 +1,4 @@ -/* +/*- * Copyright 2003 Eric Anholt * All Rights Reserved. * ==== //depot/projects/drm-merge/sys/dev/drm/drm_vm.c#3 (text+ko) ==== @@ -1,4 +1,4 @@ -/* +/*- * Copyright 2003 Eric Anholt * All Rights Reserved. * ==== //depot/projects/drm-merge/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/sys/dev/drm/mach64_drv.c#3 (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/sys/dev/drm/mga_drv.c#5 (text+ko) ==== @@ -1,5 +1,6 @@ /* mga_drv.c -- Matrox G200/G400 driver -*- linux-c -*- - * Created: Mon Dec 13 01:56:22 1999 by jhartmann@precisioninsight.com */ + * 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. ==== //depot/projects/drm-merge/sys/dev/drm/r128_drv.c#5 (text+ko) ==== @@ -1,5 +1,6 @@ /* r128_drv.c -- ATI Rage 128 driver -*- linux-c -*- - * Created: Mon Dec 13 09:47:27 1999 by faith@precisioninsight.com */ + * 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. ==== //depot/projects/drm-merge/sys/dev/drm/radeon_drv.c#5 (text+ko) ==== @@ -1,5 +1,6 @@ /* radeon_drv.c -- ATI Radeon driver -*- linux-c -*- - * Created: Wed Feb 14 17:10:04 2001 by gareth@valinux.com */ + * 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/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/sys/dev/drm/sis_drv.c#5 (text+ko) ==== @@ -1,4 +1,5 @@ -/* sis.c -- sis driver -*- linux-c -*- */ +/* sis.c -- sis driver -*- linux-c -*- + */ /*- * Copyright 1999 Precision Insight, Inc., Cedar Park, Texas. * Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California. ==== //depot/projects/drm-merge/sys/dev/drm/tdfx_drv.c#5 (text+ko) ==== @@ -1,5 +1,6 @@ /* tdfx_drv.c -- tdfx driver -*- linux-c -*- - * Created: Thu Oct 7 10:38:32 1999 by faith@precisioninsight.com */ + * 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.