diff options
| author | Linaro CI <ci_notify@linaro.org> | 2023-01-03 14:53:52 +0000 |
|---|---|---|
| committer | Linaro CI <ci_notify@linaro.org> | 2023-01-03 14:53:52 +0000 |
| commit | b7059c2558d3803e60c4a18949eb54cb8d8da142 (patch) | |
| tree | fca0004c51741baba466db0148b0e4d32405b02d | |
| parent | 88603b6dc419445847923fcb7fe5080067a30f98 (diff) | |
| parent | 6ae2c308555f470ba63f90b7171519a242f96a67 (diff) | |
Merge remote-tracking branch 'drm-msm/tracking-qcomlt-drm-msm' into integration-linux-qcomlt
| -rw-r--r-- | drivers/gpu/drm/msm/hdmi/hdmi.c | 3 | ||||
| -rw-r--r-- | drivers/gpu/drm/msm/hdmi/hdmi.h | 3 | ||||
| -rw-r--r-- | drivers/gpu/drm/msm/hdmi/hdmi_hpd.c | 7 |
3 files changed, 13 insertions, 0 deletions
diff --git a/drivers/gpu/drm/msm/hdmi/hdmi.c b/drivers/gpu/drm/msm/hdmi/hdmi.c index 4d3fdc806bef..f4fb9a7a0146 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); @@ -255,6 +257,7 @@ static const 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 e8dbee50637f..0b03e23ccd9f 100644 --- a/drivers/gpu/drm/msm/hdmi/hdmi.h +++ b/drivers/gpu/drm/msm/hdmi/hdmi.h @@ -102,6 +102,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 { diff --git a/drivers/gpu/drm/msm/hdmi/hdmi_hpd.c b/drivers/gpu/drm/msm/hdmi/hdmi_hpd.c index bfa827b47989..4d4829bdd1c4 100644 --- a/drivers/gpu/drm/msm/hdmi/hdmi_hpd.c +++ b/drivers/gpu/drm/msm/hdmi/hdmi_hpd.c @@ -141,6 +141,13 @@ int msm_hdmi_hpd_enable(struct drm_bridge *bridge) HDMI_HPD_CTRL_ENABLE | hpd_ctrl); spin_unlock_irqrestore(&hdmi->reg_lock, flags); + /* + * wait for a bit so that HPD is sensed if there is a cable already + * connected. Returning early will result in someone calling the + * connnector func's detect() callback too early + */ + msleep(15); + return 0; fail: |