drm/amd/display: Move stereo timing check to helper

Rework dml2_map_dc_pipes to keep the logic clean.

Reviewed-by: Chaitanya Dhere <chaitanya.dhere@amd.com>
Acked-by: Qingqing Zhuo <qingqing.zhuo@amd.com>
Signed-off-by: Qingqing Zhuo <Qingqing.Zhuo@amd.com>
Signed-off-by: Taimur Hassan <syed.hassan@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/display/dc/dml2/dml2_dc_resource_mgmt.c b/drivers/gpu/drm/amd/display/dc/dml2/dml2_dc_resource_mgmt.c
index 116b78a5107cbca4110f6c0e1ba11fb33155cbc2..e22b5106df8fba4e797dc3bc1a6e2c9dcf22e70c 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/dml2/dml2_dc_resource_mgmt.c
+++ b/drivers/gpu/drm/amd/display/dc/dml2/dml2_dc_resource_mgmt.c
@@ -710,14 +710,7 @@ bool dml2_map_dc_pipes(struct dml2_context *ctx, struct dc_state *state, const s
                                        scratch.mpc_info.mpc_factor = DPPPerSurface[plane_disp_cfg_index];
 
                                        //For stereo timings, we need to pipe split
-                                       if ((state->streams[stream_index]->view_format ==
-                                                       VIEW_3D_FORMAT_SIDE_BY_SIDE ||
-                                                       state->streams[stream_index]->view_format ==
-                                                       VIEW_3D_FORMAT_TOP_AND_BOTTOM) &&
-                                                       (state->streams[stream_index]->timing.timing_3d_format ==
-                                                       TIMING_3D_FORMAT_TOP_AND_BOTTOM ||
-                                                       state->streams[stream_index]->timing.timing_3d_format ==
-                                                       TIMING_3D_FORMAT_SIDE_BY_SIDE))
+                                       if (dml2_is_stereo_timing(state->streams[stream_index]))
                                                scratch.mpc_info.mpc_factor = 2;
                                } else {
                                        // If ODM combine is enabled, then we use at most 1 pipe per

diff --git a/drivers/gpu/drm/amd/display/dc/dml2/dml2_utils.c b/drivers/gpu/drm/amd/display/dc/dml2/dml2_utils.c
index 4c3661fbecbcf995014d153c5a0314e5a8abd4b9..ac6bf776bad03d638accefa3c2819510bded151a 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/dml2/dml2_utils.c
+++ b/drivers/gpu/drm/amd/display/dc/dml2/dml2_utils.c
@@ -461,3 +461,20 @@ bool dml2_verify_det_buffer_configuration(struct dml2_context *in_ctx, struct dc
 
        return need_recalculation;
 }
+
+bool dml2_is_stereo_timing(struct dc_stream_state *stream)
+{
+       bool is_stereo = false;
+
+       if ((stream->view_format ==
+                       VIEW_3D_FORMAT_SIDE_BY_SIDE ||
+                       stream->view_format ==
+                       VIEW_3D_FORMAT_TOP_AND_BOTTOM) &&
+                       (stream->timing.timing_3d_format ==
+                       TIMING_3D_FORMAT_TOP_AND_BOTTOM ||
+                       stream->timing.timing_3d_format ==
+                       TIMING_3D_FORMAT_SIDE_BY_SIDE))
+               is_stereo = true;
+
+       return is_stereo;
+}

diff --git a/drivers/gpu/drm/amd/display/dc/dml2/dml2_utils.h b/drivers/gpu/drm/amd/display/dc/dml2/dml2_utils.h
index 342d64039f9a4c7c93a0940251ca0cc08f63ee01..23b9028337d43e89dd5f2acf545a35b8a8ea9809 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/dml2/dml2_utils.h
+++ b/drivers/gpu/drm/amd/display/dc/dml2/dml2_utils.h
@@ -42,6 +42,7 @@ void dml2_copy_clocks_to_dc_state(struct dml2_dcn_clocks *out_clks, struct dc_st
 void dml2_extract_watermark_set(struct dcn_watermarks *watermark, struct display_mode_lib_st *dml_core_ctx);
 int dml2_helper_find_dml_pipe_idx_by_stream_id(struct dml2_context *ctx, unsigned int stream_id);
 bool is_dtbclk_required(const struct dc *dc, struct dc_state *context);
+bool dml2_is_stereo_timing(struct dc_stream_state *stream);
 
 /*
  * dml2_dc_construct_pipes - This function will determine if we need additional pipes based