From: Charlene Liu <charlene.liu@amd.com>
Date: Mon, 28 Aug 2017 19:33:23 -0400
Subject: drm/amd/display: not override the FMT setting set by VBIOS for eDP
Git-commit: 1f0997f1555571a9c16205a851ffbce92097196d
Patch-mainline: v4.15-rc1
References: FATE#326289 FATE#326079 FATE#326049 FATE#322398 FATE#326166

Signed-off-by: Charlene Liu <charlene.liu@amd.com>
Reviewed-by: Krunoslav Kovac <Krunoslav.Kovac@amd.com>
Acked-by: Harry Wentland <Harry.Wentland@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Acked-by: Petr Tesarik <ptesarik@suse.com>
---
 drivers/gpu/drm/amd/display/dc/dce110/dce110_hw_sequencer.c |    7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

--- a/drivers/gpu/drm/amd/display/dc/dce110/dce110_hw_sequencer.c
+++ b/drivers/gpu/drm/amd/display/dc/dce110/dce110_hw_sequencer.c
@@ -1082,11 +1082,14 @@ static enum dc_status apply_single_contr
 
 
 /*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,