From 2489007e7d740ccbc3e0a202914e243ad5178787 Mon Sep 17 00:00:00 2001
From: codeworkx <codeworkx@cyanogenmod.com>
Date: Sat, 22 Sep 2012 09:48:20 +0200
Subject: merge opensource jb u5

Change-Id: I1aaec157aa196f3448eff8636134fce89a814cf2
---
 arch/arm/plat-s5p/include/plat/s5p-iovmm.h | 46 ++++++++++++++++++++++++++++++
 1 file changed, 46 insertions(+)

(limited to 'arch/arm/plat-s5p/include/plat/s5p-iovmm.h')

diff --git a/arch/arm/plat-s5p/include/plat/s5p-iovmm.h b/arch/arm/plat-s5p/include/plat/s5p-iovmm.h
index 2e31ce3..f22edc7 100644
--- a/arch/arm/plat-s5p/include/plat/s5p-iovmm.h
+++ b/arch/arm/plat-s5p/include/plat/s5p-iovmm.h
@@ -11,6 +11,50 @@
 #ifndef __ASM_PLAT_IOVMM_H
 #define __ASM_PLAT_IOVMM_H
 
+#ifdef CONFIG_DRM_EXYNOS_IOMMU
+#ifdef CONFIG_IOVMM
+void *iovmm_setup(unsigned long s_iova, unsigned long size);
+void iovmm_cleanup(void *in_vmm);
+int iovmm_activate(void *in_vmm, struct device *dev);
+void iovmm_deactivate(void *in_vmm, struct device *dev);
+
+/* iovmm_map() - Maps a list of physical memory chunks
+ * @dev: the owner of the IO address space where the mapping is created
+ * @sg: list of physical memory chunks to map
+ * @offset: length in bytes where the mapping starts
+ * @size: how much memory to map in bytes. @offset + @size must not exceed
+ *        total size of @sg
+ *
+ * This function returns mapped IO address in the address space of @dev.
+ * Returns 0 if mapping fails.
+ *
+ * The caller of this function must ensure that iovmm_cleanup() is not called
+ * while this function is called.
+ *
+ */
+dma_addr_t iovmm_map(void *in_vmm, struct scatterlist *sg, off_t offset,
+								size_t size);
+
+/* iovmm_map() - unmaps the given IO address
+ * @dev: the owner of the IO address space where @iova belongs
+ * @iova: IO address that needs to be unmapped and freed.
+ *
+ * The caller of this function must ensure that iovmm_cleanup() is not called
+ * while this function is called.
+ */
+void iovmm_unmap(void *in_vmm, dma_addr_t iova);
+
+#else
+#define iovmm_setup(s_iova, size)		(ERR_PTR(-ENOSYS))
+#define iovmm_cleanup(in_vmm)
+#define iovmm_activate(in_vmm, dev)		(-ENOSYS)
+#define iovmm_deactivate(in_vmm, dev)
+#define iovmm_map(in_vmm, sg, offset, size)	(0)
+#define iovmm_unmap(in_vmm, iova)
+#endif /* CONFIG_IOVMM */
+
+#else
+
 #ifdef CONFIG_IOVMM
 int iovmm_setup(struct device *dev);
 void iovmm_cleanup(struct device *dev);
@@ -52,4 +96,6 @@ void iovmm_unmap(struct device *dev, dma_addr_t iova);
 #define iovmm_unmap(dev, iova)
 #endif /* CONFIG_IOVMM */
 
+#endif /* CONFIG_DRM_EXYNOS_IOMMU */
+
 #endif /*__ASM_PLAT_IOVMM_H*/
-- 
cgit v1.1