diff options
| author | Archit Taneja <architt@codeaurora.org> | 2017-09-28 05:01:43 +0530 |
|---|---|---|
| committer | Vinod Koul <vkoul@kernel.org> | 2020-02-10 13:42:32 +0530 |
| commit | 73d958acc1e3749f70d706648a74dd435d469f46 (patch) | |
| tree | 18754f6603a92306af4e8d77fa71f1ed06347987 | |
| parent | a3ffbcc11d62a8e5b9e4d180ab1d6277513459b6 (diff) | |
drm/msm/hdmi: Keep the HDMI_CTRL_ENABLE bitfield always on
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 1a9b6289637d..92ecea4d64b9 100644 --- a/drivers/gpu/drm/msm/hdmi/hdmi.c +++ b/drivers/gpu/drm/msm/hdmi/hdmi.c @@ -28,6 +28,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); @@ -411,6 +413,7 @@ static struct hdmi_platform_config hdmi_tx_8996_config = { HDMI_CFG(pwr_clk, 8x74), HDMI_CFG(hpd_clk, 8x74), .hpd_freq = hpd_clk_freq_8x74, + .keep_ctrl_on = true, }; static const struct { diff --git a/drivers/gpu/drm/msm/hdmi/hdmi.h b/drivers/gpu/drm/msm/hdmi/hdmi.h index d0b84f0abee1..2200dfffa13e 100644 --- a/drivers/gpu/drm/msm/hdmi/hdmi.h +++ b/drivers/gpu/drm/msm/hdmi/hdmi.h @@ -112,6 +112,9 @@ struct hdmi_platform_config { /* gpio's: */ struct hdmi_gpio_data gpios[HDMI_MAX_NUM_GPIO]; + + /* caps, etc. */ + bool keep_ctrl_on; }; void msm_hdmi_set_mode(struct hdmi *hdmi, bool power_on); |