<div dir="ltr"><div>Hi James,</div><div><br></div><div>We use gitlab for merge requests and pushing:</div><div></div><div><a href="https://www.mesa3d.org/submittingpatches.html">https://www.mesa3d.org/submittingpatches.html</a></div><div><br></div><div>Marek<br></div><div><br></div></div><br><div class="gmail_quote"><div dir="ltr" class="gmail_attr">On Mon, Apr 6, 2020 at 2:12 PM James Zhu <<a href="mailto:James.Zhu@amd.com">James.Zhu@amd.com</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex">Fix Segmentation fault duiring vaapi enc test on Arcturus.<br>
<br>
Signed-off-by: James Zhu <<a href="mailto:James.Zhu@amd.com" target="_blank">James.Zhu@amd.com</a>><br>
---<br>
src/gallium/drivers/radeonsi/si_compute_blit.c | 6 ++++--<br>
1 file changed, 4 insertions(+), 2 deletions(-)<br>
<br>
diff --git a/src/gallium/drivers/radeonsi/si_compute_blit.c b/src/gallium/drivers/radeonsi/si_compute_blit.c<br>
index 6e3b07c..a56676a 100644<br>
--- a/src/gallium/drivers/radeonsi/si_compute_blit.c<br>
+++ b/src/gallium/drivers/radeonsi/si_compute_blit.c<br>
@@ -63,7 +63,8 @@ static void si_launch_grid_internal(struct si_context *sctx, struct pipe_grid_in<br>
sctx->flags |= SI_CONTEXT_STOP_PIPELINE_STATS;<br>
sctx->render_cond_force_off = true;<br>
/* Skip decompression to prevent infinite recursion. */<br>
- sctx->blitter->running = true;<br>
+ if (sctx->blitter)<br>
+ blitter->running = true;<br>
<br>
/* Dispatch compute. */<br>
sctx->b.launch_grid(&sctx->b, info);<br>
@@ -72,7 +73,8 @@ static void si_launch_grid_internal(struct si_context *sctx, struct pipe_grid_in<br>
sctx->flags &= ~SI_CONTEXT_STOP_PIPELINE_STATS;<br>
sctx->flags |= SI_CONTEXT_START_PIPELINE_STATS;<br>
sctx->render_cond_force_off = false;<br>
- sctx->blitter->running = false;<br>
+ if (sctx->blitter)<br>
+ sctx->blitter->running = false;<br>
}<br>
<br>
static void si_compute_clear_12bytes_buffer(struct si_context *sctx, struct pipe_resource *dst,<br>
-- <br>
2.7.4<br>
<br>
_______________________________________________<br>
mesa-dev mailing list<br>
<a href="mailto:mesa-dev@lists.freedesktop.org" target="_blank">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/mailman/listinfo/mesa-dev</a><br>
</blockquote></div>