From 5e1fe5d0fd62b60cf0d9560fa001e03fffddf2a4 Mon Sep 17 00:00:00 2001 From: Samuel Pitoiset Date: Wed, 22 Nov 2023 17:33:39 +0100 Subject: [PATCH] radv: do not set OREO_MODE to fix rare corruption on GFX11 Ported from RadeonSI 3f108e7615213051466af4ed688e94ce6ddde065. Seems to be a recommendation from the AMD hw team. Cc: mesa-stable Signed-off-by: Samuel Pitoiset Part-of: (cherry picked from commit ad7efdea6e30c46e1b8b80672cac4f6042956df6) --- .pick_status.json | 2 +- src/amd/vulkan/radv_device.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index 2f3beb77e24..dccb8c5b411 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -244,7 +244,7 @@ "description": "radv: do not set OREO_MODE to fix rare corruption on GFX11", "nominated": true, "nomination_type": 0, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": null, "notes": null diff --git a/src/amd/vulkan/radv_device.c b/src/amd/vulkan/radv_device.c index 7ebb5308ee2..1bf900d073c 100644 --- a/src/amd/vulkan/radv_device.c +++ b/src/amd/vulkan/radv_device.c @@ -2033,8 +2033,7 @@ radv_gfx11_set_db_render_control(const struct radv_device *device, unsigned num_ max_allowed_tiles_in_wave = 15; } - *db_render_control |= - S_028000_OREO_MODE(V_028000_OMODE_O_THEN_B) | S_028000_MAX_ALLOWED_TILES_IN_WAVE(max_allowed_tiles_in_wave); + *db_render_control |= S_028000_MAX_ALLOWED_TILES_IN_WAVE(max_allowed_tiles_in_wave); } VKAPI_ATTR VkResult VKAPI_CALL