drm/amd/display: Use forced DSC bpp in DML

[Why]
DSC config is calculated separately from DML calculations.
DML should use these separately calculated DSC params. The issue is
that the calculated bpp is not properly propagated into DML.

[How]
Correctly used forced_bpp value in DML.

Reviewed-by: Alvin Lee <Alvin.Lee2@amd.com>
Acked-by: Alex Hung <alex.hung@amd.com>
Signed-off-by: George Shen <george.shen@amd.com>
Tested-by: Mark Broadworth <mark.broadworth@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/display/dc/dml/dcn32/display_mode_vba_32.c b/drivers/gpu/drm/amd/display/dc/dml/dcn32/display_mode_vba_32.c
index 5b91660a6496b410b48249f1a16d61af4991ac0e..60351b2891d07d5c457116d96f8009a059e012b1 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/dml/dcn32/display_mode_vba_32.c
+++ b/drivers/gpu/drm/amd/display/dc/dml/dcn32/display_mode_vba_32.c
@@ -1627,7 +1627,7 @@ static void mode_support_configuration(struct vba_vars_st *v,
                                && !mode_lib->vba.MSOOrODMSplitWithNonDPLink
                                && !mode_lib->vba.NotEnoughLanesForMSO
                                && mode_lib->vba.LinkCapacitySupport[i] == true && !mode_lib->vba.P2IWith420
-                               && !mode_lib->vba.DSCOnlyIfNecessaryWithBPP
+                               //&& !mode_lib->vba.DSCOnlyIfNecessaryWithBPP
                                && !mode_lib->vba.DSC422NativeNotSupported
                                && !mode_lib->vba.MPCCombineMethodIncompatible
                                && mode_lib->vba.ODMCombine2To1SupportCheckOK[i] == true

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 03924aed8d5c77bc856b4a8c0200435957b45959..8e6585dab20ef31158cd28f47378f9a805529946 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/dml/display_mode_vba.c
+++ b/drivers/gpu/drm/amd/display/dc/dml/display_mode_vba.c
@@ -625,7 +625,7 @@ static void fetch_pipe_params(struct display_mode_lib *mode_lib)
                mode_lib->vba.skip_dio_check[mode_lib->vba.NumberOfActivePlanes] =
                                dout->is_virtual;
 
-               if (!dout->dsc_enable)
+               if (dout->dsc_enable)
                        mode_lib->vba.ForcedOutputLinkBPP[mode_lib->vba.NumberOfActivePlanes] = dout->output_bpp;
                else
                        mode_lib->vba.ForcedOutputLinkBPP[mode_lib->vba.NumberOfActivePlanes] = 0.0;