From bead3f2ec3d208bfc525598a2629b26c84b75cbd Mon Sep 17 00:00:00 2001 From: Samuel Pitoiset Date: Fri, 2 Feb 2024 12:59:35 +0100 Subject: [PATCH] radv: allow RADV_PERFTEST=shader_object on GFX9/VEGA10 It's passing VKCTS on VEGA10 but for some reasons RENOIR currently hangs. Signed-off-by: Samuel Pitoiset Part-of: --- docs/envvars.rst | 3 ++- src/amd/vulkan/radv_physical_device.c | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/docs/envvars.rst b/docs/envvars.rst index 2c64a0ec2ac..bfebe25eb22 100644 --- a/docs/envvars.rst +++ b/docs/envvars.rst @@ -1363,7 +1363,8 @@ RADV driver environment variables ``sam`` enable optimizations to move more driver internal objects to VRAM. ``shader_object`` - enable experimental implementation of VK_EXT_shader_object (GFX6-8) + enable experimental implementation of VK_EXT_shader_object (GFX6-8 and + VEGA10) ``transfer_queue`` enable experimental transfer queue support (GFX9+, not yet spec compliant) ``video_decode`` diff --git a/src/amd/vulkan/radv_physical_device.c b/src/amd/vulkan/radv_physical_device.c index 283b88e8081..2078a070597 100644 --- a/src/amd/vulkan/radv_physical_device.c +++ b/src/amd/vulkan/radv_physical_device.c @@ -98,7 +98,8 @@ radv_calibrated_timestamps_enabled(const struct radv_physical_device *pdevice) static bool radv_shader_object_enabled(const struct radv_physical_device *pdevice) { - return pdevice->rad_info.gfx_level < GFX9 && !pdevice->use_llvm && + /* FIXME: Fix GPU hangs on Renoir. */ + return (pdevice->rad_info.gfx_level < GFX9 || pdevice->rad_info.family == CHIP_VEGA10) && !pdevice->use_llvm && pdevice->instance->perftest_flags & RADV_PERFTEST_SHADER_OBJECT; }