Merge "msm: ADSPRPC: Always map buffers into IOMMU if one is present" (66d9ea51) · Commits · e / devices / android_kernel_sony_msm8994

drivers/char/adsprpc.c

+5 −5

Original line number	Diff line number	Diff line
		/*
		* Copyright (c) 2012-2013, The Linux Foundation. All rights reserved.
		* Copyright (c) 2012-2014, The Linux Foundation. All rights reserved.
		*
		* This program is free software; you can redistribute it and/or modify
		* it under the terms of the GNU General Public License version 2 and
		@@ -596,10 +596,7 @@ static int get_args(uint32_t kernel, uint32_t sc, remote_arg_t *pra,
		rpra[i].buf.len = pra[i].buf.len;
		if (!rpra[i].buf.len)
		continue;
		if (list[i].num) {
		rpra[i].buf.pv = pra[i].buf.pv;
		continue;
		} else if (me->channel[cid].smmu.enabled &&
		if (me->channel[cid].smmu.enabled &&
		fds && (fds[i] >= 0)) {
		len = buf_page_size(pra[i].buf.len);
		handles[i] = ion_import_dma_buf(me->iclient, fds[i]);
		@@ -616,6 +613,9 @@ static int get_args(uint32_t kernel, uint32_t sc, remote_arg_t *pra,
		pages[list[i].pgidx].addr = iova;
		pages[list[i].pgidx].size = len;
		continue;
		} else if (list[i].num) {
		rpra[i].buf.pv = pra[i].buf.pv;
		continue;
		}
		if (rlen < pra[i].buf.len) {
		struct fastrpc_buf *b;