[Mesa-dev] [PATCH 08/10] i965: Remove support for the BLT ring

[Jason Ekstrand]

On Mon, May 14, 2018 at 10:07 AM, Pohjolainen, Topi <
topi.pohjolainen at gmail.com> wrote:

> On Fri, May 11, 2018 at 04:48:24PM -0700, Jason Ekstrand wrote:
> > We still support the blitter on gen4-5 but it's on the same ring as 3D.
> > ---
> >  src/mesa/drivers/dri/i965/intel_batchbuffer.c | 12 +++---------
> >  1 file changed, 3 insertions(+), 9 deletions(-)
>
> Nothing amiss in the patch itself, only the title lets one to believe that
> all occurrences of BLT_RING are removed. I don't have anything better to
> offer though...
>

I have another patch for that. :-)

--Jason



> >
> > diff --git a/src/mesa/drivers/dri/i965/intel_batchbuffer.c
> b/src/mesa/drivers/dri/i965/intel_batchbuffer.c
> > index 8c5fd50..b9ea922 100644
> > --- a/src/mesa/drivers/dri/i965/intel_batchbuffer.c
> > +++ b/src/mesa/drivers/dri/i965/intel_batchbuffer.c
> > @@ -771,18 +771,12 @@ submit_batch(struct brw_context *brw, int
> in_fence_fd, int *out_fence_fd)
> >         *   To avoid stalling, execobject.offset should match the current
> >         *   address of that object within the active context.
> >         */
> > -      int flags = I915_EXEC_NO_RELOC;
> > +      assert(devinfo->gen < 6 || batch->ring == RENDER_RING);
> > +      int flags = I915_EXEC_NO_RELOC | I915_EXEC_RENDER;
> >
> > -      if (devinfo->gen >= 6 && batch->ring == BLT_RING) {
> > -         flags |= I915_EXEC_BLT;
> > -      } else {
> > -         flags |= I915_EXEC_RENDER;
> > -      }
> >        if (batch->needs_sol_reset)
> >           flags |= I915_EXEC_GEN7_SOL_RESET;
> >
> > -      uint32_t hw_ctx = batch->ring == RENDER_RING ? brw->hw_ctx : 0;
> > -
> >        /* Set statebuffer relocations */
> >        const unsigned state_index = batch->state.bo->index;
> >        if (state_index < batch->exec_count &&
> > @@ -812,7 +806,7 @@ submit_batch(struct brw_context *brw, int
> in_fence_fd, int *out_fence_fd)
> >           batch->validation_list[index] = tmp;
> >        }
> >
> > -      ret = execbuffer(dri_screen->fd, batch, hw_ctx,
> > +      ret = execbuffer(dri_screen->fd, batch, brw->hw_ctx,
> >                         4 * USED_BATCH(*batch),
> >                         in_fence_fd, out_fence_fd, flags);
> >
> > --
> > 2.5.0.400.gff86faf
> >
> > _______________________________________________
> > mesa-dev mailing list
> > mesa-dev at lists.freedesktop.org
> > https://lists.freedesktop.org/mailman/listinfo/mesa-dev
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.freedesktop.org/archives/mesa-dev/attachments/20180514/7d88fd77/attachment.html>