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

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

Merge "qcom: peripheral-loader: skip dma attr init if memory is allocated"

parents 7376e380 17c753e4
Loading
Loading
Loading
Loading
+1 −2
Original line number Diff line number Diff line
@@ -441,6 +441,7 @@ static int pil_alloc_region(struct pil_priv *priv, phys_addr_t min_addr,
	else
		aligned_size = ALIGN(size, SZ_1M);

	init_dma_attrs(&priv->desc->attrs);
	dma_set_attr(DMA_ATTR_SKIP_ZEROING, &priv->desc->attrs);
	dma_set_attr(DMA_ATTR_NO_KERNEL_MAPPING, &priv->desc->attrs);

@@ -783,8 +784,6 @@ int pil_boot(struct pil_desc *desc)
		goto release_fw;
	}

	init_dma_attrs(&desc->attrs);

	ret = pil_init_mmap(desc, mdt);
	if (ret)
		goto release_fw;