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

Commit a3343e70 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: Signal outstanding fences when panel is dead"

parents 31aa446b 18dd0531

drivers/video/fbdev/msm/mdss_fb.c

+12 −0
Original line number Diff line number Diff line
@@ -4661,6 +4661,7 @@ static int mdss_fb_atomic_commit_ioctl(struct fb_info *info, 
	struct mdp_destination_scaler_data *ds_data = NULL;

	struct mdp_destination_scaler_data __user *ds_data_user;

	struct msm_fb_data_type *mfd;

	struct mdss_overlay_private *mdp5_data = NULL;



	ret = copy_from_user(&commit, argp, sizeof(struct mdp_layer_commit));

	if (ret) {
@@ -4672,9 +4673,20 @@ static int mdss_fb_atomic_commit_ioctl(struct fb_info *info, 
	if (!mfd)

		return -EINVAL;



	mdp5_data = mfd_to_mdp5_data(mfd);



	if (mfd->panel_info->panel_dead) {

		pr_debug("early commit return\n");

		MDSS_XLOG(mfd->panel_info->panel_dead);

		/*

		 * In case of an ESD attack, since we early return from the

		 * commits, we need to signal the outstanding fences.

		 */

		mdss_fb_release_fences(mfd);

		if ((mfd->panel.type == MIPI_CMD_PANEL) &&

			mfd->mdp.signal_retire_fence && mdp5_data)

			mfd->mdp.signal_retire_fence(mfd,

						mdp5_data->retire_cnt);

		return 0;

	}