From: Kenneth Graunke <kenneth@whitecape.org>
Date: Wed, 10 May 2017 19:41:37 +0000 (-0700)
Subject: genxml: Fix KSPs on Ironlake to be offsets, not pointers.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=d65e19f5c64f788d1d2e8477dc16d05b9fa2dbce;p=mesa.git

genxml: Fix KSPs on Ironlake to be offsets, not pointers.

We use Instruction State Base Address on Ironlake, so we want KSP to be
an offset not an actual pointer.  Gen4/G45 use pointers.

Reviewed-by: Jason Ekstrand <jason@jlekstrand.net>
---

diff --git a/src/intel/genxml/gen5.xml b/src/intel/genxml/gen5.xml
index 447499ca8c7..933a434487e 100644
--- a/src/intel/genxml/gen5.xml
+++ b/src/intel/genxml/gen5.xml
@@ -345,7 +345,7 @@
   </struct>
 
   <struct name="CLIP_STATE" length="11">
-    <field name="Kernel Start Pointer" start="6" end="31" type="address"/>
+    <field name="Kernel Start Pointer" start="6" end="31" type="offset"/>
     <field name="GRF Register Count" start="1" end="3" type="uint"/>
     <field name="Single Program Flow" start="63" end="63" type="bool"/>
     <field name="Binding Table Entry Count" start="50" end="57" type="uint"/>
@@ -455,7 +455,7 @@
   </struct>
 
   <struct name="GS_STATE" length="7">
-    <field name="Kernel Start Pointer" start="6" end="31" type="address"/>
+    <field name="Kernel Start Pointer" start="6" end="31" type="offset"/>
     <field name="GRF Register Count" start="1" end="3" type="uint"/>
     <field name="Single Program Flow" start="63" end="63" type="bool"/>
     <field name="Binding Table Entry Count" start="50" end="57" type="uint"/>
@@ -706,7 +706,7 @@
   </instruction>
 
   <struct name="SF_STATE" length="8">
-    <field name="Kernel Start Pointer" start="6" end="31" type="address"/>
+    <field name="Kernel Start Pointer" start="6" end="31" type="offset"/>
     <field name="GRF Register Count" start="1" end="3" type="uint"/>
     <field name="Single Program Flow" start="63" end="63" type="bool"/>
     <field name="Binding Table Entry Count" start="50" end="57" type="uint"/>
@@ -831,7 +831,7 @@
   </struct>
 
   <struct name="VS_STATE" length="7">
-    <field name="Kernel Start Pointer" start="6" end="31" type="address"/>
+    <field name="Kernel Start Pointer" start="6" end="31" type="offset"/>
     <field name="GRF Register Count" start="1" end="3" type="uint"/>
     <field name="Single Program Flow" start="63" end="63" type="bool"/>
     <field name="Binding Table Entry Count" start="50" end="57" type="uint"/>
@@ -864,7 +864,7 @@
   </struct>
 
   <struct name="WM_STATE" length="11">
-    <field name="Kernel Start Pointer" start="6" end="31" type="address"/>
+    <field name="Kernel Start Pointer" start="6" end="31" type="offset"/>
     <field name="GRF Register Count" start="1" end="3" type="uint"/>
     <field name="Single Program Flow" start="63" end="63" type="bool"/>
     <field name="Binding Table Entry Count" start="50" end="57" type="uint"/>
@@ -923,11 +923,11 @@
     <field name="8 Pixel Dispatch Enable" start="160" end="160" type="bool"/>
     <field name="Global Depth Offset Constant" start="192" end="223" type="float"/>
     <field name="Global Depth Offset Scale" start="224" end="255" type="float"/>
-    <field name="Kernel Start Pointer[1]" start="262" end="287" type="address"/>
+    <field name="Kernel Start Pointer[1]" start="262" end="287" type="offset"/>
     <field name="GRF Register Count[1]" start="257" end="259" type="uint"/>
-    <field name="Kernel Start Pointer[2]" start="294" end="319" type="address"/>
+    <field name="Kernel Start Pointer[2]" start="294" end="319" type="offset"/>
     <field name="GRF Register Count[2]" start="289" end="291" type="uint"/>
-    <field name="Kernel Start Pointer[3]" start="326" end="351" type="address"/>
+    <field name="Kernel Start Pointer[3]" start="326" end="351" type="offset"/>
     <field name="GRF Register Count[4]" start="321" end="323" type="uint"/>
   </struct>