I think I have a similar patch laying around in my 2nd level batch buffer branch. :)
Reviewed-by: Jason Ekstrand <ja...@jlekstrand.net> On Tue, Aug 14, 2018 at 5:26 AM Lionel Landwerlin < lionel.g.landwer...@intel.com> wrote: > 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 <lionel.g.landwer...@intel.com> > Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=107544 > --- > src/intel/genxml/gen75.xml | 6 +++--- > src/intel/genxml/gen8.xml | 6 +++--- > src/intel/vulkan/anv_batch_chain.c | 2 +- > 3 files changed, 7 insertions(+), 7 deletions(-) > > diff --git a/src/intel/genxml/gen75.xml b/src/intel/genxml/gen75.xml > index 5b01fd45400..dfc3d891498 100644 > --- a/src/intel/genxml/gen75.xml > +++ b/src/intel/genxml/gen75.xml > @@ -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"/> > diff --git a/src/intel/genxml/gen8.xml b/src/intel/genxml/gen8.xml > index 4ed41d15612..330366b7ed0 100644 > --- a/src/intel/genxml/gen8.xml > +++ b/src/intel/genxml/gen8.xml > @@ -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"/> > diff --git a/src/intel/vulkan/anv_batch_chain.c > b/src/intel/vulkan/anv_batch_chain.c > index c47a81c8a4d..0f7c8325ea4 100644 > --- a/src/intel/vulkan/anv_batch_chain.c > +++ b/src/intel/vulkan/anv_batch_chain.c > @@ -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 }; > } > -- > 2.18.0 > > _______________________________________________ > mesa-dev mailing list > mesa-dev@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/mesa-dev >
_______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-dev
