A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-09 13:49:24 -04:00
Code Issues Projects Releases Packages Wiki Activity

disp: msm: sde: avoid secure display to secure camera transition

Browse source 
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 <travitej@codeaurora.org>
This commit is contained in:
Raviteja Tamatam 2020-03-19 22:04:08 +05:30 • committed by Gerrit - the friendly Code Review server
commit 54b2d6810a
1 changed files with 22 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

27
msm/sde/sde_crtc.c
View file

@ -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,