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

Commit c8dcaed4 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: use GFP_ATOMIC for DMA memory allocation during SSR"

parents cb7175dd fd1e84e8

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

+1 −1
Original line number Diff line number Diff line
@@ -1837,7 +1837,7 @@ static int ipa_q6_clean_q6_tables(void) 
	u32 max_cmds = ipa_get_max_flt_rt_cmds(ipa_ctx->ipa_num_pipes);



	mem.base = dma_alloc_coherent(ipa_ctx->pdev, 4, &mem.phys_base,

		GFP_KERNEL);

		GFP_ATOMIC);

	if (!mem.base) {

		IPAERR("failed to alloc DMA buff of size 4\n");

		return -ENOMEM;

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

+1 −1
Original line number Diff line number Diff line
@@ -2088,7 +2088,7 @@ static int ipa3_q6_clean_q6_tables(void) 


	mem.size = IPA_HW_TBL_HDR_WIDTH;

	mem.base = dma_alloc_coherent(ipa3_ctx->pdev, mem.size,

		&mem.phys_base, GFP_KERNEL);

		&mem.phys_base, GFP_ATOMIC);

	if (!mem.base) {

		IPAERR("failed to alloc DMA buff of size %d\n", mem.size);

		return -ENOMEM;