From 11fd0e1dda415e1423d41f30de12e9ec4194f05f Mon Sep 17 00:00:00 2001 From: Tatsuyuki Ishi Date: Mon, 11 Jul 2022 15:08:46 +0900 Subject: [PATCH] amd: Revert gfx10 addrlib changes MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit These broke a bunch of RADV VK CTS tests. Revert the ADDR_SW_4KB_R_X changes from the commit to get CTS passing again. Fixes: 3514b732445 ("amd: update addrlib - trivial changes") Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/6844 Reviewed-by: Marek Olšák Part-of: --- src/amd/addrlib/src/gfx10/gfx10addrlib.h | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/src/amd/addrlib/src/gfx10/gfx10addrlib.h b/src/amd/addrlib/src/gfx10/gfx10addrlib.h index 528672a1e5a..d9c0d46c561 100644 --- a/src/amd/addrlib/src/gfx10/gfx10addrlib.h +++ b/src/amd/addrlib/src/gfx10/gfx10addrlib.h @@ -80,14 +80,10 @@ const UINT_32 Gfx10LinearSwModeMask = (1u << ADDR_SW_LINEAR); const UINT_32 Gfx10Blk256BSwModeMask = (1u << ADDR_SW_256B_S) | (1u << ADDR_SW_256B_D); - -const UINT_32 Gfx10Blk4K_R_XMask = (1u << ADDR_SW_4KB_R_X); - const UINT_32 Gfx10Blk4KBSwModeMask = (1u << ADDR_SW_4KB_S) | (1u << ADDR_SW_4KB_D) | (1u << ADDR_SW_4KB_S_X) | - (1u << ADDR_SW_4KB_D_X) | - (1u << ADDR_SW_4KB_R_X); + (1u << ADDR_SW_4KB_D_X); const UINT_32 Gfx10Blk64KBSwModeMask = (1u << ADDR_SW_64KB_S) | (1u << ADDR_SW_64KB_D) | @@ -123,7 +119,6 @@ const UINT_32 Gfx10RenderSwModeMask = (1u << ADDR_SW_64KB_R_X) | const UINT_32 Gfx10XSwModeMask = (1u << ADDR_SW_4KB_S_X) | (1u << ADDR_SW_4KB_D_X) | - (1u << ADDR_SW_4KB_R_X) | (1u << ADDR_SW_64KB_Z_X) | (1u << ADDR_SW_64KB_S_X) | (1u << ADDR_SW_64KB_D_X) | @@ -151,7 +146,6 @@ const UINT_32 Gfx10Rsrc3dSwModeMask = (1u << ADDR_SW_LINEAR) | (1u << ADDR_SW_64KB_S) | (1u << ADDR_SW_64KB_S_T) | (1u << ADDR_SW_4KB_S_X) | - (1u << ADDR_SW_4KB_R_X) | (1u << ADDR_SW_64KB_Z_X) | (1u << ADDR_SW_64KB_S_X) | (1u << ADDR_SW_64KB_D_X) | @@ -173,9 +167,8 @@ const UINT_32 Gfx10Rsrc3dThick4KBSwModeMask = Gfx10Rsrc3dThickSwModeMask & Gfx10 const UINT_32 Gfx10Rsrc3dThick64KBSwModeMask = Gfx10Rsrc3dThickSwModeMask & Gfx10Blk64KBSwModeMask; -const UINT_32 Gfx10MsaaSwModeMask = (Gfx10ZSwModeMask | - Gfx10RenderSwModeMask) & - ~Gfx10Blk4K_R_XMask; +const UINT_32 Gfx10MsaaSwModeMask = Gfx10ZSwModeMask | + Gfx10RenderSwModeMask; const UINT_32 Dcn20NonBpp64SwModeMask = (1u << ADDR_SW_LINEAR) | (1u << ADDR_SW_4KB_S) |