mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-10-02 23:27:06 +00:00
Code Issues Releases Wiki Activity

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

Browse source 
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>
This commit is contained in:
Taimur Hassan 2023-08-16 17:13:10 -04:00 committed by Alex Deucher
parent 21eeb05114
commit 9158920cc8
3 changed files with 19 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
drivers/gpu/drm/amd/display/dc/dml2/dml2_dc_resource_mgmt.c
View file

@ -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

17
drivers/gpu/drm/amd/display/dc/dml2/dml2_utils.c
View file

@ -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;
}

1
drivers/gpu/drm/amd/display/dc/dml2/dml2_utils.h
View file

@ -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