From: hersen wu <hersenxs.wu@amd.com>
Date: Wed, 13 Mar 2019 20:25:37 +0000 (-0400)
Subject: drm/amd/display: navi10 bring up skip dsc encoder config
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=ec8763486dd3d2fb585c2e6747520406e7dcef98;p=openwrt%2Fstaging%2Fblogic.git

drm/amd/display: navi10 bring up skip dsc encoder config

not needed for bring up.

Signed-off-by: hersen wu <hersenxs.wu@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
---

diff --git a/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_stream_encoder.c b/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_stream_encoder.c
index c3c218805eb1..130b01801a26 100644
--- a/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_stream_encoder.c
+++ b/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_stream_encoder.c
@@ -286,6 +286,14 @@ static void enc2_dp_set_dsc_config(struct stream_encoder *enc,
 					uint8_t *dsc_packed_pps)
 {
 	struct dcn10_stream_encoder *enc1 = DCN10STRENC_FROM_STRENC(enc);
+	uint32_t dsc_value = 0;
+
+	dsc_value = REG_READ(DP_DSC_CNTL);
+
+	/* dsc disable skip */
+	if ((dsc_value & 0x3) == 0x0)
+		return;
+
 
 	REG_UPDATE_2(DP_DSC_CNTL,
 			DP_DSC_MODE, dsc_mode,