aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXi Liu <[email protected]>2024-04-22 10:21:04 -0400
committerAlex Deucher <[email protected]>2024-05-08 14:56:20 -0400
commit23554c3ec85a7d7300f896e5a75bbb1e6a06f5c6 (patch)
tree004a0387e71aabcf2e8dad755d01474cd1f9b328
parentb0923d5d80facb205cc2b7f82994ab5c3eef3181 (diff)
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 <[email protected]> Acked-by: Tom Chung <[email protected]> Signed-off-by: Xi Liu <[email protected]> Tested-by: Daniel Wheeler <[email protected]> Signed-off-by: Alex Deucher <[email protected]>
-rw-r--r--drivers/gpu/drm/amd/display/dc/dml2/display_mode_core.c2
1 files changed, 1 insertions, 1 deletions
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;