summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/amd/display/dc/dce100/dce100_resource.c
diff options
context:
space:
mode:
authorabdoulaye berthe <abdoulaye.berthe@amd.com>2019-07-18 15:58:25 -0400
committerAlex Deucher <alexander.deucher@amd.com>2019-10-17 16:24:56 -0400
commitf6040a439f9b6d9f90b7d4ef56762f412dfd1f9d (patch)
tree9168e1e74f552b70435d6cf3ff569c2616342d8b /drivers/gpu/drm/amd/display/dc/dce100/dce100_resource.c
parent8276dd871fd4240037cffb3904eda2dfe028fd85 (diff)
downloadlinux-stable-f6040a439f9b6d9f90b7d4ef56762f412dfd1f9d.tar.gz
linux-stable-f6040a439f9b6d9f90b7d4ef56762f412dfd1f9d.tar.bz2
linux-stable-f6040a439f9b6d9f90b7d4ef56762f412dfd1f9d.zip
drm/amd/display: configurable aux timeout support
[Description] 1-add configurable timeout support to aux engine. 2-add timeout support field to dc_caps 3-add reg_key to override extended timeout support Signed-off-by: abdoulaye berthe <abdoulaye.berthe@amd.com> Acked-by: Bhawanpreet Lakha <Bhawanpreet.Lakha@amd.com> Reviewed-by: Roman Li <Roman.Li@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers/gpu/drm/amd/display/dc/dce100/dce100_resource.c')
-rw-r--r--drivers/gpu/drm/amd/display/dc/dce100/dce100_resource.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/gpu/drm/amd/display/dc/dce100/dce100_resource.c b/drivers/gpu/drm/amd/display/dc/dce100/dce100_resource.c
index 77e31389f583..b5d6dff29c45 100644
--- a/drivers/gpu/drm/amd/display/dc/dce100/dce100_resource.c
+++ b/drivers/gpu/drm/amd/display/dc/dce100/dce100_resource.c
@@ -621,7 +621,8 @@ struct dce_aux *dce100_aux_engine_create(
SW_AUX_TIMEOUT_PERIOD_MULTIPLIER * AUX_TIMEOUT_PERIOD,
&aux_engine_regs[inst],
&aux_mask,
- &aux_shift);
+ &aux_shift,
+ ctx->dc->caps.extended_aux_timeout_support);
return &aux_engine->base;
}
@@ -1007,6 +1008,8 @@ static bool construct(
dc->caps.max_cursor_size = 128;
dc->caps.dual_link_dvi = true;
dc->caps.disable_dp_clk_share = true;
+ dc->caps.extended_aux_timeout_support = false;
+
for (i = 0; i < pool->base.pipe_count; i++) {
pool->base.timing_generators[i] =
dce100_timing_generator_create(