Merge "msm: mdss: free ion memory after panel is blanked" (521a9c45) · Commits · e / devices / android_kernel_sony_msm8994

drivers/video/msm/mdss/mdss_fb.c

+3 −3

Original line number	Diff line number	Diff line
		@@ -2277,9 +2277,6 @@ static int mdss_fb_release_all(struct fb_info *info, bool release_all)
		if (mfd->mdp.release_fnc)
		mfd->mdp.release_fnc(mfd, true, pid);

		if (mfd->fb_ion_handle)
		mdss_fb_free_fb_ion_memory(mfd);

		ret = mdss_fb_blank_sub(FB_BLANK_POWERDOWN, info,
		mfd->op_enable);
		if (ret) {
		@@ -2287,6 +2284,9 @@ static int mdss_fb_release_all(struct fb_info *info, bool release_all)
		mfd->index, ret, task->comm, current->tgid, pid);
		return ret;
		}
		if (mfd->fb_ion_handle)
		mdss_fb_free_fb_ion_memory(mfd);

		atomic_set(&mfd->ioctl_ref_cnt, 0);
		} else if (release_needed) {
		pr_debug("current process=%s pid=%d known pid=%d mfd->ref=%d\n",