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

Commit 50d97a63 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: avoid rotator request during secure display session"

parents 76c65273 4199a455

drivers/video/msm/mdss/mdss_rotator.c

+10 −0
Original line number Diff line number Diff line
@@ -2130,6 +2130,11 @@ static int mdss_rotator_handle_request(struct mdss_rot_mgr *mgr, 
	struct mdss_rot_entry_container *req = NULL;

	int size, ret;



	if (mdss_get_sd_client_cnt()) {

		pr_err("rot request not permitted during secure display session\n");

		return -EPERM;

	}



	ret = copy_from_user(&user_req, (void __user *)arg,

					sizeof(user_req));

	if (ret) {
@@ -2282,6 +2287,11 @@ static int mdss_rotator_handle_request32(struct mdss_rot_mgr *mgr, 
	struct mdss_rot_entry_container *req = NULL;

	int size, ret;



	if (mdss_get_sd_client_cnt()) {

		pr_err("rot request not permitted during secure display session\n");

		return -EPERM;

	}



	ret = copy_from_user(&user_req32, (void __user *)arg,

					sizeof(user_req32));

	if (ret) {