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

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

Merge "fbdev: msm: Signal fences in legacy display commit path"

parents fa88eb6b c5bb0bd8

drivers/video/fbdev/msm/mdss_fb.c

+2 −1
Original line number Diff line number Diff line
@@ -3333,6 +3333,7 @@ static int mdss_fb_pan_display_ex(struct fb_info *info, 
	mfd->msm_fb_backup.info = *info;

	mfd->msm_fb_backup.disp_commit = *disp_commit;



	atomic_inc(&mfd->mdp_sync_pt_data.commit_cnt);

	atomic_inc(&mfd->commits_pending);

	atomic_inc(&mfd->kickoff_pending);

	wake_up_all(&mfd->commit_wait_q);
@@ -4436,7 +4437,7 @@ static int mdss_fb_handle_buf_sync_ioctl(struct msm_sync_pt_data *sync_pt_data, 
	if (IS_ERR_OR_NULL(retire_fence)) {

		val += sync_pt_data->retire_threshold;

		retire_fence = mdss_fb_sync_get_fence(

			sync_pt_data->timeline, "mdp-retire", val);

			sync_pt_data->timeline_retire, "mdp-retire", val);

	}



	if (IS_ERR_OR_NULL(retire_fence)) {