From: Dmytro Laktyushkin <[email protected]>
Change-Id: Ie33d1204597c75114f14403a671755632a163ab9
Signed-off-by: Dmytro Laktyushkin <[email protected]>
Reviewed-by: Tony Cheng <[email protected]>
Acked-by: Harry Wentland <[email protected]>
---
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 a950dd53bca4..87fd5b9c8a16 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 d7072132d456..c5a636c750fa 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.11.0
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
