From 9bcaeddf77298a32f567723359e714b61eef6479 Mon Sep 17 00:00:00 2001 From: Samuel Pitoiset Date: Tue, 27 Apr 2021 14:19:54 +0200 Subject: [PATCH] radv: enable TC-compat CMASK on GFX8-9 It's already implemented and it works quite fine on GFX10+, so it should be safe to enable it on GFX8-9. Signed-off-by: Samuel Pitoiset Reviewed-by: Bas Nieuwenhuizen Part-of: --- docs/envvars.rst | 2 -- src/amd/vulkan/radv_debug.h | 15 +++++++-------- src/amd/vulkan/radv_device.c | 2 +- src/amd/vulkan/radv_image.c | 5 ----- 4 files changed, 8 insertions(+), 16 deletions(-) diff --git a/docs/envvars.rst b/docs/envvars.rst index 2702ef3b19d..8d2da50989e 100644 --- a/docs/envvars.rst +++ b/docs/envvars.rst @@ -647,8 +647,6 @@ RADV driver environment variables enable wave32 for pixel shaders (GFX10+) ``sam`` enable optimizations to move more driver internal objects to VRAM. - ``tccompatcmask`` - enable TC-compat cmask for MSAA images ``RADV_TEX_ANISO`` force anisotropy filter (up to 16) diff --git a/src/amd/vulkan/radv_debug.h b/src/amd/vulkan/radv_debug.h index 5d55722b1dd..27b821450db 100644 --- a/src/amd/vulkan/radv_debug.h +++ b/src/amd/vulkan/radv_debug.h @@ -68,14 +68,13 @@ enum { RADV_PERFTEST_LOCAL_BOS = 1u << 0, RADV_PERFTEST_DCC_MSAA = 1u << 1, RADV_PERFTEST_BO_LIST = 1u << 2, - RADV_PERFTEST_TC_COMPAT_CMASK = 1u << 3, - RADV_PERFTEST_CS_WAVE_32 = 1u << 4, - RADV_PERFTEST_PS_WAVE_32 = 1u << 5, - RADV_PERFTEST_GE_WAVE_32 = 1u << 6, - RADV_PERFTEST_DFSM = 1u << 7, - RADV_PERFTEST_NO_SAM = 1u << 8, - RADV_PERFTEST_SAM = 1u << 9, - RADV_PERFTEST_DCC_STORES = 1u << 10, + RADV_PERFTEST_CS_WAVE_32 = 1u << 3, + RADV_PERFTEST_PS_WAVE_32 = 1u << 4, + RADV_PERFTEST_GE_WAVE_32 = 1u << 5, + RADV_PERFTEST_DFSM = 1u << 6, + RADV_PERFTEST_NO_SAM = 1u << 7, + RADV_PERFTEST_SAM = 1u << 8, + RADV_PERFTEST_DCC_STORES = 1u << 9, }; bool radv_init_trace(struct radv_device *device); diff --git a/src/amd/vulkan/radv_device.c b/src/amd/vulkan/radv_device.c index 67c775ab039..42cb586b7e5 100644 --- a/src/amd/vulkan/radv_device.c +++ b/src/amd/vulkan/radv_device.c @@ -798,7 +798,7 @@ radv_get_debug_option_name(int id) static const struct debug_control radv_perftest_options[] = { {"localbos", RADV_PERFTEST_LOCAL_BOS}, {"dccmsaa", RADV_PERFTEST_DCC_MSAA}, - {"bolist", RADV_PERFTEST_BO_LIST}, {"tccompatcmask", RADV_PERFTEST_TC_COMPAT_CMASK}, + {"bolist", RADV_PERFTEST_BO_LIST}, {"cswave32", RADV_PERFTEST_CS_WAVE_32}, {"pswave32", RADV_PERFTEST_PS_WAVE_32}, {"gewave32", RADV_PERFTEST_GE_WAVE_32}, {"dfsm", RADV_PERFTEST_DFSM}, {"nosam", RADV_PERFTEST_NO_SAM}, {"sam", RADV_PERFTEST_SAM}, diff --git a/src/amd/vulkan/radv_image.c b/src/amd/vulkan/radv_image.c index 3b67f7a75f3..4496615f0e2 100644 --- a/src/amd/vulkan/radv_image.c +++ b/src/amd/vulkan/radv_image.c @@ -336,11 +336,6 @@ radv_use_tc_compat_cmask_for_image(struct radv_device *device, struct radv_image if (device->instance->debug_flags & RADV_DEBUG_NO_TC_COMPAT_CMASK) return false; - /* TODO: Enable TC-compat CMASK on GFX8-9. */ - if (device->physical_device->rad_info.chip_class < GFX10 && - !(device->instance->perftest_flags & RADV_PERFTEST_TC_COMPAT_CMASK)) - return false; - if (image->usage & VK_IMAGE_USAGE_STORAGE_BIT) return false;