drm/amd/display: Fix 3D stereo issues.
We were not providing the correct pixel clocks to DML for marks calculation. Signed-off-by: Charlene Liu <charlene.liu@amd.com> Reviewed-by: Dmytro Laktyushkin <Dmytro.Laktyushkin@amd.com> Acked-by: Leo Li <sunpeng.li@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
This commit is contained in:
parent
0957dc7097
commit
d77f778e59
|
@ -2881,6 +2881,7 @@ static void populate_initial_data(
|
|||
|
||||
/* Pipes without underlay after */
|
||||
for (i = 0; i < pipe_count; i++) {
|
||||
unsigned int pixel_clock_khz;
|
||||
if (!pipe[i].stream || pipe[i].bottom_pipe)
|
||||
continue;
|
||||
|
||||
|
@ -2889,7 +2890,10 @@ static void populate_initial_data(
|
|||
data->lpt_en[num_displays + 4] = false;
|
||||
data->h_total[num_displays + 4] = bw_int_to_fixed(pipe[i].stream->timing.h_total);
|
||||
data->v_total[num_displays + 4] = bw_int_to_fixed(pipe[i].stream->timing.v_total);
|
||||
data->pixel_rate[num_displays + 4] = bw_frc_to_fixed(pipe[i].stream->timing.pix_clk_khz, 1000);
|
||||
pixel_clock_khz = pipe[i].stream->timing.pix_clk_khz;
|
||||
if (pipe[i].stream->timing.timing_3d_format == TIMING_3D_FORMAT_HW_FRAME_PACKING)
|
||||
pixel_clock_khz *= 2;
|
||||
data->pixel_rate[num_displays + 4] = bw_frc_to_fixed(pixel_clock_khz, 1000);
|
||||
if (pipe[i].plane_state) {
|
||||
data->src_width[num_displays + 4] = bw_int_to_fixed(pipe[i].plane_res.scl_data.viewport.width);
|
||||
data->pitch_in_pixels[num_displays + 4] = data->src_width[num_displays + 4];
|
||||
|
|
|
@ -852,8 +852,9 @@ bool dcn_validate_bandwidth(
|
|||
v->v_sync_plus_back_porch[input_idx] = pipe->stream->timing.v_total
|
||||
- v->vactive[input_idx]
|
||||
- pipe->stream->timing.v_front_porch;
|
||||
v->pixel_clock[input_idx] = pipe->stream->timing.pix_clk_khz / 1000.0f;
|
||||
|
||||
v->pixel_clock[input_idx] = pipe->stream->timing.pix_clk_khz/1000.0;
|
||||
if (pipe->stream->timing.timing_3d_format == TIMING_3D_FORMAT_HW_FRAME_PACKING)
|
||||
v->pixel_clock[input_idx] *= 2;
|
||||
if (!pipe->plane_state) {
|
||||
v->dcc_enable[input_idx] = dcn_bw_yes;
|
||||
v->source_pixel_format[input_idx] = dcn_bw_rgb_sub_32;
|
||||
|
|
|
@ -363,6 +363,9 @@ bool resource_are_streams_timing_synchronizable(
|
|||
|| !dc_is_dp_signal(stream2->signal)))
|
||||
return false;
|
||||
|
||||
if (stream1->view_format != stream2->view_format)
|
||||
return false;
|
||||
|
||||
return true;
|
||||
}
|
||||
static bool is_dp_and_hdmi_sharable(
|
||||
|
@ -373,7 +376,7 @@ static bool is_dp_and_hdmi_sharable(
|
|||
return false;
|
||||
|
||||
if (stream1->clamping.c_depth != COLOR_DEPTH_888 ||
|
||||
stream2->clamping.c_depth != COLOR_DEPTH_888)
|
||||
stream2->clamping.c_depth != COLOR_DEPTH_888)
|
||||
return false;
|
||||
|
||||
return true;
|
||||
|
|
|
@ -798,6 +798,9 @@ static void get_pixel_clock_parameters(
|
|||
if (stream->timing.pixel_encoding == PIXEL_ENCODING_YCBCR420) {
|
||||
pixel_clk_params->requested_pix_clk = pixel_clk_params->requested_pix_clk / 2;
|
||||
}
|
||||
if (stream->timing.timing_3d_format == TIMING_3D_FORMAT_HW_FRAME_PACKING)
|
||||
pixel_clk_params->requested_pix_clk *= 2;
|
||||
|
||||
}
|
||||
|
||||
void dce110_resource_build_pipe_hw_param(struct pipe_ctx *pipe_ctx)
|
||||
|
|
|
@ -980,6 +980,8 @@ static void get_pixel_clock_parameters(
|
|||
|
||||
if (stream->timing.pixel_encoding == PIXEL_ENCODING_YCBCR420)
|
||||
pixel_clk_params->requested_pix_clk /= 2;
|
||||
if (stream->timing.timing_3d_format == TIMING_3D_FORMAT_HW_FRAME_PACKING)
|
||||
pixel_clk_params->requested_pix_clk *= 2;
|
||||
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue