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

[Why?]
HSplit should not affect DSC slice count. Can cause improper timings to
be applied for certain modes.

[How?]
No longer change DSC Slice count based on HSplit.

Signed-off-by: Dillon Varone <dillon.var...@amd.com>
Reviewed-by: Dmytro Laktyushkin <dmytro.laktyush...@amd.com>
Acked-by: Rodrigo Siqueira <rodrigo.sique...@amd.com>
---
 drivers/gpu/drm/amd/display/dc/dml/dcn30/display_mode_vba_30.c | 2 +-
 drivers/gpu/drm/amd/display/dc/dml/display_mode_vba.c          | 3 ---
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/drivers/gpu/drm/amd/display/dc/dml/dcn30/display_mode_vba_30.c 
b/drivers/gpu/drm/amd/display/dc/dml/dcn30/display_mode_vba_30.c
index bc07082c1357..cb3f70a71b51 100644
--- a/drivers/gpu/drm/amd/display/dc/dml/dcn30/display_mode_vba_30.c
+++ b/drivers/gpu/drm/amd/display/dc/dml/dcn30/display_mode_vba_30.c
@@ -4050,7 +4050,7 @@ void dml30_ModeSupportAndSystemConfigurationFull(struct 
display_mode_lib *mode_l
                                        
v->RequiredDPPCLK[i][j][NumberOfNonSplitPlaneOfMaximumBandwidth] = 
v->MinDPPCLKUsingSingleDPP[NumberOfNonSplitPlaneOfMaximumBandwidth]
                                                        * (1 + 
v->DISPCLKDPPCLKDSCCLKDownSpreading / 100) / 2;
                                        v->TotalNumberOfActiveDPP[i][j] = 
v->TotalNumberOfActiveDPP[i][j] + 1;
-                                       v->TotalNumberOfSingleDPPPlanes[i][j] = 
v->TotalNumberOfSingleDPPPlanes[i][j] + 1;
+                                       v->TotalNumberOfSingleDPPPlanes[i][j] = 
v->TotalNumberOfSingleDPPPlanes[i][j] - 1;
                                }
                        }
                        if (v->TotalNumberOfActiveDPP[i][j] > v->MaxNumDPP) {
diff --git a/drivers/gpu/drm/amd/display/dc/dml/display_mode_vba.c 
b/drivers/gpu/drm/amd/display/dc/dml/display_mode_vba.c
index bc0485a59018..94036a9612cf 100644
--- a/drivers/gpu/drm/amd/display/dc/dml/display_mode_vba.c
+++ b/drivers/gpu/drm/amd/display/dc/dml/display_mode_vba.c
@@ -599,7 +599,6 @@ static void fetch_pipe_params(struct display_mode_lib 
*mode_lib)
                        for (k = j + 1; k < mode_lib->vba.cache_num_pipes; ++k) 
{
                                display_pipe_source_params_st *src_k = 
&pipes[k].pipe.src;
                                display_pipe_dest_params_st *dst_k = 
&pipes[k].pipe.dest;
-                               display_output_params_st *dout_k = 
&pipes[j].dout;
 
                                if (src_k->is_hsplit && !visited[k]
                                                && src->hsplit_grp == 
src_k->hsplit_grp) {
@@ -620,8 +619,6 @@ static void fetch_pipe_params(struct display_mode_lib 
*mode_lib)
                                                
mode_lib->vba.ViewportHeightChroma[mode_lib->vba.NumberOfActivePlanes] +=
                                                                
src_k->viewport_height_c;
                                        }
-                                       
mode_lib->vba.NumberOfDSCSlices[mode_lib->vba.NumberOfActivePlanes] +=
-                                                       dout_k->dsc_slices;
 
                                        visited[k] = true;
                                }
-- 
2.25.1

_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

Reply via email to