From fe8cd999bb4a377004dc83937c15d2eaac33866f Mon Sep 17 00:00:00 2001 From: Charlene Liu Date: Mon, 28 Aug 2017 19:33:23 -0400 Subject: [PATCH 1026/4131] drm/amd/display: not override the FMT setting set by VBIOS for eDP Change-Id: Ibc8e1803b6f3ee22ae6d27bb5b9eaff666e899a5 Signed-off-by: Charlene Liu Reviewed-by: Krunoslav Kovac Acked-by: Harry Wentland --- drivers/gpu/drm/amd/display/dc/dce110/dce110_hw_sequencer.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/amd/display/dc/dce110/dce110_hw_sequencer.c b/drivers/gpu/drm/amd/display/dc/dce110/dce110_hw_sequencer.c index 403b45e..1e3ec04 100644 --- a/drivers/gpu/drm/amd/display/dc/dce110/dce110_hw_sequencer.c +++ b/drivers/gpu/drm/amd/display/dc/dce110/dce110_hw_sequencer.c @@ -1077,11 +1077,14 @@ static enum dc_status apply_single_controller_ctx_to_hw( /*vbios crtc_source_selection and encoder_setup will override fmt_C*/ - pipe_ctx->stream_res.opp->funcs->opp_program_fmt( + if (pipe_ctx->stream->signal != SIGNAL_TYPE_EDP && + pipe_ctx->stream->signal != SIGNAL_TYPE_LVDS) { + /*for embedded panel, don't override VBIOS's setting*/ + pipe_ctx->stream_res.opp->funcs->opp_program_fmt( pipe_ctx->stream_res.opp, &stream->bit_depth_params, &stream->clamping); - + } if (dc_is_dp_signal(pipe_ctx->stream->signal)) pipe_ctx->stream_res.stream_enc->funcs->dp_set_stream_attribute( pipe_ctx->stream_res.stream_enc, -- 2.7.4