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

Commit b06d837b 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: prevent deadlock during thread shutdown"

parents 85f9df32 3a30f75c

drivers/video/msm/mdss/mdss_fb.c

+2 −2
Original line number Diff line number Diff line
@@ -1235,16 +1235,16 @@ static int mdss_fb_blank_blank(struct msm_fb_data_type *mfd, 
	complete(&mfd->no_update.comp);



	mfd->op_enable = false;

	mutex_lock(&mfd->bl_lock);

	if (mdss_panel_is_power_off(req_power_state)) {

		/* Stop Display thread */

		if (mfd->disp_thread)

			mdss_fb_stop_disp_thread(mfd);

		mutex_lock(&mfd->bl_lock);

		mdss_fb_set_backlight(mfd, 0);

		mfd->bl_updated = 0;

		mutex_unlock(&mfd->bl_lock);

	}

	mfd->panel_power_state = req_power_state;

	mutex_unlock(&mfd->bl_lock);



	ret = mfd->mdp.off_fnc(mfd);

	if (ret)