diff --git a/src/amd/common/ac_shader_util.c b/src/amd/common/ac_shader_util.c
index 7eef6a7300c..bdfa23fc1c3 100644
--- a/src/amd/common/ac_shader_util.c
+++ b/src/amd/common/ac_shader_util.c
@@ -104,6 +104,7 @@ void ac_set_nir_options(struct radeon_info *info, bool use_llvm,
                          nir_io_mix_convergent_flat_with_interpolated |
                          nir_io_vectorizer_ignores_types |
                          nir_io_compaction_rotates_color_channels;
+   options->lower_layer_fs_input_to_sysval = true;
    options->scalarize_ddx = true;
    options->skip_lower_packing_ops =
       BITFIELD_BIT(nir_lower_packing_op_unpack_64_2x32) |
diff --git a/src/amd/vulkan/radv_shader.c b/src/amd/vulkan/radv_shader.c
index 205b8f7f81e..c4f16236286 100644
--- a/src/amd/vulkan/radv_shader.c
+++ b/src/amd/vulkan/radv_shader.c
@@ -65,7 +65,6 @@ get_nir_options_for_stage(struct radv_physical_device *pdev, gl_shader_stage sta
    options->lower_doubles_options = nir_lower_drcp | nir_lower_dsqrt | nir_lower_drsq | nir_lower_ddiv;
    options->io_options |= nir_io_mediump_is_32bit;
    options->varying_expression_max_cost = ac_nir_varying_expression_max_cost;
-   options->lower_layer_fs_input_to_sysval = true;
 }
 
 void
diff --git a/src/gallium/drivers/radeonsi/si_get.c b/src/gallium/drivers/radeonsi/si_get.c
index 936d691ecd6..e69311ff107 100644
--- a/src/gallium/drivers/radeonsi/si_get.c
+++ b/src/gallium/drivers/radeonsi/si_get.c
@@ -1574,7 +1574,6 @@ void si_init_screen_get_functions(struct si_screen *sscreen)
    options->fuse_ffma32 = use_fma32;
    options->fuse_ffma64 = true;
    options->lower_uniforms_to_ubo = true;
-   options->lower_layer_fs_input_to_sysval = true;
    options->lower_to_scalar = true;
    options->lower_to_scalar_filter =
       sscreen->info.has_packed_math_16bit ? si_alu_to_scalar_packed_math_filter : NULL;