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

Commit e5cad35e 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: release all overlay resources on last fb release"

parents 6a4b12c5 a42150bd

drivers/video/msm/mdss/mdss_fb.c

+6 −0
Original line number Diff line number Diff line
@@ -1197,6 +1197,12 @@ static int mdss_fb_release(struct fb_info *info, int user) 
	if (!pinfo || (pinfo->pid != pid)) {

		pr_warn("unable to find process info for fb%d pid=%d\n",

				mfd->index, pid);

		if (mfd->mdp.release_fnc) {

			ret = mfd->mdp.release_fnc(mfd);

			if (ret)

				pr_err("error releasing fb%d resources\n",

						mfd->index);

		}

	} else {

		pr_debug("found process entry pid=%d ref=%d\n",

				pinfo->pid, pinfo->ref_cnt);

drivers/video/msm/mdss/mdss_mdp_overlay.c

+1 −1
Original line number Diff line number Diff line
@@ -1053,7 +1053,7 @@ static int __mdss_mdp_overlay_release_all(struct msm_fb_data_type *mfd) 
	mutex_lock(&mdp5_data->ov_lock);

	mutex_lock(&mfd->lock);

	list_for_each_entry(pipe, &mdp5_data->pipes_used, used_list) {

		if (pipe->pid == pid) {

		if (!mfd->ref_cnt || (pipe->pid == pid)) {

			unset_ndx |= pipe->ndx;

			cnt++;

		}