samsung-sm8650/android_kernel_samsung_sm8650-modules
1
0
Garpu 0
Kode Masalah Tarik Permintaan Actions Packages Projects Rilis Wiki Kegiatan

Merge "drm/msm/dp: add extra 100ms sleep when MSTM_CTRL is not cleared"

Telusuri Sumber
This commit is contained in:
qctecmdr
2019-05-11 00:27:58 -07:00
committed by Gerrit - the friendly Code Review server
orang tua e8a6afa265 162fff1195
melakukan 74f328561e
1 mengubah file dengan 12 tambahan dan 0 penghapusan
Download Patch File Download Diff File Expand all files Collapse all files

12
msm/dp/dp_display.c
Melihat File

@@ -635,6 +635,8 @@ static void dp_display_process_mst_hpd_high(struct dp_display_private *dp,
{
bool is_mst_receiver;
struct dp_mst_hpd_info info;
const unsigned long clear_mstm_ctrl_timeout_us = 100000;
u8 old_mstm_ctrl;
int ret;
if (!dp->parser->has_mst || !dp->mst.drm_registered) {
@@ -654,8 +656,18 @@ static void dp_display_process_mst_hpd_high(struct dp_display_private *dp,
}
/* clear sink mst state */
drm_dp_dpcd_readb(dp->aux->drm_aux, DP_MSTM_CTRL,
&old_mstm_ctrl);
drm_dp_dpcd_writeb(dp->aux->drm_aux, DP_MSTM_CTRL, 0);
/* add extra delay if MST state is not cleared */
if (old_mstm_ctrl) {
DP_MST_DEBUG("MSTM_CTRL is not cleared, wait %dus\n",
clear_mstm_ctrl_timeout_us);
usleep_range(clear_mstm_ctrl_timeout_us,
clear_mstm_ctrl_timeout_us + 1000);
}
ret = drm_dp_dpcd_writeb(dp->aux->drm_aux, DP_MSTM_CTRL,
DP_MST_EN | DP_UP_REQ_EN | DP_UPSTREAM_IS_SRC);
if (ret < 0) {