From 233f61ccdd617c864ac0a8c35fff3dfa72253815 Mon Sep 17 00:00:00 2001 From: Kenneth Graunke Date: Wed, 18 Jan 2023 10:33:49 -0800 Subject: [PATCH] iris: Add missing untyped data port flush on PIPELINE_SELECT MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This is needed when switching away from GPGPU mode. See the previous commit for anv. This is not likely to make a practical difference for iris because it never switches back and forth between modes like anv. Fixes: 172e0b0ebff ("iris: Update PIPELINE_CONTROL flush when switching pipeline mode in TGL+") Reviewed-by: Lionel Landwerlin Reviewed-by: José Roberto de Souza Part-of: (cherry picked from commit bd8e8d204db32c9a1b05d3748221171504f94167) --- .pick_status.json | 2 +- src/gallium/drivers/iris/iris_state.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.pick_status.json b/.pick_status.json index 04ae4edfa1b..105981ef7b0 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -778,7 +778,7 @@ "description": "iris: Add missing untyped data port flush on PIPELINE_SELECT", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": "172e0b0ebffa02fa86aa6a1915979fb4de9460bb" }, diff --git a/src/gallium/drivers/iris/iris_state.c b/src/gallium/drivers/iris/iris_state.c index 0f7e5169a2b..1f381e4e860 100644 --- a/src/gallium/drivers/iris/iris_state.c +++ b/src/gallium/drivers/iris/iris_state.c @@ -657,6 +657,8 @@ emit_pipeline_select(struct iris_batch *batch, uint32_t pipeline) if (pipeline == GPGPU) { flags |= PIPE_CONTROL_RENDER_TARGET_FLUSH | PIPE_CONTROL_DEPTH_CACHE_FLUSH; + } else { + flags |= PIPE_CONTROL_UNTYPED_DATAPORT_CACHE_FLUSH; } iris_emit_pipe_control_flush(batch, "PIPELINE_SELECT flush", flags); #else