summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/amd/display
diff options
context:
space:
mode:
authorBrendan Steve Leder <brendanSteve.Leder@amd.com>2021-01-07 15:17:29 -0500
committerAlex Deucher <alexander.deucher@amd.com>2021-02-02 12:08:31 -0500
commit91501d0affc2e34598e6514990614ed741de567b (patch)
treec744a40a787fb253dd876f24fbe82da6b9b4458f /drivers/gpu/drm/amd/display
parenta71c76ac7eea41cc45c2582f3dcf465e4ce2bca3 (diff)
downloadlinux-stable-91501d0affc2e34598e6514990614ed741de567b.tar.gz
linux-stable-91501d0affc2e34598e6514990614ed741de567b.tar.bz2
linux-stable-91501d0affc2e34598e6514990614ed741de567b.zip
drm/amd/display: initialize i2c speed if not initialized in dcnxxx__resource.c
Some dcnxxx__resource.c do not initialize the i2c speed; this patch adds the required initialization at dc_construct(). Signed-off-by: Brendan Steve Leder <brendanSteve.Leder@amd.com> Reviewed-by: Charlene Liu <Charlene.Liu@amd.com> Acked-by: Anson Jacob <Anson.Jacob@amd.com> Tested-by: Daniel Wheeler <daniel.wheeler@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers/gpu/drm/amd/display')
-rw-r--r--drivers/gpu/drm/amd/display/dc/core/dc.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/gpu/drm/amd/display/dc/core/dc.c b/drivers/gpu/drm/amd/display/dc/core/dc.c
index 2bb0ec6a86b8..8fa179cbed32 100644
--- a/drivers/gpu/drm/amd/display/dc/core/dc.c
+++ b/drivers/gpu/drm/amd/display/dc/core/dc.c
@@ -761,6 +761,10 @@ static bool dc_construct(struct dc *dc,
if (!dc->res_pool)
goto fail;
+ /* set i2c speed if not done by the respective dcnxxx__resource.c */
+ if (dc->caps.i2c_speed_in_khz_hdcp == 0)
+ dc->caps.i2c_speed_in_khz_hdcp = dc->caps.i2c_speed_in_khz;
+
dc->clk_mgr = dc_clk_mgr_create(dc->ctx, dc->res_pool->pp_smu, dc->res_pool->dccg);
if (!dc->clk_mgr)
goto fail;