drm/amd/display: add support for force ODM override

[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.kazlauskas@amd.com>
Acked-by: Tom Chung <chiahsuan.chung@amd.com>
Signed-off-by: Xi Liu <xi.liu@amd.com>
Tested-by: Daniel Wheeler <daniel.wheeler@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

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 3e919f5c00ca2b36e8873173048da36430ba52bb..c054c22cf3056599d066febb3c3aaa0416ad1fd3 100644 (file)
--- 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;