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

Commit 78d5bcf8 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: Return suspend without delay in NOTIFY UPDATE"

parents 0fc7f629 f878995f

drivers/video/msm/mdss/mdss_fb.c

+8 −1
Original line number Diff line number Diff line
@@ -122,7 +122,11 @@ static int mdss_fb_notify_update(struct msm_fb_data_type *mfd, 
	if (notify > NOTIFY_UPDATE_POWER_OFF)

		return -EINVAL;



	if (notify == NOTIFY_UPDATE_START) {

	if (mfd->update.is_suspend) {

		to_user = NOTIFY_TYPE_SUSPEND;

		mfd->update.is_suspend = 0;

		ret = 1;

	} else if (notify == NOTIFY_UPDATE_START) {

		INIT_COMPLETION(mfd->update.comp);

		ret = wait_for_completion_timeout(

						&mfd->update.comp, 4 * HZ);
@@ -788,6 +792,7 @@ static int mdss_fb_blank_sub(int blank_mode, struct fb_info *info, 
			}

			mutex_lock(&mfd->update.lock);

			mfd->update.type = NOTIFY_TYPE_UPDATE;

			mfd->update.is_suspend = 0;

			mutex_unlock(&mfd->update.lock);

		}

		break;
@@ -802,7 +807,9 @@ static int mdss_fb_blank_sub(int blank_mode, struct fb_info *info, 


			mutex_lock(&mfd->update.lock);

			mfd->update.type = NOTIFY_TYPE_SUSPEND;

			mfd->update.is_suspend = 1;

			mutex_unlock(&mfd->update.lock);

			complete(&mfd->update.comp);

			del_timer(&mfd->no_update.timer);

			mfd->no_update.value = NOTIFY_TYPE_SUSPEND;

			complete(&mfd->no_update.comp);

drivers/video/msm/mdss/mdss_fb.h

+1 −0
Original line number Diff line number Diff line
@@ -88,6 +88,7 @@ struct disp_info_notify { 
	struct completion comp;

	struct mutex lock;

	int value;

	int is_suspend;

};



struct msm_sync_pt_data {