From 55a175279cd8f12c75ba38382938d6562ea3990c Mon Sep 17 00:00:00 2001 From: Benjamin Chan Date: Tue, 30 May 2017 14:19:19 -0400 Subject: [PATCH] msm: mdss: Avoid NULL mixer during partial update ROI setup Under MDSS suspend resume usecase, the mixer config might not be setup and if a partial update is issued for the first frame, it is necessary to avoid accessing the NULL mixer config. CRs-Fixed: 2053822 Change-Id: I17c0b98805ce9395899e988032097740126fee83 Signed-off-by: Benjamin Chan --- drivers/video/fbdev/msm/mdss_mdp.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/video/fbdev/msm/mdss_mdp.h b/drivers/video/fbdev/msm/mdss_mdp.h index cd403f19c088..5a15b557e5c7 100644 --- a/drivers/video/fbdev/msm/mdss_mdp.h +++ b/drivers/video/fbdev/msm/mdss_mdp.h @@ -1107,9 +1107,9 @@ static inline enum mdss_mdp_pu_type mdss_mdp_get_pu_type( if (!is_split_lm(mctl->mfd) || mdss_mdp_is_both_lm_valid(mctl)) pu_type = MDSS_MDP_DEFAULT_UPDATE; - else if (mctl->mixer_left->valid_roi) + else if (mctl->mixer_left && mctl->mixer_left->valid_roi) pu_type = MDSS_MDP_LEFT_ONLY_UPDATE; - else if (mctl->mixer_right->valid_roi) + else if (mctl->mixer_right && mctl->mixer_right->valid_roi) pu_type = MDSS_MDP_RIGHT_ONLY_UPDATE; else pr_err("%s: invalid pu_type\n", __func__);