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

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

Merge "ion: add support for mapping with dma mapping attributes" into msm-next

parents d0d668ad 434d93d2

drivers/staging/android/ion/ion.c

+2 −2
Original line number Diff line number Diff line
@@ -365,8 +365,8 @@ static struct sg_table *ion_map_dma_buf(struct dma_buf_attachment *attachment, 


	table = a->table;



	if (!dma_map_sg(attachment->dev, table->sgl, table->nents,

			direction)){

	if (!dma_map_sg_attrs(attachment->dev, table->sgl, table->nents,

			      direction, attachment->dma_map_attrs)){

		ret = -ENOMEM;

		goto err;

	}

include/linux/dma-buf.h

+1 −0
Original line number Diff line number Diff line
@@ -326,6 +326,7 @@ struct dma_buf_attachment { 
	struct device *dev;

	struct list_head node;

	void *priv;

	unsigned long dma_map_attrs;

};



/**