[Nouveau-cvs] renouveau [koriakin]

[<nou...@li...>]

NouVeau CVS commit

Author  : koriakin
Module  : renouveau

Dir     : renouveau


Modified Files:
	renouveau.xml 


Log Message:
nv50: Add COND on 2d object.

===================================================================
RCS file: /cvsroot/nouveau/renouveau/renouveau.xml,v
retrieving revision 1.309
retrieving revision 1.310
diff -u -3 -r1.309 -r1.310
--- renouveau.xml	10 Dec 2009 15:11:57 -0000	1.309
+++ renouveau.xml	26 Dec 2009 05:43:54 -0000	1.310
@@ -627,7 +627,7 @@
     </list>
 
     <list name="nv50_cond_mode">
-      <item value="0x0000" name="NEVER"/> <!-- not sure about this one, could be condition from some other source -->
+      <item value="0x0000" name="NEVER"/>
       <item value="0x0001" name="ALWAYS"/>
       <item value="0x0002" name="RES"/>
       <item value="0x0003" name="NOT_RES_AND_NOT_ID"/>
@@ -4334,7 +4334,7 @@
     <reg32 offset="0x0180" name="DMA_NOTIFY" type="object"/>
     <reg32 offset="0x0184" name="DMA_IN_MEMORY0" type="object"/>
     <reg32 offset="0x0188" name="DMA_IN_MEMORY1" type="object"/>
-    <reg32 offset="0x018c" name="DMA_IN_MEMORY2" type="object"/>
+    <reg32 offset="0x018c" name="DMA_COND" type="object"/>
     <reg32 offset="0x0200" name="DST_FORMAT" type="enum" enum_name="nv50_surface_format"/>
     <reg32 offset="0x0204" name="DST_LINEAR" type="boolean"/>
     <reg32 offset="0x0208" name="DST_TILE_MODE" type="hexa"/>
@@ -4351,6 +4351,9 @@
     <reg32 offset="0x024c" name="SRC_HEIGHT" type="int"/>
     <reg32 offset="0x0250" name="SRC_ADDRESS_HIGH" type="hexa"/>
     <reg32 offset="0x0254" name="SRC_ADDRESS_LOW" type="hexa"/>
+    <reg32 offset="0x0264" name="COND_ADDRESS_HIGH" type="hexa"/>
+    <reg32 offset="0x0268" name="COND_ADDRESS_LOW" type="hexa"/>
+    <reg32 offset="0x026c" name="COND_MODE" type="enum" enum_name="nv50_cond_mode"/>
     <reg32 offset="0x0280" name="CLIP_X" type="int"/>
     <reg32 offset="0x0284" name="CLIP_Y" type="int"/>
     <reg32 offset="0x0288" name="CLIP_Z" type="int"/>