Module: Mesa Branch: staging/23.2 Commit: a2005ce2e3d4f5327192f69e11536a65141e5a04 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=a2005ce2e3d4f5327192f69e11536a65141e5a04
Author: Lionel Landwerlin <[email protected]> Date: Wed Aug 16 11:28:24 2023 +0300 iris: ensure stalling pipe control before fast clear Signed-off-by: Lionel Landwerlin <[email protected]> Fixes: 87149cc545 ("blorp: update and move fast clear PIPE_CONTROLs to drivers") Reviewed-by: Nanley Chery <[email protected]> (cherry picked from commit aebe58458611e0bb585a5bce8e16c1175783f3cc) Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/25377> --- src/gallium/drivers/iris/iris_clear.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/src/gallium/drivers/iris/iris_clear.c b/src/gallium/drivers/iris/iris_clear.c index 65d4f2f544b..38cc258203f 100644 --- a/src/gallium/drivers/iris/iris_clear.c +++ b/src/gallium/drivers/iris/iris_clear.c @@ -254,13 +254,13 @@ fast_clear_color(struct iris_context *ice, * and again afterwards to ensure that the resolve is complete before we * do any more regular drawing. */ - enum pipe_control_flags pc_flags = + iris_emit_end_of_pipe_sync(batch, "fast clear: pre-flush", PIPE_CONTROL_RENDER_TARGET_FLUSH | PIPE_CONTROL_TILE_CACHE_FLUSH | (devinfo->verx10 == 120 ? PIPE_CONTROL_DEPTH_STALL : 0) | (devinfo->verx10 == 125 ? PIPE_CONTROL_FLUSH_HDC | PIPE_CONTROL_DATA_CACHE_FLUSH : 0) | - PIPE_CONTROL_PSS_STALL_SYNC; + PIPE_CONTROL_PSS_STALL_SYNC); /* From the ICL PRMs, Volume 9: Render Engine, State Caching : * @@ -315,12 +315,11 @@ fast_clear_color(struct iris_context *ice, * the clear color doesn´t change, we invalidate both caches always. */ if (devinfo->ver >= 11) { - pc_flags |= PIPE_CONTROL_STATE_CACHE_INVALIDATE | - PIPE_CONTROL_TEXTURE_CACHE_INVALIDATE; + iris_emit_pipe_control_flush(batch, "fast clear: pre-flush", + PIPE_CONTROL_STATE_CACHE_INVALIDATE | + PIPE_CONTROL_TEXTURE_CACHE_INVALIDATE); } - iris_emit_pipe_control_flush(batch, "fast clear: pre-flush", pc_flags); - iris_batch_sync_region_start(batch); /* If we reach this point, we need to fast clear to change the state to
