diff --git a/src/amd/common/ac_exp_param.h b/src/amd/common/ac_exp_param.h
index ac8018c0b39..ce7a0cc9f1e 100644
--- a/src/amd/common/ac_exp_param.h
+++ b/src/amd/common/ac_exp_param.h
@@ -35,7 +35,7 @@ enum
    AC_EXP_PARAM_DEFAULT_VAL_0001,
    AC_EXP_PARAM_DEFAULT_VAL_1110,
    AC_EXP_PARAM_DEFAULT_VAL_1111,
-   AC_EXP_PARAM_UNDEFINED = 255,
+   AC_EXP_PARAM_UNDEFINED = 255, /* deprecated, use AC_EXP_PARAM_DEFAULT_VAL_0000 instead */
 };
 
 #endif
diff --git a/src/gallium/drivers/radeonsi/si_shader.c b/src/gallium/drivers/radeonsi/si_shader.c
index 2c70d2bef07..e236eaaf7fc 100644
--- a/src/gallium/drivers/radeonsi/si_shader.c
+++ b/src/gallium/drivers/radeonsi/si_shader.c
@@ -1447,7 +1447,7 @@ bool si_compile_shader(struct si_screen *sscreen, struct ac_llvm_compiler *compi
       si_dump_streamout(&sel->so);
    }
 
-   memset(shader->info.vs_output_param_offset, AC_EXP_PARAM_UNDEFINED,
+   memset(shader->info.vs_output_param_offset, AC_EXP_PARAM_DEFAULT_VAL_0000,
           sizeof(shader->info.vs_output_param_offset));
 
    shader->info.uses_instanceid = sel->info.uses_instanceid;
diff --git a/src/gallium/drivers/radeonsi/si_state_shaders.c b/src/gallium/drivers/radeonsi/si_state_shaders.c
index d0f2f834c7e..d6b92e175a0 100644
--- a/src/gallium/drivers/radeonsi/si_state_shaders.c
+++ b/src/gallium/drivers/radeonsi/si_state_shaders.c
@@ -3358,15 +3358,10 @@ static unsigned si_get_ps_input_cntl(struct si_context *sctx, struct si_shader *
          /* The input is loaded from parameter memory. */
          ps_input_cntl |= S_028644_OFFSET(offset);
       } else if (!G_028644_PT_SPRITE_TEX(ps_input_cntl)) {
-         if (offset == AC_EXP_PARAM_UNDEFINED) {
-            /* This can happen with depth-only rendering. */
-            offset = 0;
-         } else {
-            /* The input is a DEFAULT_VAL constant. */
-            assert(offset >= AC_EXP_PARAM_DEFAULT_VAL_0000 &&
-                   offset <= AC_EXP_PARAM_DEFAULT_VAL_1111);
-            offset -= AC_EXP_PARAM_DEFAULT_VAL_0000;
-         }
+         /* The input is a DEFAULT_VAL constant. */
+         assert(offset >= AC_EXP_PARAM_DEFAULT_VAL_0000 &&
+                offset <= AC_EXP_PARAM_DEFAULT_VAL_1111);
+         offset -= AC_EXP_PARAM_DEFAULT_VAL_0000;
 
          ps_input_cntl = S_028644_OFFSET(0x20) | S_028644_DEFAULT_VAL(offset);
       }