drm/amd/display: always use mpc factor of 2 for stereo timings

[why]
In the new pipe resource management logic, the special handling for
stereo timings is missing.
This commit implements the same stereo timings handling as old
pipe resource management code.

Reviewed-by: Chaitanya Dhere <chaitanya.dhere@amd.com>
Acked-by: Hamza Mahfooz <hamza.mahfooz@amd.com>
Signed-off-by: Wenjing Liu <wenjing.liu@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 1a2b24cc6b61d5ebaa621a0c3656066bdb7c8f25..0baf39d64a2d4f33ab30f35e63502fd6ba8c569e 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
@@ -772,18 +772,29 @@ static unsigned int get_mpc_factor(struct dml2_context *ctx,
                const struct dc_state *state,
                const struct dml_display_cfg_st *disp_cfg,
                struct dml2_dml_to_dc_pipe_mapping *mapping,
-               const struct dc_stream_status *status, unsigned int stream_id,
+               const struct dc_stream_status *status,
+               const struct dc_stream_state *stream,
                int plane_idx)
 {
        unsigned int plane_id;
        unsigned int cfg_idx;
+       unsigned int mpc_factor;
 
-       get_plane_id(ctx, state, status->plane_states[plane_idx], stream_id, plane_idx, &plane_id);
+       get_plane_id(ctx, state, status->plane_states[plane_idx],
+                       stream->stream_id, plane_idx, &plane_id);
        cfg_idx = find_disp_cfg_idx_by_plane_id(mapping, plane_id);
-       if (ctx->architecture == dml2_architecture_20)
-               return (unsigned int)disp_cfg->hw.DPPPerSurface[cfg_idx];
-       ASSERT(false);
-       return 1;
+       if (ctx->architecture == dml2_architecture_20) {
+               mpc_factor = (unsigned int)disp_cfg->hw.DPPPerSurface[cfg_idx];
+       } else {
+               mpc_factor = 1;
+               ASSERT(false);
+       }
+
+       /* For stereo timings, we need to pipe split */
+       if (dml2_is_stereo_timing(stream))
+               mpc_factor = 2;
+
+       return mpc_factor;
 }
 
 static unsigned int get_odm_factor(
@@ -820,14 +831,13 @@ static void populate_mpc_factors_for_stream(
                unsigned int mpc_factors[MAX_PIPES])
 {
        const struct dc_stream_status *status = &state->stream_status[stream_idx];
-       unsigned int stream_id = state->streams[stream_idx]->stream_id;
        int i;
 
        for (i = 0; i < status->plane_count; i++)
                if (odm_factor == 1)
                        mpc_factors[i] = get_mpc_factor(
                                        ctx, state, disp_cfg, mapping, status,
-                                       stream_id, i);
+                                       state->streams[stream_idx], i);
                else
                        mpc_factors[i] = 1;
 }

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 2498b8341199bac8ef76c51cace4028450594f9e..33eab80e89a84bd09322179d382ee6ebe1bfae9e 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/dml2/dml2_utils.c
+++ b/drivers/gpu/drm/amd/display/dc/dml2/dml2_utils.c
@@ -468,7 +468,7 @@ 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 dml2_is_stereo_timing(const struct dc_stream_state *stream)
 {
        bool is_stereo = false;
 

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 23b9028337d43e89dd5f2acf545a35b8a8ea9809..5842d6d3c4b601ca8decae333ef213afc1c9a9da 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,7 +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);
+bool dml2_is_stereo_timing(const struct dc_stream_state *stream);
 
 /*
  * dml2_dc_construct_pipes - This function will determine if we need additional pipes based