[PATCH] drm/amdgpu: fix preamble handling

[Alex Deucher]

On Tue, Aug 21, 2018 at 9:11 AM Christian König
<ckoenig.leichtzumerken at gmail.com> wrote:
>
> At this point the command submission can still be interrupted.
>
> Signed-off-by: Christian König <christian.koenig at amd.com>

Acked-by: Alex Deucher <alexander.deucher at amd.com>

> ---
>  drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 16 +++++++++-------
>  1 file changed, 9 insertions(+), 7 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
> index d42d1c8f78f6..313ac971eaaf 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
> @@ -1015,13 +1015,9 @@ static int amdgpu_cs_ib_fill(struct amdgpu_device *adev,
>                 if (r)
>                         return r;
>
> -               if (chunk_ib->flags & AMDGPU_IB_FLAG_PREAMBLE) {
> -                       parser->job->preamble_status |= AMDGPU_PREAMBLE_IB_PRESENT;
> -                       if (!parser->ctx->preamble_presented) {
> -                               parser->job->preamble_status |= AMDGPU_PREAMBLE_IB_PRESENT_FIRST;
> -                               parser->ctx->preamble_presented = true;
> -                       }
> -               }
> +               if (chunk_ib->flags & AMDGPU_IB_FLAG_PREAMBLE)
> +                       parser->job->preamble_status |=
> +                               AMDGPU_PREAMBLE_IB_PRESENT;
>
>                 if (parser->entity && parser->entity != entity)
>                         return -EINVAL;
> @@ -1244,6 +1240,12 @@ static int amdgpu_cs_submit(struct amdgpu_cs_parser *p,
>
>         amdgpu_cs_post_dependencies(p);
>
> +       if ((job->preamble_status & AMDGPU_PREAMBLE_IB_PRESENT) &&
> +           !p->ctx->preamble_presented) {
> +               job->preamble_status |= AMDGPU_PREAMBLE_IB_PRESENT_FIRST;
> +               p->ctx->preamble_presented = true;
> +       }
> +
>         cs->out.handle = seq;
>         job->uf_sequence = seq;
>
> --
> 2.14.1
>
> _______________________________________________
> amd-gfx mailing list
> amd-gfx at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/amd-gfx