PERFORCE change 75042 for review

[Eric Anholt]

http://perforce.freebsd.org/chv.cgi?CH=75042

Change 75042 by anholt at anholt_leguin on 2005/04/13 04:22:51

	IF drm-merge-vendor at 75038

Affected files ...

.. //depot/projects/drm-merge/sys/dev/drm/i915_dma.c#1 branch
.. //depot/projects/drm-merge/sys/dev/drm/i915_drm.h#1 branch
.. //depot/projects/drm-merge/sys/dev/drm/i915_drv.c#1 branch
.. //depot/projects/drm-merge/sys/dev/drm/i915_drv.h#1 branch
.. //depot/projects/drm-merge/sys/dev/drm/i915_irq.c#1 branch
.. //depot/projects/drm-merge/sys/dev/drm/i915_mem.c#1 branch
.. //depot/projects/drm-merge/sys/dev/drm/mach64_dma.c#4 integrate
.. //depot/projects/drm-merge/sys/dev/drm/radeon_drm.h#4 integrate
.. //depot/projects/drm-merge/sys/dev/drm/radeon_drv.h#4 integrate
.. //depot/projects/drm-merge/sys/dev/drm/radeon_state.c#6 integrate
.. //depot/projects/drm-merge/sys/dev/drm/savage_bci.c#1 branch
.. //depot/projects/drm-merge/sys/dev/drm/savage_drm.h#1 branch
.. //depot/projects/drm-merge/sys/dev/drm/savage_drv.c#1 branch
.. //depot/projects/drm-merge/sys/dev/drm/savage_drv.h#1 branch
.. //depot/projects/drm-merge/sys/dev/drm/savage_state.c#1 branch
.. //depot/projects/drm-merge/sys/dev/drm/sis_mm.c#5 integrate

Differences ...

==== //depot/projects/drm-merge/sys/dev/drm/mach64_dma.c#4 (text+ko) ====

@@ -497,8 +497,7 @@
 		    (i >= ring->head - MACH64_DUMP_CONTEXT * 4 &&
 		     i <= ring->head + MACH64_DUMP_CONTEXT * 4)) {
 			DRM_INFO("  0x%08x:  0x%08x 0x%08x 0x%08x 0x%08x%s%s\n",
-				 (unsigned int)(ring->start_addr +
-				 i * sizeof(u32)),
+				 (u32)(ring->start_addr + i * sizeof(u32)),
 				 le32_to_cpu(((u32 *) ring->start)[i + 0]),
 				 le32_to_cpu(((u32 *) ring->start)[i + 1]),
 				 le32_to_cpu(((u32 *) ring->start)[i + 2]),

==== //depot/projects/drm-merge/sys/dev/drm/radeon_drm.h#4 (text+ko) ====

@@ -153,7 +153,8 @@
 #define RADEON_EMIT_PP_CUBIC_OFFSETS_T1             81
 #define RADEON_EMIT_PP_CUBIC_FACES_2                82
 #define RADEON_EMIT_PP_CUBIC_OFFSETS_T2             83
-#define RADEON_MAX_STATE_PACKETS                    84
+#define R200_EMIT_PP_TRI_PERF_CNTL                  84
+#define RADEON_MAX_STATE_PACKETS                    85
 
 /* Commands understood by cmd_buffer ioctl.  More can be added but
  * obviously these can't be removed or changed:

==== //depot/projects/drm-merge/sys/dev/drm/radeon_drv.h#4 (text+ko) ====

@@ -44,7 +44,7 @@
 
 #define DRIVER_NAME		"radeon"
 #define DRIVER_DESC		"ATI Radeon"
-#define DRIVER_DATE		"20050208"
+#define DRIVER_DATE		"20050311"
 
 /* Interface history:
  *
@@ -86,10 +86,12 @@
  *     - Add R100/R200 surface allocation/free support
  * 1.15- Add support for texture micro tiling
  *     - Add support for r100 cube maps
+ * 1.16- Add R200_EMIT_PP_TRI_PERF_CNTL packet to support brilinear
+ *       texture filtering on r200
  */
 
 #define DRIVER_MAJOR		1
-#define DRIVER_MINOR		15
+#define DRIVER_MINOR		16
 #define DRIVER_PATCHLEVEL	0
 
 enum radeon_family {
@@ -659,6 +661,8 @@
 #	define RADEON_3D_DRAW_IMMD		0x00002900
 #	define RADEON_3D_DRAW_INDX		0x00002A00
 #	define RADEON_3D_LOAD_VBPNTR		0x00002F00
+#	define RADEON_MPEG_IDCT_MACROBLOCK	0x00003000
+#	define RADEON_MPEG_IDCT_MACROBLOCK_REV	0x00003100
 #	define RADEON_3D_CLEAR_ZMASK		0x00003200
 #	define RADEON_3D_CLEAR_HIZ		0x00003700
 #	define RADEON_CNTL_HOSTDATA_BLT		0x00009400
@@ -827,6 +831,8 @@
 
 #define R200_SE_TCL_POINT_SPRITE_CNTL     0x22c4
 
+#define R200_PP_TRI_PERF                  0x2cf8
+
 /* Constants */
 #define RADEON_MAX_USEC_TIMEOUT		100000	/* 100 ms */
 

==== //depot/projects/drm-merge/sys/dev/drm/radeon_state.c#6 (text+ko) ====

@@ -211,6 +211,7 @@
 	case RADEON_EMIT_PP_CUBIC_FACES_0:
 	case RADEON_EMIT_PP_CUBIC_FACES_1:
 	case RADEON_EMIT_PP_CUBIC_FACES_2:
+	case R200_EMIT_PP_TRI_PERF_CNTL:
 		/* These packets don't contain memory offsets */
 		break;
 
@@ -583,7 +584,8 @@
 	RADEON_PP_CUBIC_FACES_1, 1, "RADEON_PP_CUBIC_FACES_1"}, {
 	RADEON_PP_CUBIC_OFFSET_T1_0, 5, "RADEON_PP_CUBIC_OFFSET_T1_0"}, {
 	RADEON_PP_CUBIC_FACES_2, 1, "RADEON_PP_CUBIC_FACES_2"}, {
-	RADEON_PP_CUBIC_OFFSET_T2_0, 5, "RADEON_PP_CUBIC_OFFSET_T2_0"},
+	RADEON_PP_CUBIC_OFFSET_T2_0, 5, "RADEON_PP_CUBIC_OFFSET_T2_0"}, {
+	R200_PP_TRI_PERF, 2, "R200_PP_TRI_PERF"},
 };
 
 /* ================================================================

==== //depot/projects/drm-merge/sys/dev/drm/sis_mm.c#5 (text+ko) ====

@@ -272,7 +272,7 @@
 {
 	DRM_DEVICE;
 	drm_sis_private_t *dev_priv = dev->dev_private;
-	drm_sis_mem_t __user *argp = (void __user *)data;
+	drm_sis_mem_t __user *argp = (drm_sis_mem_t __user *)data;
 	drm_sis_mem_t agp;
 	PMemBlock block;
 	int retval = 0;