intel/genxml: Normalize fields on WM_STATE.

On gen4, WM_STATE only has one Kernel Start Pointer and one GRF Register
Count, but we can make the code that handles this on multiple gens simpler if
we add an index 0 to it too.

Signed-off-by: Rafael Antognolli <rafael.antognolli@intel.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
This commit is contained in:
Rafael Antognolli 2017-06-13 16:43:59 -07:00
parent eddb1ebccf
commit 82c66965ac
3 changed files with 6 additions and 6 deletions

View file

@ -762,8 +762,8 @@
</struct>
<struct name="WM_STATE" length="8">
<field name="Kernel Start Pointer" start="6" end="31" type="address"/>
<field name="GRF Register Count" start="1" end="3" type="uint"/>
<field name="Kernel Start Pointer 0" start="6" end="31" type="address"/>
<field name="GRF Register Count 0" 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"/>
<field name="Thread Priority" start="49" end="49" type="uint">

View file

@ -776,8 +776,8 @@
</struct>
<struct name="WM_STATE" length="8">
<field name="Kernel Start Pointer" start="6" end="31" type="address"/>
<field name="GRF Register Count" start="1" end="3" type="uint"/>
<field name="Kernel Start Pointer 0" start="6" end="31" type="address"/>
<field name="GRF Register Count 0" 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"/>
<field name="Thread Priority" start="49" end="49" type="uint">

View file

@ -139,9 +139,9 @@ blorp_emit_wm_state(struct blorp_batch *batch,
wm._16PixelDispatchEnable = prog_data->dispatch_16;
#if GEN_GEN == 4
wm.KernelStartPointer =
wm.KernelStartPointer0 =
instruction_state_address(batch, params->wm_prog_kernel);
wm.GRFRegisterCount = prog_data->reg_blocks_0;
wm.GRFRegisterCount0 = prog_data->reg_blocks_0;
#else
wm.KernelStartPointer0 = params->wm_prog_kernel;
wm.GRFRegisterCount0 = prog_data->reg_blocks_0;