diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2020-04-16 01:57:07 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2020-04-16 01:57:06 -0700 |
| commit | 62833851fe313ff9778f269c737b5ddab708d58c (patch) | |
| tree | 44e8ce6e0ef04f1cccd210a4e8ffa099ee729408 /drivers/video/fbdev | |
| parent | 460e8d10e88cbba45baf76ccfdfa23ceacc6d600 (diff) | |
| parent | e072c789092b980cbc2a9124449a9270e7b18c82 (diff) | |
Merge "msm: mdss: hdmi: don't reset CEC while triggering message send"
Diffstat (limited to 'drivers/video/fbdev')
| -rw-r--r-- | drivers/video/fbdev/msm/mdss_hdmi_cec.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/drivers/video/fbdev/msm/mdss_hdmi_cec.c b/drivers/video/fbdev/msm/mdss_hdmi_cec.c index 3eda29edff4d..12a9267f3749 100644 --- a/drivers/video/fbdev/msm/mdss_hdmi_cec.c +++ b/drivers/video/fbdev/msm/mdss_hdmi_cec.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2010-2017, 2020, The Linux Foundation. All rights reserved. +/* Copyright (c) 2010-2017, 2020 The Linux Foundation. All rights reserved. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 and @@ -90,10 +90,6 @@ static int hdmi_cec_msg_send(void *data, struct cec_msg *msg) if (msg->retransmit > 0 && msg->retransmit < RETRANSMIT_MAX_NUM) frame_retransmit = msg->retransmit; - /* toggle cec in order to flush out bad hw state, if any */ - DSS_REG_W(io, HDMI_CEC_CTRL, 0); - DSS_REG_W(io, HDMI_CEC_CTRL, BIT(0)); - frame_retransmit = (frame_retransmit & 0xF) << 4; DSS_REG_W(io, HDMI_CEC_RETRANSMIT, BIT(0) | frame_retransmit); @@ -360,6 +356,9 @@ int hdmi_cec_isr(void *input) if ((cec_intr & BIT(2)) && (cec_intr & BIT(3))) { DEV_DBG("%s: CEC_IRQ_FRAME_ERROR\n", __func__); DSS_REG_W(io, HDMI_CEC_INT, cec_intr | BIT(2)); + /* toggle cec in order to flush out bad hw state, if any */ + DSS_REG_W(io, HDMI_CEC_CTRL, 0); + DSS_REG_W(io, HDMI_CEC_CTRL, BIT(0)); spin_lock_irqsave(&cec_ctrl->lock, flags); cec_ctrl->cec_msg_wr_status |= CEC_STATUS_WR_ERROR; |