From 69cac7ae190f2beeb942e1efcd2c09439e388cd0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tapani=20P=C3=A4lli?= Date: Thu, 18 Jan 2024 07:20:24 +0200 Subject: [PATCH] iris: expand pre-hiz data cache flush to gfx >= 125 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: mesa-stable Signed-off-by: Tapani Pälli Reviewed-by: Sagar Ghuge Reviewed-by: Lionel Landwerlin Part-of: (cherry picked from commit 93706d5c2fb8cd47fa444fd8598b5cb190cf74a7) --- .pick_status.json | 2 +- src/gallium/drivers/iris/iris_resolve.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index 8ffbf1f302b..2614669b8dc 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -1234,7 +1234,7 @@ "description": "iris: expand pre-hiz data cache flush to gfx >= 125", "nominated": true, "nomination_type": 0, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": null, "notes": null diff --git a/src/gallium/drivers/iris/iris_resolve.c b/src/gallium/drivers/iris/iris_resolve.c index d245fb55bf1..a6c2c62d785 100644 --- a/src/gallium/drivers/iris/iris_resolve.c +++ b/src/gallium/drivers/iris/iris_resolve.c @@ -703,7 +703,7 @@ iris_hiz_exec(struct iris_context *ice, /* A data cache flush is not suggested by HW docs, but we found it to fix * a number of failures. */ - unsigned wa_flush = intel_device_info_is_dg2(batch->screen->devinfo) && + unsigned wa_flush = devinfo->verx10 >= 125 && res->aux.usage == ISL_AUX_USAGE_HIZ_CCS ? PIPE_CONTROL_DATA_CACHE_FLUSH : 0;