drm/amd/display: initialize i2c speed if not initialized in dcnxxx__resource.c
authorBrendan Steve Leder <brendanSteve.Leder@amd.com>
Thu, 7 Jan 2021 20:17:29 +0000 (15:17 -0500)
committerAlex Deucher <alexander.deucher@amd.com>
Tue, 2 Feb 2021 17:08:31 +0000 (12:08 -0500)
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>
drivers/gpu/drm/amd/display/dc/core/dc.c

index 2bb0ec6..8fa179c 100644 (file)
@@ -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;