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

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

Merge "msm:ipa: vote for svs2 during ipa initialization" into msm-4.14

parents 76154d31 ef35d6cf

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

+2 −1
Original line number Diff line number Diff line
@@ -4966,7 +4966,8 @@ static int ipa3_pre_init(const struct ipa3_plat_drv_res *resource_p, 


	/* Enable ipa3_ctx->enable_clock_scaling */

	ipa3_ctx->enable_clock_scaling = 1;

	ipa3_ctx->curr_ipa_clk_rate = ipa3_ctx->ctrl->ipa_clk_rate_turbo;

	/* vote for svs2 on bootup */

	ipa3_ctx->curr_ipa_clk_rate = ipa3_ctx->ctrl->ipa_clk_rate_svs2;



	/* enable IPA clocks explicitly to allow the initialization */

	ipa3_enable_clks();

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

+1 −1
Original line number Diff line number Diff line
@@ -1313,7 +1313,7 @@ int ipa3_tx_dp(enum ipa_client_type dst, struct sk_buff *skb, 


	sys = ipa3_ctx->ep[src_ep_idx].sys;



	if (!sys->ep->valid) {

	if (!sys || !sys->ep->valid) {

		IPAERR("pipe not valid\n");

		goto fail_gen;

	}