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

Commit 232ca019 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: fix possible race condition in mdp resource control"

parents e5237f8d 633d0949

drivers/video/msm/mdss/mdss_mdp_intf_cmd.c

+4 −4
Original line number Diff line number Diff line
@@ -731,6 +731,10 @@ int mdss_mdp_resource_control(struct mdss_mdp_ctl *ctl, u32 sw_event) 
		break;

	case MDP_RSRC_CTL_EVENT_STOP:



		/* Cancel early wakeup Work Item */

		if (cancel_work_sync(&ctx->early_wakeup_clk_work))

			pr_debug("early wakeup work canceled\n");



		/* If we are already OFF, just return */

		if (mdp5_data->resources_state ==

				MDP_RSRC_CTL_STATE_OFF) {
@@ -777,10 +781,6 @@ int mdss_mdp_resource_control(struct mdss_mdp_ctl *ctl, u32 sw_event) 
					__func__);

		}



		/* Cancel early wakeup Work Item */

		if (cancel_work_sync(&ctx->early_wakeup_clk_work))

			pr_debug("early wakeup work canceled\n");



		mutex_lock(&ctl->rsrc_lock);

		MDSS_XLOG(ctl->num, mdp5_data->resources_state, sw_event, 0x33);

		if ((mdp5_data->resources_state == MDP_RSRC_CTL_STATE_ON) ||