Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b13c09c7 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: mdss: Check if secure display is enabled during non-secure validate"

parents bed622b8 183f6944

drivers/video/fbdev/msm/mdss_mdp_layer.c

+4 −1
Original line number Diff line number Diff line
@@ -1812,13 +1812,16 @@ static int __validate_secure_session(struct mdss_overlay_private *mdp5_data) 


	pr_debug("pipe count:: secure display:%d non-secure:%d secure-vid:%d,secure-cam:%d\n",

		sd_pipes, nonsd_pipes, secure_vid_pipes, secure_cam_pipes);

	MDSS_XLOG(mdss_get_sd_client_cnt(), sd_pipes, nonsd_pipes,

			secure_vid_pipes, secure_cam_pipes);



	if (mdss_get_sd_client_cnt() && !mdp5_data->sd_enabled) {

		pr_err("Secure session already enabled for other client\n");

		return -EINVAL;

	}



	if ((sd_pipes) &&

	if (((sd_pipes) || (mdp5_data->ctl->is_video_mode &&

		mdss_get_sd_client_cnt())) &&

		(nonsd_pipes || secure_vid_pipes ||

		secure_cam_pipes)) {

		pr_err("non-secure layer validation request during secure display session\n");