From 54b2d6810a8b298a80bc3ba41afd6dae9fc2dc94 Mon Sep 17 00:00:00 2001 From: Raviteja Tamatam Date: Thu, 19 Mar 2020 22:04:08 +0530 Subject: [PATCH] disp: msm: sde: avoid secure display to secure camera transition During stability tests there are cases where smmu faults are seen due to direct transition from secure display to secure camera without smmu ATTACHED state. Added atomic check to avoid such transitions. Change-Id: I307e342f35c6e7dab82902fa77e3a5c0c082f4e4 Signed-off-by: Raviteja Tamatam --- msm/sde/sde_crtc.c | 27 ++++++++++++++++++++++----- 1 file changed, 22 insertions(+), 5 deletions(-) diff --git a/msm/sde/sde_crtc.c b/msm/sde/sde_crtc.c index 83a7bbef28db..68975dd88056 100644 --- a/msm/sde/sde_crtc.c +++ b/msm/sde/sde_crtc.c @@ -4341,6 +4341,20 @@ static int _sde_crtc_check_secure_state_smmu_translation(struct drm_crtc *crtc, MSM_DISPLAY_VIDEO_MODE); } + /* + * Secure display to secure camera needs without direct + * transition is currently not allowed + */ + if (fb_sec_dir && secure == SDE_DRM_SEC_NON_SEC && + smmu_state->state != ATTACHED && + smmu_state->secure_level == SDE_DRM_SEC_ONLY) { + + SDE_EVT32(DRMID(crtc), fb_ns, fb_sec_dir, + smmu_state->state, smmu_state->secure_level, + secure); + goto sec_err; + } + /* * In video mode check for null commit before transition * from secure to non secure and vice versa @@ -4358,14 +4372,17 @@ static int _sde_crtc_check_secure_state_smmu_translation(struct drm_crtc *crtc, SDE_EVT32(DRMID(crtc), fb_ns, fb_sec_dir, smmu_state->state, smmu_state->secure_level, secure, crtc->state->plane_mask, state->plane_mask); - SDE_ERROR( - "crtc%d Invalid transition;sec%d state%d slvl%d ns%d sdir%d\n", - DRMID(crtc), secure, smmu_state->state, - smmu_state->secure_level, fb_ns, fb_sec_dir); - return -EINVAL; + goto sec_err; } return 0; + +sec_err: + SDE_ERROR( + "crtc%d Invalid transition;sec%d state%d slvl%d ns%d sdir%d\n", + DRMID(crtc), secure, smmu_state->state, + smmu_state->secure_level, fb_ns, fb_sec_dir); + return -EINVAL; } static int _sde_crtc_check_secure_conn(struct drm_crtc *crtc,