From c24da684323fd452a3b484b2dc4babf5c7820cd1 Mon Sep 17 00:00:00 2001 From: Veera Sundaram Sankaran Date: Fri, 6 Sep 2019 13:32:38 -0700 Subject: [PATCH] disp: msm: sde: fix panel mode check during secure transition During transition from sui to non-secure if concurrent writeback is enabled, it is incorrectly assumed as video-mode panel. This leads to wrong video-mode validations and false errors. Fix the check to get the panel mode only from the primary display. Change-Id: I3da3076d17cfe2314118b947133cbfc55581a195 Signed-off-by: Veera Sundaram Sankaran --- msm/sde/sde_crtc.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/msm/sde/sde_crtc.c b/msm/sde/sde_crtc.c index f0917f150787..eefa544ef4f6 100644 --- a/msm/sde/sde_crtc.c +++ b/msm/sde/sde_crtc.c @@ -4272,9 +4272,11 @@ static int _sde_crtc_check_secure_state_smmu_translation(struct drm_crtc *crtc, struct drm_encoder *encoder; int is_video_mode = false; - drm_for_each_encoder_mask(encoder, crtc->dev, state->encoder_mask) - is_video_mode |= sde_encoder_check_curr_mode(encoder, + drm_for_each_encoder_mask(encoder, crtc->dev, state->encoder_mask) { + if (sde_encoder_is_primary_display(encoder)) + is_video_mode |= sde_encoder_check_curr_mode(encoder, MSM_DISPLAY_VIDEO_MODE); + } /* * In video mode check for null commit before transition