From 5fb78600ec1504d30a7af7b0fdf2f2e6870ddea7 Mon Sep 17 00:00:00 2001 From: Alvin Lee Date: Tue, 6 Sep 2022 19:25:13 -0400 Subject: drm/amd/display: Uncomment SubVP pipe split assignment in driver [Why & How] Uncomment SubVP pipe split assignment in driver since FW headers are now promoted Reviewed-by: Martin Leung Acked-by: Wayne Lin Signed-off-by: Alvin Lee Tested-by: Daniel Wheeler Signed-off-by: Alex Deucher --- drivers/gpu/drm/amd/display/dc/dc_dmub_srv.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/drivers/gpu/drm/amd/display/dc/dc_dmub_srv.c b/drivers/gpu/drm/amd/display/dc/dc_dmub_srv.c index f09a3ddcf30d..89d7d3fd3321 100644 --- a/drivers/gpu/drm/amd/display/dc/dc_dmub_srv.c +++ b/drivers/gpu/drm/amd/display/dc/dc_dmub_srv.c @@ -675,7 +675,6 @@ static void populate_subvp_cmd_pipe_info(struct dc *dc, div64_u64(((uint64_t)(dc->caps.subvp_fw_processing_delay_us) * ((uint64_t)phantom_timing->pix_clk_100hz * 100) + ((uint64_t)phantom_timing->h_total * 1000000 - 1)), ((uint64_t)phantom_timing->h_total * 1000000)); - /* TODO: Uncomment once FW headers are promoted if (subvp_pipe->bottom_pipe) { pipe_data->pipe_config.subvp_data.main_split_pipe_index = subvp_pipe->bottom_pipe->pipe_idx; } else if (subvp_pipe->next_odm_pipe) { @@ -683,7 +682,6 @@ static void populate_subvp_cmd_pipe_info(struct dc *dc, } else { pipe_data->pipe_config.subvp_data.main_split_pipe_index = 0; } - */ // Find phantom pipe index based on phantom stream for (j = 0; j < dc->res_pool->pipe_count; j++) { @@ -691,7 +689,6 @@ static void populate_subvp_cmd_pipe_info(struct dc *dc, if (phantom_pipe->stream == subvp_pipe->stream->mall_stream_config.paired_stream) { pipe_data->pipe_config.subvp_data.phantom_pipe_index = phantom_pipe->pipe_idx; - /* TODO: Uncomment once FW headers are promoted if (phantom_pipe->bottom_pipe) { pipe_data->pipe_config.subvp_data.phantom_split_pipe_index = phantom_pipe->bottom_pipe->pipe_idx; } else if (phantom_pipe->next_odm_pipe) { @@ -699,7 +696,6 @@ static void populate_subvp_cmd_pipe_info(struct dc *dc, } else { pipe_data->pipe_config.subvp_data.phantom_split_pipe_index = 0; } - */ break; } } -- cgit v1.2.3