Commit f430a37f authored by Lionel Landwerlin's avatar Lionel Landwerlin

intel: decoder: unify MI_BB_START field naming

The batch decoder looks for a field with a particular name to decide
whether an MI_BB_START leads into a second batch buffer level. Because
the names are different between Gen7.5/8 and the newer generation we
fail that test and keep on reading (invalid) instructions.
Signed-off-by: Lionel Landwerlin's avatarLionel Landwerlin <lionel.g.landwerlin@intel.com>
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=107544Reviewed-by: Jason Ekstrand's avatarJason Ekstrand <jason@jlekstrand.net>
parent 7f745c19
......@@ -2314,9 +2314,9 @@
<instruction name="MI_BATCH_BUFFER_START" bias="2" length="2">
<field name="Command Type" start="29" end="31" type="uint" default="0"/>
<field name="MI Command Opcode" start="23" end="28" type="uint" default="49"/>
<field name="2nd Level Batch Buffer" start="22" end="22" type="uint">
<value name="1st level batch" value="0"/>
<value name="2nd level batch" value="1"/>
<field name="Second Level Batch Buffer" start="22" end="22" type="uint">
<value name="First level batch" value="0"/>
<value name="Second level batch" value="1"/>
</field>
<field name="Add Offset Enable" start="16" end="16" type="bool"/>
<field name="Predication Enable" start="15" end="15" type="bool"/>
......
......@@ -2553,9 +2553,9 @@
<instruction name="MI_BATCH_BUFFER_START" bias="2" length="3">
<field name="Command Type" start="29" end="31" type="uint" default="0"/>
<field name="MI Command Opcode" start="23" end="28" type="uint" default="49"/>
<field name="2nd Level Batch Buffer" start="22" end="22" type="uint">
<value name="1st level batch" value="0"/>
<value name="2nd level batch" value="1"/>
<field name="Second Level Batch Buffer" start="22" end="22" type="uint">
<value name="First level batch" value="0"/>
<value name="Second level batch" value="1"/>
</field>
<field name="Add Offset Enable" start="16" end="16" type="bool"/>
<field name="Predication Enable" start="15" end="15" type="bool"/>
......
......@@ -531,7 +531,7 @@ emit_batch_buffer_start(struct anv_cmd_buffer *cmd_buffer,
anv_batch_emit(&cmd_buffer->batch, GEN8_MI_BATCH_BUFFER_START, bbs) {
bbs.DWordLength = cmd_buffer->device->info.gen < 8 ?
gen7_length : gen8_length;
bbs._2ndLevelBatchBuffer = _1stlevelbatch;
bbs.SecondLevelBatchBuffer = Firstlevelbatch;
bbs.AddressSpaceIndicator = ASI_PPGTT;
bbs.BatchBufferStartAddress = (struct anv_address) { bo, offset };
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment