From: Dillon Varone <dillon.var...@amd.com>

[WHY?]
Validation can fail for configurations that were previously supported, by only
changing parameters such as the DET allocations, which is currently unexpected.

[HOW?]
Add a check that validation passes after applying pipe split related changes.

Reviewed-by: Alvin Lee <alvin.l...@amd.com>
Acked-by: Alex Hung <alex.h...@amd.com>
Signed-off-by: Dillon Varone <dillon.var...@amd.com>
---
 drivers/gpu/drm/amd/display/dc/dml/dcn32/dcn32_fpu.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/drivers/gpu/drm/amd/display/dc/dml/dcn32/dcn32_fpu.c 
b/drivers/gpu/drm/amd/display/dc/dml/dcn32/dcn32_fpu.c
index b6cd10f3181c..9c03f62b9d19 100644
--- a/drivers/gpu/drm/amd/display/dc/dml/dcn32/dcn32_fpu.c
+++ b/drivers/gpu/drm/amd/display/dc/dml/dcn32/dcn32_fpu.c
@@ -1736,10 +1736,12 @@ bool dcn32_internal_validate_bw(struct dc *dc,
                 * ensure all the params are calculated correctly. We do not 
need to run the
                 * pipe split check again after this call (pipes are already 
split / merged).
                 * */
-               if (!fast_validate) {
-                       
context->bw_ctx.dml.soc.allow_for_pstate_or_stutter_in_vblank_final =
-                                               
dm_prefetch_support_uclk_fclk_and_stutter_if_possible;
-                       vlevel = dml_get_voltage_level(&context->bw_ctx.dml, 
pipes, pipe_cnt);
+               
context->bw_ctx.dml.soc.allow_for_pstate_or_stutter_in_vblank_final =
+                                       
dm_prefetch_support_uclk_fclk_and_stutter_if_possible;
+               vlevel = dml_get_voltage_level(&context->bw_ctx.dml, pipes, 
pipe_cnt);
+               if (vlevel == context->bw_ctx.dml.soc.num_states) {
+                       /* failed after DET size changes */
+                       goto validate_fail;
                }
        }
        *vlevel_out = vlevel;
-- 
2.38.1

Reply via email to