intel/genxml: Normalize URB Data field in WM_STATE.

On gen6+, this is called "Dispatch GRF Start Register For Constant/Setup Data
0", while on gen5 and lower it's called only "Dispatch GRF Start Register For
URB Data", but it's essentially the same thing (URB data), so rename it to
match newer gens and simplify the C code that handles it.

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:47:51 -07:00
parent 44415056e7
commit ce728594fd
4 changed files with 4 additions and 4 deletions

View file

@ -783,7 +783,7 @@
<field name="Constant URB Entry Read Offset" start="114" end="119" type="uint"/>
<field name="Setup URB Entry Read Length" start="107" end="112" type="uint"/>
<field name="Setup URB Entry Read Offset" start="100" end="105" type="uint"/>
<field name="Dispatch GRF Start Register For URB Data" start="96" end="99" type="uint"/>
<field name="Dispatch GRF Start Register For Constant/Setup Data 0" start="96" end="99" type="uint"/>
<field name="Sampler State Pointer" start="133" end="159" type="address"/>
<field name="Sampler Count" start="130" end="132" type="uint"/>
<field name="Statistics Enable" start="128" end="128" type="bool"/>

View file

@ -798,7 +798,7 @@
<field name="Constant URB Entry Read Offset" start="114" end="119" type="uint"/>
<field name="Setup URB Entry Read Length" start="107" end="112" type="uint"/>
<field name="Setup URB Entry Read Offset" start="100" end="105" type="uint"/>
<field name="Dispatch GRF Start Register For URB Data" start="96" end="99" type="uint"/>
<field name="Dispatch GRF Start Register For Constant/Setup Data 0" start="96" end="99" type="uint"/>
<field name="Sampler State Pointer" start="133" end="159" type="address"/>
<field name="Sampler Count" start="130" end="132" type="uint"/>
<field name="Statistics Enable" start="128" end="128" type="bool"/>

View file

@ -893,7 +893,7 @@
<field name="Constant URB Entry Read Offset" start="114" end="119" type="uint"/>
<field name="Setup URB Entry Read Length" start="107" end="112" type="uint"/>
<field name="Setup URB Entry Read Offset" start="100" end="105" type="uint"/>
<field name="Dispatch GRF Start Register For URB Data" start="96" end="99" type="uint"/>
<field name="Dispatch GRF Start Register For Constant/Setup Data 0" start="96" end="99" type="uint"/>
<field name="Sampler State Pointer" start="133" end="159" type="address"/>
<field name="Sampler Count" start="130" end="132" type="uint"/>
<field name="Statistics Enable" start="128" end="128" type="bool"/>

View file

@ -125,7 +125,7 @@ blorp_emit_wm_state(struct blorp_batch *batch,
}
if (prog_data) {
wm.DispatchGRFStartRegisterForURBData =
wm.DispatchGRFStartRegisterForConstantSetupData0 =
prog_data->base.dispatch_grf_start_reg;
wm.SetupURBEntryReadLength = prog_data->num_varying_inputs * 2;
wm.SetupURBEntryReadOffset = 0;