[PATCH 02/45] drm/amd/display: add support for force ODM override

[Tom Chung]

From: Xi Liu <xi....@amd.com>

[Why and how]

Current 420 ODM combine will override debug settings.
Add support if debug settings is set for 420 ODM combine.

Reviewed-by: Nicholas Kazlauskas <nicholas.kazlaus...@amd.com>
Acked-by: Tom Chung <chiahsuan.ch...@amd.com>
Signed-off-by: Xi Liu <xi....@amd.com>
---
 drivers/gpu/drm/amd/display/dc/dml2/display_mode_core.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/amd/display/dc/dml2/display_mode_core.c 
b/drivers/gpu/drm/amd/display/dc/dml2/display_mode_core.c
index 3e919f5c00ca..c054c22cf305 100644
--- a/drivers/gpu/drm/amd/display/dc/dml2/display_mode_core.c
+++ b/drivers/gpu/drm/amd/display/dc/dml2/display_mode_core.c
@@ -5538,7 +5538,7 @@ static void CalculateODMMode(
                        *TotalAvailablePipesSupport = false;
                else if (HActive > 2 * DML2_MAX_FMT_420_BUFFER_WIDTH)
                        ODMUse = dml_odm_use_policy_combine_4to1;
-               else if (HActive > DML2_MAX_FMT_420_BUFFER_WIDTH)
+               else if (HActive > DML2_MAX_FMT_420_BUFFER_WIDTH && ODMUse != 
dml_odm_use_policy_combine_4to1)
                        ODMUse = dml_odm_use_policy_combine_2to1;
                if (Output == dml_hdmi && ODMUse == 
dml_odm_use_policy_combine_2to1)
                        *TotalAvailablePipesSupport = false;
-- 
2.34.1