[1/2] WIP: rnndb: move reg_.. bitset definitions to common MDP xml file

Commit Message

Stephane Viau July 16, 2014, 8:41 p.m. UTC

Since reg_wh and reg_xy are used in both mdp4.xml and mdp5.xml,
let's define them in mdp_common.xml which is included by these
two files.

Change-Id: Ided6d240913866c047dde131a65a53617d2faeaf
Signed-off-by: Stephane Viau <[e-mail]>
---
 rnndb/mdp/mdp4.xml       | 10 ----------
 rnndb/mdp/mdp_common.xml | 10 ++++++++++
 2 files changed, 10 insertions(+), 10 deletions(-)

Patch

diff --git a/rnndb/mdp/mdp4.xml b/rnndb/mdp/mdp4.xml
index bbf6e1d..d4747e0 100644
--- a/rnndb/mdp/mdp4.xml
+++ b/rnndb/mdp/mdp4.xml
@@ -71,16 +71,6 @@  xsi:schemaLocation="http://nouveau.freedesktop.org/ rules-ng.xsd">
 		<bitfield name="PIPE7_MIXER1" pos="31" type="boolean"/>
 	</bitset>
 
-	<bitset name="reg_wh" inline="yes">
-		<bitfield name="HEIGHT" low="16" high="31" type="uint"/>
-		<bitfield name="WIDTH" low="0" high="15" type="uint"/>
-	</bitset>
-
-	<bitset name="reg_xy" inline="yes">
-		<bitfield name="Y" low="16" high="31" type="uint"/>
-		<bitfield name="X" low="0" high="15" type="uint"/>
-	</bitset>
-
 	<bitset name="MDP4_IRQ">
 		<bitfield name="OVERLAY0_DONE" pos="0" type="boolean"/>
 		<bitfield name="OVERLAY1_DONE" pos="1" type="boolean"/>
diff --git a/rnndb/mdp/mdp_common.xml b/rnndb/mdp/mdp_common.xml
index 7bba63c..5154b48 100644
--- a/rnndb/mdp/mdp_common.xml
+++ b/rnndb/mdp/mdp_common.xml
@@ -38,6 +38,16 @@  xsi:schemaLocation="http://nouveau.freedesktop.org/ rules-ng.xsd">
 	<value name="BPC8A" value="3"/> <!-- 8 bits -->
 </enum>
 
+<bitset name="reg_wh" inline="yes">
+    <bitfield name="HEIGHT" low="16" high="31" type="uint"/>
+    <bitfield name="WIDTH" low="0" high="15" type="uint"/>
+</bitset>
+
+<bitset name="reg_xy" inline="yes">
+    <bitfield name="Y" low="16" high="31" type="uint"/>
+    <bitfield name="X" low="0" high="15" type="uint"/>
+</bitset>
+
 <bitset name="mdp_unpack_pattern" inline="yes">
 	<bitfield name="ELEM0" low="0"  high="7"/>
 	<bitfield name="ELEM1" low="8"  high="15"/>