]> git.proxmox.com Git - mirror_ubuntu-bionic-kernel.git/commitdiff
drm/amd/display: Set i2c speed to 100khz for DCE11.2 and later.
authorZeyu Fan <Zeyu.Fan@amd.com>
Wed, 19 Jul 2017 20:46:42 +0000 (16:46 -0400)
committerAlex Deucher <alexander.deucher@amd.com>
Tue, 26 Sep 2017 22:15:21 +0000 (18:15 -0400)
Signed-off-by: Zeyu Fan <Zeyu.Fan@amd.com>
Reviewed-by: Charlene Liu <Charlene.Liu@amd.com>
Acked-by: Harry Wentland <Harry.Wentland@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
drivers/gpu/drm/amd/display/dc/i2caux/i2caux.c

index 983645b1be78b05174712dfe213eab80e6c3100d..45e766ea79e38b99228704ae7341ea1111d6a4ea 100644 (file)
@@ -337,6 +337,9 @@ enum {
        DEFAULT_I2C_SW_SPEED = 50,
        DEFAULT_I2C_HW_SPEED = 50,
 
+       DEFAULT_I2C_SW_SPEED_100KHZ = 100,
+       DEFAULT_I2C_HW_SPEED_100KHZ = 100,
+
        /* This is the timeout as defined in DP 1.2a,
         * 2.3.4 "Detailed uPacket TX AUX CH State Description". */
        AUX_TIMEOUT_PERIOD = 400,
@@ -436,8 +439,13 @@ bool dal_i2caux_construct(
        i2caux->aux_timeout_period =
                SW_AUX_TIMEOUT_PERIOD_MULTIPLIER * AUX_TIMEOUT_PERIOD;
 
-       i2caux->default_i2c_sw_speed = DEFAULT_I2C_SW_SPEED;
-       i2caux->default_i2c_hw_speed = DEFAULT_I2C_HW_SPEED;
+       if (ctx->dce_version >= DCE_VERSION_11_2) {
+               i2caux->default_i2c_hw_speed = DEFAULT_I2C_HW_SPEED_100KHZ;
+               i2caux->default_i2c_sw_speed = DEFAULT_I2C_SW_SPEED_100KHZ;
+       } else {
+               i2caux->default_i2c_hw_speed = DEFAULT_I2C_HW_SPEED;
+               i2caux->default_i2c_sw_speed = DEFAULT_I2C_SW_SPEED;
+       }
 
        return true;
 }