summaryrefslogtreecommitdiff
path: root/drivers/video/fbdev
diff options
context:
space:
mode:
authorLinux Build Service Account <lnxbuild@quicinc.com>2017-05-27 18:11:51 -0700
committerGerrit - the friendly Code Review server <code-review@localhost>2017-05-27 18:11:50 -0700
commitbf485cf86ce04d8b1b943f78f50ee202e971a015 (patch)
tree4a79c1ee38b795b8fdde1c34065d91c961407339 /drivers/video/fbdev
parent533ba786ca8fabb0bb76f9356b42a95bdf6d4593 (diff)
parentaccf510c82dc1bdb6f344d47d87fc3db0198d01a (diff)
Merge "msm: mdss: dp: fix display port crash caused by unclocked register access"
Diffstat (limited to 'drivers/video/fbdev')
-rw-r--r--drivers/video/fbdev/msm/mdss_dp.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/drivers/video/fbdev/msm/mdss_dp.c b/drivers/video/fbdev/msm/mdss_dp.c
index 37346c40d81d..a74bf6f60774 100644
--- a/drivers/video/fbdev/msm/mdss_dp.c
+++ b/drivers/video/fbdev/msm/mdss_dp.c
@@ -3045,6 +3045,10 @@ static int mdss_dp_event_handler(struct mdss_panel_data *pdata,
rc = mdss_dp_on(pdata);
break;
case MDSS_EVENT_PANEL_ON:
+ if (!dp->power_on) {
+ pr_err("DP Controller not powered on\n");
+ break;
+ }
mdss_dp_update_hdcp_info(dp);
if (dp_is_hdcp_enabled(dp)) {
@@ -3065,6 +3069,10 @@ static int mdss_dp_event_handler(struct mdss_panel_data *pdata,
complete_all(&dp->notification_comp);
break;
case MDSS_EVENT_BLANK:
+ if (!dp->power_on) {
+ pr_err("DP Controller not powered on\n");
+ break;
+ }
if (dp_is_hdcp_enabled(dp)) {
dp->hdcp_status = HDCP_STATE_INACTIVE;