[Mesa-dev] [PATCH v3 06/37] genxml: Add alias for MOCS.

[Jason Ekstrand]

On April 29, 2017 01:02:28 Kenneth Graunke <kenneth at whitecape.org> wrote:

> On Tuesday, April 25, 2017 1:59:15 PM PDT Rafael Antognolli wrote:
>> Use an alias, so we can set the same value as the #define's.
>>
>> v3:
>>    - Call it "SO Buffer MOCS" to follow the most common naming scheme.
>>    - Add alias for gen7 and gen75 too (Ken).
>>
>> Signed-off-by: Rafael Antognolli <rafael.antognolli at intel.com>
>> ---
>>  src/intel/genxml/gen7.xml  | 1 +
>>  src/intel/genxml/gen75.xml | 1 +
>>  src/intel/genxml/gen8.xml  | 1 +
>>  src/intel/genxml/gen9.xml  | 1 +
>>  4 files changed, 4 insertions(+)
>>
>> diff --git a/src/intel/genxml/gen7.xml b/src/intel/genxml/gen7.xml
>> index 440258a..b63add0 100644
>> --- a/src/intel/genxml/gen7.xml
>> +++ b/src/intel/genxml/gen7.xml
>> @@ -1642,6 +1642,7 @@
>>      <field name="DWord Length" start="0" end="7" type="uint" default="2"/>
>>      <field name="SO Buffer Index" start="61" end="62" type="uint"/>
>>      <field name="SO Buffer Object Control State" start="57" end="60" 
>>      type="MEMORY_OBJECT_CONTROL_STATE"/>
>> +    <field name="SO Buffer MOCS" start="57" end="60" type="uint"/>
>>      <field name="Surface Pitch" start="32" end="43" type="uint"/>
>>      <field name="Surface Base Address" start="66" end="95" type="address"/>
>>      <field name="Surface End Address" start="98" end="127" type="address"/>
>> diff --git a/src/intel/genxml/gen75.xml b/src/intel/genxml/gen75.xml
>> index 9f0486c..e63979c 100644
>> --- a/src/intel/genxml/gen75.xml
>> +++ b/src/intel/genxml/gen75.xml
>> @@ -1957,6 +1957,7 @@
>>      <field name="DWord Length" start="0" end="7" type="uint" default="2"/>
>>      <field name="SO Buffer Index" start="61" end="62" type="uint"/>
>>      <field name="SO Buffer Object Control State" start="57" end="60" 
>>      type="MEMORY_OBJECT_CONTROL_STATE"/>
>> +    <field name="SO Buffer MOCS" start="57" end="60" type="uint"/>
>>      <field name="Surface Pitch" start="32" end="43" type="uint"/>
>>      <field name="Surface Base Address" start="66" end="95" type="address"/>
>>      <field name="Surface End Address" start="98" end="127" type="address"/>
>> diff --git a/src/intel/genxml/gen8.xml b/src/intel/genxml/gen8.xml
>> index 408d241..3b44406 100644
>> --- a/src/intel/genxml/gen8.xml
>> +++ b/src/intel/genxml/gen8.xml
>> @@ -2064,6 +2064,7 @@
>>      <field name="SO Buffer Enable" start="63" end="63" type="bool"/>
>>      <field name="SO Buffer Index" start="61" end="62" type="uint"/>
>>      <field name="SO Buffer Object Control State" start="54" end="60" 
>>      type="MEMORY_OBJECT_CONTROL_STATE"/>
>> +    <field name="SO Buffer MOCS" start="54" end="60" type="uint"/>
>>      <field name="Stream Offset Write Enable" start="53" end="53" type="bool"/>
>>      <field name="Stream Output Buffer Offset Address Enable" start="52" 
>>      end="52" type="bool"/>
>>      <field name="Surface Base Address" start="66" end="111" type="address"/>
>> diff --git a/src/intel/genxml/gen9.xml b/src/intel/genxml/gen9.xml
>> index 59daa31..d78a321 100644
>> --- a/src/intel/genxml/gen9.xml
>> +++ b/src/intel/genxml/gen9.xml
>> @@ -2246,6 +2246,7 @@
>>      <field name="SO Buffer Enable" start="63" end="63" type="bool"/>
>>      <field name="SO Buffer Index" start="61" end="62" type="uint"/>
>>      <field name="SO Buffer Object Control State" start="54" end="60" 
>>      type="MEMORY_OBJECT_CONTROL_STATE"/>
>> +    <field name="SO Buffer MOCS" start="54" end="60" type="uint"/>
>>      <field name="Stream Offset Write Enable" start="53" end="53" type="bool"/>
>>      <field name="Stream Output Buffer Offset Address Enable" start="52" 
>>      end="52" type="bool"/>
>>      <field name="Surface Base Address" start="66" end="111" type="address"/>
>>
>
> Can we just get rid of "SO Buffer Object Control State" then?
> I don't think anything uses it, and your new field is easier to use.

We haven't on any of the others but I'm not necessarily opposed