summaryrefslogtreecommitdiff
path: root/drivers/video/fbdev/msm
diff options
context:
space:
mode:
authorLinux Build Service Account <lnxbuild@localhost>2019-08-08 09:34:49 -0700
committerGerrit - the friendly Code Review server <code-review@localhost>2019-08-08 09:34:49 -0700
commit99f99486ae8f5661f8f73350e35e6d36eddda367 (patch)
treea1b7a3fb8fff038f59e761e85e6d8d52cf2bb626 /drivers/video/fbdev/msm
parent8b46fe9a3307679168c4e5a29f6fa15303706df9 (diff)
parent01e259a1852a6e7c2e73d2491d11a0b792edd29e (diff)
Merge "msm: mdss: hdmi: adjust HDMI DDC speed configuration"
Diffstat (limited to 'drivers/video/fbdev/msm')
-rw-r--r--drivers/video/fbdev/msm/mdss_hdmi_util.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/video/fbdev/msm/mdss_hdmi_util.c b/drivers/video/fbdev/msm/mdss_hdmi_util.c
index 8b8b4120d3fb..8e854c54bae8 100644
--- a/drivers/video/fbdev/msm/mdss_hdmi_util.c
+++ b/drivers/video/fbdev/msm/mdss_hdmi_util.c
@@ -959,13 +959,17 @@ error:
void hdmi_ddc_config(struct hdmi_tx_ddc_ctrl *ddc_ctrl)
{
+ u32 ddc_speed;
+
if (!ddc_ctrl || !ddc_ctrl->io) {
pr_err("invalid input\n");
return;
}
/* Configure Pre-Scale multiplier & Threshold */
- DSS_REG_W_ND(ddc_ctrl->io, HDMI_DDC_SPEED, (10 << 16) | (2 << 0));
+ ddc_speed = DSS_REG_R_ND(ddc_ctrl->io, HDMI_DDC_SPEED);
+ ddc_speed |= (12 << 16) | (2 << 0);
+ DSS_REG_W_ND(ddc_ctrl->io, HDMI_DDC_SPEED, ddc_speed);
/*
* Setting 31:24 bits : Time units to wait before timeout