diff options
| author | Linux Build Service Account <lnxbuild@quicinc.com> | 2017-07-07 17:45:51 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2017-07-07 17:45:51 -0700 |
| commit | 209c402fa583c74878cbd10c31a4c1ac31bbdd9b (patch) | |
| tree | bc2a99b499f714b60c249c06e8025a263418b84c /drivers/video/fbdev | |
| parent | 799bcf26f37db9453405ff5c6774d39e5c8963e7 (diff) | |
| parent | 3071be2987f4bf3ac5e17c919160cf196dcfb3c3 (diff) | |
Merge "mdss: dp: avoid notifying DP connect during AUX timeout cases"
Diffstat (limited to 'drivers/video/fbdev')
| -rw-r--r-- | drivers/video/fbdev/msm/mdss_dp.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/video/fbdev/msm/mdss_dp.c b/drivers/video/fbdev/msm/mdss_dp.c index c8afb3a244c3..2f169074261a 100644 --- a/drivers/video/fbdev/msm/mdss_dp.c +++ b/drivers/video/fbdev/msm/mdss_dp.c @@ -2176,6 +2176,10 @@ static int mdss_dp_process_hpd_high(struct mdss_dp_drv_pdata *dp) ret = mdss_dp_dpcd_cap_read(dp); if (ret || !mdss_dp_aux_is_link_rate_valid(dp->dpcd.max_link_rate) || !mdss_dp_aux_is_lane_count_valid(dp->dpcd.max_lane_count)) { + if (ret == EDP_AUX_ERR_TOUT) { + pr_err("DPCD read timedout, skip connect notification\n"); + goto end; + } /* * If there is an error in parsing DPCD or if DPCD reports * unsupported link parameters then set the default link |