[Dri-devel] Merge into 2.5.x kernel tree..

[Linus T. <tor...@tr...>]

I just finished a merge of the current DRI CVS tree kernel parts into 
2.5.x. I've not done one of these in a while, so sadly the merge ends up 
being several totally unrelated things (i830 irq updates, the lock context 
fixes, and various random smaller things).

I've pushed the result out, and it should show up in the next nightly 
snapshot (and earlier, if you'r ea BK user or follow the patch-list). If 
somebody in the DRI group would double-check, that would be good.

I tested on radeon, and tested by compiling all the drivers into the
kernel. Looked good as far as I can tell. Although I have to say that the
current DRI CVS tree has a lot of flashing textures on the commercial
tuxracer thing. Last I tested - a long time ago - the "texmem" branch was
picture-perfect and performed better too. In contrast, no CVS head has
ever had correct textures on tuxracer for me (although the flashing 
behaviour seems to change occasionally).

Btw, here's a few spelling fixes for the DRI tree - if somebody can apply 
them I don't have to be careful about trying to not revert fixes in the 
kernel when I try to merge next time.

		Linus

----
diff -u --recursive --exclude='*C*S' dri-kernel/drm_vm.h v2.5/linux/drivers/char/drm/drm_vm.h
--- dri-kernel/drm_vm.h	2002-12-13 13:15:13.000000000 -0800
+++ v2.5/linux/drivers/char/drm/drm_vm.h	2003-03-26 09:10:13.000000000 -0800
@@ -147,7 +146,7 @@
 }
 
 /* Special close routine which deletes map information if we are the last
- * person to close a mapping and its not in the global maplist.
+ * person to close a mapping and it's not in the global maplist.
  */
 
 void DRM(vm_shm_close)(struct vm_area_struct *vma)
diff -u --recursive --exclude='*C*S' dri-kernel/i810_drm.h v2.5/linux/drivers/char/drm/i810_drm.h
--- dri-kernel/i810_drm.h	2002-06-12 09:55:13.000000000 -0700
+++ v2.5/linux/drivers/char/drm/i810_drm.h	2003-03-26 09:10:13.000000000 -0800
@@ -38,7 +38,7 @@
  *    - zbuffer linear offset and pitch -- also invarient
  *    - drawing origin in back and depth buffers.
  *
- * Keep the depth/back buffer state here to acommodate private buffers
+ * Keep the depth/back buffer state here to accommodate private buffers
  * in the future.
  */
 #define I810_DESTREG_DI0  0	/* CMD_OP_DESTBUFFER_INFO (2 dwords) */
diff -u --recursive --exclude='*C*S' dri-kernel/i830_dma.c v2.5/linux/drivers/char/drm/i830_dma.c
--- dri-kernel/i830_dma.c	2003-03-29 20:52:39.000000000 -0800
+++ v2.5/linux/drivers/char/drm/i830_dma.c	2003-03-29 22:38:01.000000000 -0800
@@ -439,7 +432,7 @@
 	DRM_DEBUG("pitch_bits %x\n",    init->pitch_bits);
 
 	dev_priv->cpp = init->cpp;
-	/* We are using seperate values as placeholders for mechanisms for
+	/* We are using separate values as placeholders for mechanisms for
 	 * private backbuffer/depthbuffer usage.
 	 */
 
diff -u --recursive --exclude='*C*S' dri-kernel/i830_drm.h v2.5/linux/drivers/char/drm/i830_drm.h
--- dri-kernel/i830_drm.h	2003-03-29 20:52:39.000000000 -0800
+++ v2.5/linux/drivers/char/drm/i830_drm.h	2003-03-29 22:38:01.000000000 -0800
@@ -70,7 +70,7 @@
  *    - zbuffer linear offset and pitch -- also invarient
  *    - drawing origin in back and depth buffers.
  *
- * Keep the depth/back buffer state here to acommodate private buffers
+ * Keep the depth/back buffer state here to accommodate private buffers
  * in the future.
  */