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

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

Merge "mdss: fbdev: Fix fence timeout error check"

parents e7a39919 45943bcf

drivers/video/fbdev/msm/mdss_fb.c

+3 −3
Original line number Diff line number Diff line
@@ -3004,7 +3004,7 @@ static int __mdss_fb_wait_for_fence_sub(struct msm_sync_pt_data *sync_pt_data, 


		ret = mdss_wait_sync_fence(fences[i], wait_ms);



		if (ret == -ETIME) {

		if (ret == -ETIMEDOUT) {

			wait_jf = timeout - jiffies;

			wait_ms = jiffies_to_msecs(wait_jf);

			if (wait_jf < 0)
@@ -3021,14 +3021,14 @@ static int __mdss_fb_wait_for_fence_sub(struct msm_sync_pt_data *sync_pt_data, 
			MDSS_XLOG_TOUT_HANDLER("mdp");

			ret = mdss_wait_sync_fence(fences[i], wait_ms);



			if (ret == -ETIME)

			if (ret == -ETIMEDOUT)

				break;

		}

		mdss_put_sync_fence(fences[i]);

	}



	if (ret < 0) {

		pr_err("%s: sync_fence_wait failed! ret = %x\n",

		pr_err("%s: sync_fence_wait failed! ret = %d\n",

				sync_pt_data->fence_name, ret);

		for (; i < fence_cnt; i++)

			mdss_put_sync_fence(fences[i]);