1 files changed, 0 insertions, 84 deletions
diff --git a/common/recipes-kernel/linux/linux-yocto-4.14.71/0508-drm-amd-display-fix-enable_optc_clock-reg_wait-timeo.patch b/common/recipes-kernel/linux/linux-yocto-4.14.71/0508-drm-amd-display-fix-enable_optc_clock-reg_wait-timeo.patch
deleted file mode 100644
index cdbb5107..00000000
--- a/common/recipes-kernel/linux/linux-yocto-4.14.71/0508-drm-amd-display-fix-enable_optc_clock-reg_wait-timeo.patch
+++ /dev/null
@@ -1,84 +0,0 @@
-From af786fffa0245bc32fa1e3e78861b69226d9d270 Mon Sep 17 00:00:00 2001
-From: Dmytro Laktyushkin <Dmytro.Laktyushkin@amd.com>
-Date: Wed, 7 Jun 2017 15:02:34 -0400
-Subject: [PATCH 0508/4131] drm/amd/display: fix enable_optc_clock reg_wait
- timeouts
-
-Signed-off-by: Dmytro Laktyushkin <Dmytro.Laktyushkin@amd.com>
-Reviewed-by: Tony Cheng <Tony.Cheng@amd.com>
-Acked-by: Harry Wentland <Harry.Wentland@amd.com>
-Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
----
- drivers/gpu/drm/amd/display/dc/dc_helper.c                    | 8 +++++++-
- drivers/gpu/drm/amd/display/dc/dcn10/dcn10_timing_generator.c | 8 ++++----
- 2 files changed, 11 insertions(+), 5 deletions(-)
-
-diff --git a/drivers/gpu/drm/amd/display/dc/dc_helper.c b/drivers/gpu/drm/amd/display/dc/dc_helper.c
-index a950dd5..87fd5b9 100644
---- a/drivers/gpu/drm/amd/display/dc/dc_helper.c
-+++ b/drivers/gpu/drm/amd/display/dc/dc_helper.c
-@@ -135,6 +135,9 @@ uint32_t generic_reg_wait(const struct dc_context *ctx,
- 	uint32_t reg_val;
- 	int i;
- 
-+	if (ctx->dce_environment == DCE_ENV_FPGA_MAXIMUS)
-+		time_out_num_tries *= 20;
-+
- 	for (i = 0; i <= time_out_num_tries; i++) {
- 		if (i) {
- 			if (0 < delay_between_poll_us && delay_between_poll_us < 1000)
-@@ -152,7 +155,10 @@ uint32_t generic_reg_wait(const struct dc_context *ctx,
- 			return reg_val;
- 	}
- 
--	DC_ERR("REG_WAIT timeout %dus * %d tries - %s\n",
-+	dm_error("REG_WAIT timeout %dus * %d tries - %s\n",
- 			delay_between_poll_us, time_out_num_tries, func_name);
-+	if (ctx->dce_environment != DCE_ENV_FPGA_MAXIMUS)
-+		BREAK_TO_DEBUGGER();
-+
- 	return reg_val;
- }
-diff --git a/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_timing_generator.c b/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_timing_generator.c
-index d7072132..c5a636c 100644
---- a/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_timing_generator.c
-+++ b/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_timing_generator.c
-@@ -449,7 +449,7 @@ static void enable_optc_clock(struct timing_generator *tg, bool enable)
- 
- 		REG_WAIT(OPTC_INPUT_CLOCK_CONTROL,
- 				OPTC_INPUT_CLK_ON, 1,
--				20000, 200000);
-+				2000, 500);
- 
- 		/* Enable clock */
- 		REG_UPDATE(OTG_CLOCK_CONTROL,
-@@ -457,7 +457,7 @@ static void enable_optc_clock(struct timing_generator *tg, bool enable)
- 
- 		REG_WAIT(OTG_CLOCK_CONTROL,
- 				OTG_CLOCK_ON, 1,
--				20000, 200000);
-+				2000, 500);
- 	} else  {
- 		REG_UPDATE_2(OTG_CLOCK_CONTROL,
- 				OTG_CLOCK_GATE_DIS, 0,
-@@ -465,7 +465,7 @@ static void enable_optc_clock(struct timing_generator *tg, bool enable)
- 
- 		REG_WAIT(OTG_CLOCK_CONTROL,
- 				OTG_CLOCK_ON, 0,
--				20000, 200000);
-+				2000, 500);
- 
- 		REG_UPDATE_2(OPTC_INPUT_CLOCK_CONTROL,
- 				OPTC_INPUT_CLK_GATE_DIS, 0,
-@@ -473,7 +473,7 @@ static void enable_optc_clock(struct timing_generator *tg, bool enable)
- 
- 		REG_WAIT(OPTC_INPUT_CLOCK_CONTROL,
- 				OPTC_INPUT_CLK_ON, 0,
--				20000, 200000);
-+				2000, 500);
- 	}
- }
- 
--- 
-2.7.4
-