diff --git a/docs/envvars.rst b/docs/envvars.rst
index aa6828ef8c2..85e3836ac24 100644
--- a/docs/envvars.rst
+++ b/docs/envvars.rst
@@ -1365,8 +1365,7 @@ 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,
-      VEGA10, and GFX10-GFX11)
+      enable experimental implementation of VK_EXT_shader_object
    ``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 0e4ccb8b078..8bbf0d7e5d2 100644
--- a/src/amd/vulkan/radv_physical_device.c
+++ b/src/amd/vulkan/radv_physical_device.c
@@ -98,9 +98,7 @@ radv_calibrated_timestamps_enabled(const struct radv_physical_device *pdevice)
 static bool
 radv_shader_object_enabled(const struct radv_physical_device *pdevice)
 {
-   /* 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;
+   return !pdevice->use_llvm && pdevice->instance->perftest_flags & RADV_PERFTEST_SHADER_OBJECT;
 }
 
 bool