summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJason Ekstrand <[email protected]>2016-06-07 11:37:46 -0700
committerJason Ekstrand <[email protected]>2016-06-22 12:26:43 -0700
commit89ded099f840275d278c408e132ad5db39fdf5af (patch)
tree4436a52304f7266401cd7f79f187322c3cf8fcdd
parentd82322eb188f258a7dca9ea2b59cc0332dbc4d61 (diff)
genxml: Put append counter fields before MCS in RENDER_SURFACE_STATE on gen7
The pack header generation scripts can't handle the case where you have two addresses in the same dword; they just take whatever is the last one. This meant that the MCS address wasn't properly getting handled. Since we don't care about append counters, we can just re-arrange the XML for now. Reviewed-by: Chad Versace <[email protected]> Cc: "12.0" <[email protected]>
-rw-r--r--src/intel/genxml/gen7.xml4
-rw-r--r--src/intel/genxml/gen75.xml4
2 files changed, 4 insertions, 4 deletions
diff --git a/src/intel/genxml/gen7.xml b/src/intel/genxml/gen7.xml
index 6f3e8ccc131..87057f3c725 100644
--- a/src/intel/genxml/gen7.xml
+++ b/src/intel/genxml/gen7.xml
@@ -394,10 +394,10 @@
<field name="MOCS" start="176" end="179" type="uint"/>
<field name="Surface Min LOD" start="164" end="167" type="uint"/>
<field name="MIP Count / LOD" start="160" end="163" type="uint"/>
- <field name="MCS Base Address" start="204" end="223" type="address"/>
- <field name="MCS Surface Pitch" start="195" end="203" type="uint"/>
<field name="Append Counter Address" start="198" end="223" type="address"/>
<field name="Append Counter Enable" start="193" end="193" type="bool"/>
+ <field name="MCS Base Address" start="204" end="223" type="address"/>
+ <field name="MCS Surface Pitch" start="195" end="203" type="uint"/>
<field name="MCS Enable" start="192" end="192" type="bool"/>
<field name="Reserved: MBZ" start="222" end="223" type="uint"/>
<field name="X Offset for UV Plane" start="208" end="221" type="uint"/>
diff --git a/src/intel/genxml/gen75.xml b/src/intel/genxml/gen75.xml
index ac1b6e416ac..dcceea5b4bb 100644
--- a/src/intel/genxml/gen75.xml
+++ b/src/intel/genxml/gen75.xml
@@ -405,10 +405,10 @@
<field name="MOCS" start="176" end="179" type="uint"/>
<field name="Surface Min LOD" start="164" end="167" type="uint"/>
<field name="MIP Count / LOD" start="160" end="163" type="uint"/>
- <field name="MCS Base Address" start="204" end="223" type="address"/>
- <field name="MCS Surface Pitch" start="195" end="203" type="uint"/>
<field name="Append Counter Address" start="198" end="223" type="address"/>
<field name="Append Counter Enable" start="193" end="193" type="bool"/>
+ <field name="MCS Base Address" start="204" end="223" type="address"/>
+ <field name="MCS Surface Pitch" start="195" end="203" type="uint"/>
<field name="MCS Enable" start="192" end="192" type="bool"/>
<field name="Reserved: MBZ" start="222" end="223" type="uint"/>
<field name="X Offset for UV Plane" start="208" end="221" type="uint"/>