<div dir="ltr"><div class="gmail_extra"><div class="gmail_quote">On Mon, May 14, 2018 at 10:07 AM, Pohjolainen, Topi <span dir="ltr"><<a href="mailto:topi.pohjolainen@gmail.com" target="_blank">topi.pohjolainen@gmail.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><span class="">On Fri, May 11, 2018 at 04:48:24PM -0700, Jason Ekstrand wrote:<br>
> We still support the blitter on gen4-5 but it's on the same ring as 3D.<br>
> ---<br>
> src/mesa/drivers/dri/i965/<wbr>intel_batchbuffer.c | 12 +++---------<br>
> 1 file changed, 3 insertions(+), 9 deletions(-)<br>
<br>
</span>Nothing amiss in the patch itself, only the title lets one to believe that<br>
all occurrences of BLT_RING are removed. I don't have anything better to<br>
offer though...<br><div><div class="h5"></div></div></blockquote><div><br></div><div>I have another patch for that. :-)</div><div><br></div><div>--Jason</div><div><br></div><div> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><div><div class="h5">
> <br>
> diff --git a/src/mesa/drivers/dri/i965/<wbr>intel_batchbuffer.c b/src/mesa/drivers/dri/i965/<wbr>intel_batchbuffer.c<br>
> index 8c5fd50..b9ea922 100644<br>
> --- a/src/mesa/drivers/dri/i965/<wbr>intel_batchbuffer.c<br>
> +++ b/src/mesa/drivers/dri/i965/<wbr>intel_batchbuffer.c<br>
> @@ -771,18 +771,12 @@ submit_batch(struct brw_context *brw, int in_fence_fd, int *out_fence_fd)<br>
> * To avoid stalling, execobject.offset should match the current<br>
> * address of that object within the active context.<br>
> */<br>
> - int flags = I915_EXEC_NO_RELOC;<br>
> + assert(devinfo->gen < 6 || batch->ring == RENDER_RING);<br>
> + int flags = I915_EXEC_NO_RELOC | I915_EXEC_RENDER;<br>
> <br>
> - if (devinfo->gen >= 6 && batch->ring == BLT_RING) {<br>
> - flags |= I915_EXEC_BLT;<br>
> - } else {<br>
> - flags |= I915_EXEC_RENDER;<br>
> - }<br>
> if (batch->needs_sol_reset)<br>
> flags |= I915_EXEC_GEN7_SOL_RESET;<br>
> <br>
> - uint32_t hw_ctx = batch->ring == RENDER_RING ? brw->hw_ctx : 0;<br>
> -<br>
> /* Set statebuffer relocations */<br>
> const unsigned state_index = batch->state.bo->index;<br>
> if (state_index < batch->exec_count &&<br>
> @@ -812,7 +806,7 @@ submit_batch(struct brw_context *brw, int in_fence_fd, int *out_fence_fd)<br>
> batch->validation_list[index] = tmp;<br>
> }<br>
> <br>
> - ret = execbuffer(dri_screen->fd, batch, hw_ctx,<br>
> + ret = execbuffer(dri_screen->fd, batch, brw->hw_ctx,<br>
> 4 * USED_BATCH(*batch),<br>
> in_fence_fd, out_fence_fd, flags);<br>
> <br>
> -- <br>
> 2.5.0.400.gff86faf<br>
> <br>
</div></div>> ______________________________<wbr>_________________<br>
> mesa-dev mailing list<br>
> <a href="mailto:mesa-dev@lists.freedesktop.org">mesa-dev@lists.freedesktop.org</a><br>
> <a href="https://lists.freedesktop.org/mailman/listinfo/mesa-dev" rel="noreferrer" target="_blank">https://lists.freedesktop.org/<wbr>mailman/listinfo/mesa-dev</a><br>
</blockquote></div><br></div></div>