PERFORCE change 82639 for review
Eric Anholt
anholt at FreeBSD.org
Fri Aug 26 19:14:11 GMT 2005
http://perforce.freebsd.org/chv.cgi?CH=82639
Change 82639 by anholt at anholt_leguin on 2005/08/26 19:13:48
Fix more mismerges, add /*- headers, and fix include paths.
Affected files ...
.. //depot/projects/drm-merge/sys/dev/drm/radeon_drv.h#7 edit
.. //depot/projects/drm-merge/sys/dev/drm/via_3d_reg.h#3 edit
.. //depot/projects/drm-merge/sys/dev/drm/via_dma.c#3 edit
.. //depot/projects/drm-merge/sys/dev/drm/via_drm.h#3 edit
.. //depot/projects/drm-merge/sys/dev/drm/via_drv.c#3 edit
.. //depot/projects/drm-merge/sys/dev/drm/via_drv.h#3 edit
.. //depot/projects/drm-merge/sys/dev/drm/via_ds.c#3 edit
.. //depot/projects/drm-merge/sys/dev/drm/via_ds.h#3 edit
.. //depot/projects/drm-merge/sys/dev/drm/via_irq.c#3 edit
.. //depot/projects/drm-merge/sys/dev/drm/via_map.c#3 edit
.. //depot/projects/drm-merge/sys/dev/drm/via_mm.c#3 edit
.. //depot/projects/drm-merge/sys/dev/drm/via_mm.h#3 edit
.. //depot/projects/drm-merge/sys/dev/drm/via_verifier.c#3 edit
.. //depot/projects/drm-merge/sys/dev/drm/via_verifier.h#3 edit
.. //depot/projects/drm-merge/sys/dev/drm/via_video.c#3 edit
Differences ...
==== //depot/projects/drm-merge/sys/dev/drm/radeon_drv.h#7 (text+ko) ====
@@ -328,14 +328,6 @@
drm_file_t* filp_priv,
drm_radeon_cmd_buffer_t* cmdbuf );
-/* r300_cmdbuf.c */
-extern void r300_init_reg_flags(void);
-
-extern int r300_do_cp_cmdbuf( drm_device_t* dev,
- DRMFILE filp,
- drm_file_t* filp_priv,
- drm_radeon_cmd_buffer_t* cmdbuf );
-
/* Flags for stats.boxes
*/
#define RADEON_BOX_DMA_IDLE 0x1
==== //depot/projects/drm-merge/sys/dev/drm/via_3d_reg.h#3 (text+ko) ====
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright 1998-2003 VIA Technologies, Inc. All Rights Reserved.
* Copyright 2001-2003 S3 Graphics, Inc. All Rights Reserved.
*
==== //depot/projects/drm-merge/sys/dev/drm/via_dma.c#3 (text+ko) ====
@@ -1,4 +1,5 @@
-/* via_dma.c -- DMA support for the VIA Unichrome/Pro
+/*-
+ * via_dma.c -- DMA support for the VIA Unichrome/Pro
*
* Copyright 2003 Tungsten Graphics, Inc., Cedar Park, Texas.
* All Rights Reserved.
@@ -36,11 +37,11 @@
* $FreeBSD$
*/
-#include "drmP.h"
-#include "drm.h"
-#include "via_drm.h"
-#include "via_drv.h"
-#include "via_3d_reg.h"
+#include "dev/drm/drmP.h"
+#include "dev/drm/drm.h"
+#include "dev/drm/via_drm.h"
+#include "dev/drm/via_drv.h"
+#include "dev/drm/via_3d_reg.h"
#define CMDBUF_ALIGNMENT_SIZE (0x100)
#define CMDBUF_ALIGNMENT_MASK (0x0ff)
==== //depot/projects/drm-merge/sys/dev/drm/via_drm.h#3 (text+ko) ====
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright 1998-2003 VIA Technologies, Inc. All Rights Reserved.
* Copyright 2001-2003 S3 Graphics, Inc. All Rights Reserved.
*
==== //depot/projects/drm-merge/sys/dev/drm/via_drv.c#3 (text+ko) ====
@@ -29,11 +29,11 @@
* $FreeBSD$
*/
-#include "drmP.h"
-#include "drm.h"
-#include "via_drm.h"
-#include "via_drv.h"
-#include "drm_pciids.h"
+#include "dev/drm/drmP.h"
+#include "dev/drm/drm.h"
+#include "dev/drm/via_drm.h"
+#include "dev/drm/via_drv.h"
+#include "dev/drm/drm_pciids.h"
/* drv_PCI_IDs comes from drm_pciids.h, generated from drm_pciids.txt. */
static drm_pci_id_list_t via_pciidlist[] = {
==== //depot/projects/drm-merge/sys/dev/drm/via_drv.h#3 (text+ko) ====
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright 1998-2003 VIA Technologies, Inc. All Rights Reserved.
* Copyright 2001-2003 S3 Graphics, Inc. All Rights Reserved.
*
@@ -36,7 +36,7 @@
#define DRIVER_MINOR 6
#define DRIVER_PATCHLEVEL 7
-#include "via_verifier.h"
+#include "dev/drm/via_verifier.h"
#define VIA_PCI_BUF_SIZE 60000
#define VIA_FIRE_BUF_SIZE 1024
==== //depot/projects/drm-merge/sys/dev/drm/via_ds.c#3 (text+ko) ====
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright 1998-2003 VIA Technologies, Inc. All Rights Reserved.
* Copyright 2001-2003 S3 Graphics, Inc. All Rights Reserved.
* Copyright 2000 Silicon Integrated Systems Corp, Inc., HsinChu, Taiwan.
@@ -25,9 +25,9 @@
* $FreeBSD$
*/
-#include "drmP.h"
+#include "dev/drm/drmP.h"
-#include "via_ds.h"
+#include "dev/drm/via_ds.h"
extern unsigned int VIA_DEBUG;
set_t *via_setInit(void)
==== //depot/projects/drm-merge/sys/dev/drm/via_ds.h#3 (text+ko) ====
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright 1998-2003 VIA Technologies, Inc. All Rights Reserved.
* Copyright 2001-2003 S3 Graphics, Inc. All Rights Reserved.
* Copyright 2000 Silicon Integrated Systems Corp, Inc., HsinChu, Taiwan.
@@ -28,7 +28,7 @@
#ifndef _via_ds_h_
#define _via_ds_h_
-#include "drmP.h"
+#include "dev/drm/drmP.h"
/* Set Data Structure */
#define SET_SIZE 5000
==== //depot/projects/drm-merge/sys/dev/drm/via_irq.c#3 (text+ko) ====
@@ -1,4 +1,5 @@
-/* via_irq.c
+/*-
+ * via_irq.c
*
* Copyright 2004 BEAM Ltd.
* Copyright 2002 Tungsten Graphics, Inc.
@@ -37,10 +38,10 @@
* $FreeBSD$
*/
-#include "drmP.h"
-#include "drm.h"
-#include "via_drm.h"
-#include "via_drv.h"
+#include "dev/drm/drmP.h"
+#include "dev/drm/drm.h"
+#include "dev/drm/via_drm.h"
+#include "dev/drm/via_drv.h"
#define VIA_REG_INTERRUPT 0x200
==== //depot/projects/drm-merge/sys/dev/drm/via_map.c#3 (text+ko) ====
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright 1998-2003 VIA Technologies, Inc. All Rights Reserved.
* Copyright 2001-2003 S3 Graphics, Inc. All Rights Reserved.
*
@@ -23,9 +23,9 @@
*
* $FreeBSD$
*/
-#include "drmP.h"
-#include "via_drm.h"
-#include "via_drv.h"
+#include "dev/drm/drmP.h"
+#include "dev/drm/via_drm.h"
+#include "dev/drm/via_drv.h"
static int via_do_init_map(drm_device_t * dev, drm_via_init_t * init)
{
==== //depot/projects/drm-merge/sys/dev/drm/via_mm.c#3 (text+ko) ====
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright 1998-2003 VIA Technologies, Inc. All Rights Reserved.
* Copyright 2001-2003 S3 Graphics, Inc. All Rights Reserved.
*
@@ -23,11 +23,11 @@
*
* $FreeBSD$
*/
-#include "drmP.h"
-#include "via_drm.h"
-#include "via_drv.h"
-#include "via_ds.h"
-#include "via_mm.h"
+#include "dev/drm/drmP.h"
+#include "dev/drm/via_drm.h"
+#include "dev/drm/via_drv.h"
+#include "dev/drm/via_ds.h"
+#include "dev/drm/via_mm.h"
#define MAX_CONTEXT 100
==== //depot/projects/drm-merge/sys/dev/drm/via_mm.h#3 (text+ko) ====
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright 1998-2003 VIA Technologies, Inc. All Rights Reserved.
* Copyright 2001-2003 S3 Graphics, Inc. All Rights Reserved.
*
==== //depot/projects/drm-merge/sys/dev/drm/via_verifier.c#3 (text+ko) ====
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright 2004 The Unichrome Project. All Rights Reserved.
* Copyright 2005 Thomas Hellstrom. All Rights Reserved.
*
@@ -31,12 +31,12 @@
*/
-#include "via_3d_reg.h"
-#include "drmP.h"
-#include "drm.h"
-#include "via_drm.h"
-#include "via_verifier.h"
-#include "via_drv.h"
+#include "dev/drm/via_3d_reg.h"
+#include "dev/drm/drmP.h"
+#include "dev/drm/drm.h"
+#include "dev/drm/via_drm.h"
+#include "dev/drm/via_verifier.h"
+#include "dev/drm/via_drv.h"
typedef enum{
state_command,
==== //depot/projects/drm-merge/sys/dev/drm/via_verifier.h#3 (text+ko) ====
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright 2004 The Unichrome Project. All Rights Reserved.
*
* Permission is hereby granted, free of charge, to any person obtaining a
==== //depot/projects/drm-merge/sys/dev/drm/via_video.c#3 (text+ko) ====
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright 2005 Thomas Hellstrom. All Rights Reserved.
*
* Permission is hereby granted, free of charge, to any person obtaining a
@@ -27,9 +27,9 @@
* $FreeBSD$
*/
-#include "drmP.h"
-#include "via_drm.h"
-#include "via_drv.h"
+#include "dev/drm/drmP.h"
+#include "dev/drm/via_drm.h"
+#include "dev/drm/via_drv.h"
void
via_init_futex(drm_via_private_t *dev_priv)
More information about the p4-projects
mailing list