summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCharlene Liu2019-04-15 22:17:59 +0200
committerAlex Deucher2019-06-22 16:34:11 +0200
commitc703e753c8d150295335ff9671d5573310048831 (patch)
tree38091d1b4a68fd5927c7f7c8b9a1e21edbbf59e5
parentdrm/amd/display: Make sure line size is not zero in DCN2 line buffer size cal... (diff)
downloadkernel-qcow2-linux-c703e753c8d150295335ff9671d5573310048831.tar.gz
kernel-qcow2-linux-c703e753c8d150295335ff9671d5573310048831.tar.xz
kernel-qcow2-linux-c703e753c8d150295335ff9671d5573310048831.zip
drm/amd/display: add SW_USE_I2C_REG request.
[Description] This is for DC_I2c arbitration use between HW use/SW use and DMCU use. Signed-off-by: Charlene Liu <charlene.liu@amd.com> Reviewed-by: Krunoslav Kovac <Krunoslav.Kovac@amd.com> Reviewed-by: Tony Cheng <Tony.Cheng@amd.com> Acked-by: Bhawanpreet Lakha <Bhawanpreet.Lakha@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
-rw-r--r--drivers/gpu/drm/amd/display/dc/dce/dce_i2c_hw.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/gpu/drm/amd/display/dc/dce/dce_i2c_hw.c b/drivers/gpu/drm/amd/display/dc/dce/dce_i2c_hw.c
index d658b862430a..b2786a704708 100644
--- a/drivers/gpu/drm/amd/display/dc/dce/dce_i2c_hw.c
+++ b/drivers/gpu/drm/amd/display/dc/dce/dce_i2c_hw.c
@@ -306,6 +306,8 @@ static bool setup_engine(
#if defined(CONFIG_DRM_AMD_DC_DCN2_0)
uint32_t reset_length = 0;
#endif
+ /* we have checked I2c not used by DMCU, set SW use I2C REQ to 1 to indicate SW using it*/
+ REG_UPDATE(DC_I2C_ARBITRATION, DC_I2C_SW_USE_I2C_REG_REQ, 1);
/* we have checked I2c not used by DMCU, set SW use I2C REQ to 1 to indicate SW using it*/
REG_UPDATE(DC_I2C_ARBITRATION, DC_I2C_SW_USE_I2C_REG_REQ, 1);