aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/amd/display/dc/core
diff options
context:
space:
mode:
authorDillon Varone <Dillon.Varone@amd.com>2022-09-27 12:35:10 -0400
committerAlex Deucher <alexander.deucher@amd.com>2022-10-10 17:12:19 -0400
commit99243fd1f3ca40d487209ac76241de0478962a9d (patch)
treef292c2328c43266ed68f044a51cfbe229ebc9c3d /drivers/gpu/drm/amd/display/dc/core
parentdrm/amd/display: Update PMFW z-state interface for DCN314 (diff)
downloadlinux-dev-99243fd1f3ca40d487209ac76241de0478962a9d.tar.xz
linux-dev-99243fd1f3ca40d487209ac76241de0478962a9d.zip
Revert "drm/amd/display: skip commit minimal transition state"
This reverts commit e4e481e4d838f30985dd46d43ed195110ed265f5. [Why & How] The reverted commit creates memory leak and causes issue upon driver install. Tested-by: Daniel Wheeler <daniel.wheeler@amd.com> Reviewed-by: Martin Leung <Martin.Leung@amd.com> Acked-by: Qingqing Zhuo <qingqing.zhuo@amd.com> Signed-off-by: Dillon Varone <Dillon.Varone@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers/gpu/drm/amd/display/dc/core')
-rw-r--r--drivers/gpu/drm/amd/display/dc/core/dc.c20
1 files changed, 0 insertions, 20 deletions
diff --git a/drivers/gpu/drm/amd/display/dc/core/dc.c b/drivers/gpu/drm/amd/display/dc/core/dc.c
index 40a34b600c8e..b5058a2ce7e8 100644
--- a/drivers/gpu/drm/amd/display/dc/core/dc.c
+++ b/drivers/gpu/drm/amd/display/dc/core/dc.c
@@ -3650,30 +3650,10 @@ static bool commit_minimal_transition_state(struct dc *dc,
bool temp_subvp_policy;
enum dc_status ret = DC_ERROR_UNEXPECTED;
unsigned int i, j;
- unsigned int pipe_in_use = 0;
if (!transition_context)
return false;
- /* check current pipes in use*/
- for (i = 0; i < dc->res_pool->pipe_count; i++) {
- struct pipe_ctx *pipe = &transition_base_context->res_ctx.pipe_ctx[i];
-
- if (pipe->plane_state)
- pipe_in_use++;
- }
-
- /* When the OS add a new surface if we have been used all of pipes with odm combine
- * and mpc split feature, it need use commit_minimal_transition_state to transition safely.
- * After OS exit MPO, it will back to use odm and mpc split with all of pipes, we need
- * call it again. Otherwise return true to skip.
- *
- * Reduce the scenarios to use dc_commit_state_no_check in the stage of flip. Especially
- * enter/exit MPO when DCN still have enough resources.
- */
- if (pipe_in_use != dc->res_pool->pipe_count)
- return true;
-
if (!dc->config.is_vmin_only_asic) {
tmp_mpc_policy = dc->debug.pipe_split_policy;
dc->debug.pipe_split_policy = MPC_SPLIT_AVOID;