diff options
| author | Dmytro Laktyushkin <Dmytro.Laktyushkin@amd.com> | 2017-06-02 00:35:54 +0200 |
|---|---|---|
| committer | Alex Deucher <alexander.deucher@amd.com> | 2017-09-27 00:07:57 +0200 |
| commit | f0558542a72e72919dae2ac2187847ec312c2bcb (patch) | |
| tree | 52a4e9a69749f8f956297e6505fde672158f151a /drivers/gpu/drm/amd/display/dc/dc_helper.c | |
| parent | drm/amd/display: disable dcc when reset front end. (diff) | |
| download | linux-f0558542a72e72919dae2ac2187847ec312c2bcb.tar.xz linux-f0558542a72e72919dae2ac2187847ec312c2bcb.zip | |
drm/amd/display: redesign mpc
Signed-off-by: Dmytro Laktyushkin <Dmytro.Laktyushkin@amd.com>
Reviewed-by: Dmytro Laktyushkin <Dmytro.Laktyushkin@amd.com>
Acked-by: Harry Wentland <Harry.Wentland@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers/gpu/drm/amd/display/dc/dc_helper.c')
| -rw-r--r-- | drivers/gpu/drm/amd/display/dc/dc_helper.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/drivers/gpu/drm/amd/display/dc/dc_helper.c b/drivers/gpu/drm/amd/display/dc/dc_helper.c index 87fd5b9c8a16..8ed1440d2b01 100644 --- a/drivers/gpu/drm/amd/display/dc/dc_helper.c +++ b/drivers/gpu/drm/amd/display/dc/dc_helper.c @@ -135,8 +135,11 @@ 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; + if (IS_FPGA_MAXIMUS_DC(ctx->dce_environment)) { + /* 35 seconds */ + delay_between_poll_us = 35000; + time_out_num_tries = 1000; + } for (i = 0; i <= time_out_num_tries; i++) { if (i) { @@ -157,7 +160,8 @@ uint32_t generic_reg_wait(const struct dc_context *ctx, 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) + + if (!IS_FPGA_MAXIMUS_DC(ctx->dce_environment)) BREAK_TO_DEBUGGER(); return reg_val; |