diff --git a/src/amd/vulkan/radv_image.c b/src/amd/vulkan/radv_image.c
index 3ebde7e5cc3..4d2c5cce6ef 100644
--- a/src/amd/vulkan/radv_image.c
+++ b/src/amd/vulkan/radv_image.c
@@ -263,13 +263,15 @@ static bool
 radv_use_tc_compat_cmask_for_image(struct radv_device *device,
 				   struct radv_image *image)
 {
-	if (!(device->instance->perftest_flags & RADV_PERFTEST_TC_COMPAT_CMASK))
-		return false;
-
 	/* TC-compat CMASK is only available for GFX8+. */
 	if (device->physical_device->rad_info.chip_class < GFX8)
 		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;