[Mesa-dev] [PATCH] radeonsi: fix Segmentation fault during vaapi enc test

[Marek Olšák]

Hi James,

We use gitlab for merge requests and pushing:
https://www.mesa3d.org/submittingpatches.html

Marek


On Mon, Apr 6, 2020 at 2:12 PM James Zhu <James.Zhu at amd.com> wrote:

> Fix Segmentation fault duiring vaapi enc test on Arcturus.
>
> Signed-off-by: James Zhu <James.Zhu at amd.com>
> ---
>  src/gallium/drivers/radeonsi/si_compute_blit.c | 6 ++++--
>  1 file changed, 4 insertions(+), 2 deletions(-)
>
> diff --git a/src/gallium/drivers/radeonsi/si_compute_blit.c
> b/src/gallium/drivers/radeonsi/si_compute_blit.c
> index 6e3b07c..a56676a 100644
> --- a/src/gallium/drivers/radeonsi/si_compute_blit.c
> +++ b/src/gallium/drivers/radeonsi/si_compute_blit.c
> @@ -63,7 +63,8 @@ static void si_launch_grid_internal(struct si_context
> *sctx, struct pipe_grid_in
>     sctx->flags |= SI_CONTEXT_STOP_PIPELINE_STATS;
>     sctx->render_cond_force_off = true;
>     /* Skip decompression to prevent infinite recursion. */
> -   sctx->blitter->running = true;
> +   if (sctx->blitter)
> +      blitter->running = true;
>
>     /* Dispatch compute. */
>     sctx->b.launch_grid(&sctx->b, info);
> @@ -72,7 +73,8 @@ static void si_launch_grid_internal(struct si_context
> *sctx, struct pipe_grid_in
>     sctx->flags &= ~SI_CONTEXT_STOP_PIPELINE_STATS;
>     sctx->flags |= SI_CONTEXT_START_PIPELINE_STATS;
>     sctx->render_cond_force_off = false;
> -   sctx->blitter->running = false;
> +   if (sctx->blitter)
> +      sctx->blitter->running = false;
>  }
>
>  static void si_compute_clear_12bytes_buffer(struct si_context *sctx,
> struct pipe_resource *dst,
> --
> 2.7.4
>
> _______________________________________________
> 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/20200406/f5754b9f/attachment.htm>