diff options
author | Archit Taneja <architt@codeaurora.org> | 2017-09-28 05:01:43 +0530 |
---|---|---|
committer | Vinod Koul <vkoul@kernel.org> | 2022-08-17 19:01:54 +0530 |
commit | 6ae2c308555f470ba63f90b7171519a242f96a67 (patch) | |
tree | acacf89667e7ec4d2c739ce14dc6b452f9999146 | |
parent | 98ed12f9327e06fbe6f56335bacd0ecf1b7d2407 (diff) |
drm/msm/hdmi: Keep the HDMI_CTRL_ENABLE bitfield always ontracking-qcomlt-drm-msm
The ENABLE field in REG_HDMI_CTRL is required to be set to detect hot plug
events on 8x96. We don't get any HPD interrupts when HDMI bridge is
disabled.
Keep it always on. Downstream also seems to do the same thing. Restrict
this quirk only to 8x96, since we're not entirely sure whether this is
a legitimate fix or not.
Signed-off-by: Archit Taneja <architt@codeaurora.org>
-rw-r--r-- | drivers/gpu/drm/msm/hdmi/hdmi.c | 3 | ||||
-rw-r--r-- | drivers/gpu/drm/msm/hdmi/hdmi.h | 3 |
2 files changed, 6 insertions, 0 deletions
diff --git a/drivers/gpu/drm/msm/hdmi/hdmi.c b/drivers/gpu/drm/msm/hdmi/hdmi.c index 93fe61b86967..1eaf93ad300c 100644 --- a/drivers/gpu/drm/msm/hdmi/hdmi.c +++ b/drivers/gpu/drm/msm/hdmi/hdmi.c @@ -31,6 +31,8 @@ void msm_hdmi_set_mode(struct hdmi *hdmi, bool power_on) } } else { ctrl = HDMI_CTRL_HDMI; + if (hdmi->config->keep_ctrl_on) + ctrl |= HDMI_CTRL_ENABLE; } hdmi_write(hdmi, REG_HDMI_CTRL, ctrl); @@ -402,6 +404,7 @@ static struct hdmi_platform_config hdmi_tx_8974_config = { HDMI_CFG(pwr_clk, 8x74), HDMI_CFG(hpd_clk, 8x74), .hpd_freq = hpd_clk_freq_8x74, + .keep_ctrl_on = true, }; /* diff --git a/drivers/gpu/drm/msm/hdmi/hdmi.h b/drivers/gpu/drm/msm/hdmi/hdmi.h index 04a74381aaf7..2024f1a8d022 100644 --- a/drivers/gpu/drm/msm/hdmi/hdmi.h +++ b/drivers/gpu/drm/msm/hdmi/hdmi.h @@ -105,6 +105,9 @@ struct hdmi_platform_config { /* clks that need to be on for screen pwr (ie pixel clk): */ const char **pwr_clk_names; int pwr_clk_cnt; + + /* caps, etc. */ + bool keep_ctrl_on; }; struct hdmi_bridge { |