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

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

Merge "msm: ipa3: fix a race condition on clock vote from suspend" into msm-4.9

parents fe5108a5 0d06bb1c

drivers/platform/msm/ipa/ipa_v2/ipa.c

+2 −0
Original line number Diff line number Diff line
@@ -3679,6 +3679,7 @@ void ipa_suspend_handler(enum ipa_irq_type interrupt, 
				 * pipe will be unsuspended as part of

				 * enabling IPA clocks

				 */

				mutex_lock(&ipa_ctx->sps_pm.sps_pm_lock);

				if (!atomic_read(

					&ipa_ctx->sps_pm.dec_clients)

					) {
@@ -3691,6 +3692,7 @@ void ipa_suspend_handler(enum ipa_irq_type interrupt, 
						1);

					ipa_sps_process_irq_schedule_rel();

				}

				mutex_unlock(&ipa_ctx->sps_pm.sps_pm_lock);

			} else {

				resource = ipa2_get_rm_resource_from_ep(i);

				res = ipa_rm_request_resource_with_timer(

drivers/platform/msm/ipa/ipa_v3/ipa.c

+4 −0
Original line number Diff line number Diff line
@@ -3620,6 +3620,8 @@ void ipa3_suspend_handler(enum ipa_irq_type interrupt, 
				 * pipe will be unsuspended as part of

				 * enabling IPA clocks

				 */

				mutex_lock(&ipa3_ctx->transport_pm.

					transport_pm_mutex);

				if (!atomic_read(

					&ipa3_ctx->transport_pm.dec_clients)

					) {
@@ -3632,6 +3634,8 @@ void ipa3_suspend_handler(enum ipa_irq_type interrupt, 
					1);

					ipa3_process_irq_schedule_rel();

				}

				mutex_unlock(&ipa3_ctx->transport_pm.

					transport_pm_mutex);

			} else {

				resource = ipa3_get_rm_resource_from_ep(i);

				res =