Merge branch 'pyro' into eel

4 files changed, 63 insertions, 0 deletions

diff --git a/meta-rcar-gen3-adas/recipes-kernel/kernel-module-mmngr/files/0001-free-dma-buf-on-error.patch b/meta-rcar-gen3-adas/recipes-kernel/kernel-module-mmngr/files/0001-free-dma-buf-on-error.patch
new file mode 100644
index 0000000..e41f141
--- /dev/null
+++ b/meta-rcar-gen3-adas/recipes-kernel/kernel-module-mmngr/files/0001-free-dma-buf-on-error.patch
@@ -0,0 +1,23 @@
+From 9362c86c52dcd1577e07f01604e1a7b363c504ca Mon Sep 17 00:00:00 2001
+From: Roman Meshkevich <roman.meshkevich@cogentembedded.com>
+Date: Wed, 22 Feb 2017 01:27:51 +0300
+Subject: [PATCH] unref dma_fb descriptor
+
+---
+ mmngr_drv/mmngrbuf/mmngrbuf-module/files/mmngrbuf/drv/mmngr_buf_drv.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/mmngr_drv/mmngrbuf/mmngrbuf-module/files/mmngrbuf/drv/mmngr_buf_drv.c b/mmngr_drv/mmngrbuf/mmngrbuf-module/files/mmngrbuf/drv/mmngr_buf_drv.c
+index 2e260cb..6a4d0a6 100644
+--- a/mmngr_drv/mmngrbuf/mmngrbuf-module/files/mmngrbuf/drv/mmngr_buf_drv.c
++++ b/mmngr_drv/mmngrbuf/mmngrbuf-module/files/mmngrbuf/drv/mmngr_buf_drv.c
+@@ -99,6 +99,7 @@ static int close(struct inode *inode, struct file *file)
+ 		if (priv->attach) {
+ 			pr_err("detach@close\n");
+ 			dma_buf_detach(priv->dma_buf, priv->attach);
++				dma_buf_put(priv->dma_buf);
+ 		}
+ 
+ 		kfree(priv);
+-- 
+2.7.4
\ No newline at end of file
diff --git a/meta-rcar-gen3-adas/recipes-kernel/kernel-module-mmngr/files/0002-mmngr-Add-V3MSK-board.patch b/meta-rcar-gen3-adas/recipes-kernel/kernel-module-mmngr/files/0002-mmngr-Add-V3MSK-board.patch
new file mode 100644
index 0000000..cfb5297
--- /dev/null
+++ b/meta-rcar-gen3-adas/recipes-kernel/kernel-module-mmngr/files/0002-mmngr-Add-V3MSK-board.patch
@@ -0,0 +1,31 @@
+From 5b50bdd074c162d927bfd3711546928ac93d4a13 Mon Sep 17 00:00:00 2001
+From: Vladimir Barinov <vladimir.barinov@cogentembedded.com>
+Date: Wed, 15 Nov 2017 00:03:43 +0300
+Subject: [PATCH] mmngr: Add V3MSK board
+
+This adds V3MSK board support
+
+Signed-off-by: Konstantin Kozhevnikov <Konstantin.Kozhevnikov@cogentembedded.com>
+Signed-off-by: Vladimir Barinov <vladimir.barinov@cogentembedded.com>
+---
+ mmngr_drv/mmngr/mmngr-module/files/mmngr/include/mmngr_private.h | 5 ++
+ 1 file changed, 5 insertions(+), 0 deletions(-)
+
+diff --git a/mmngr_drv/mmngr/mmngr-module/files/mmngr/include/mmngr_private.h b/mmngr_drv/mmngr/mmngr-module/files/mmngr/include/mmngr_private.h
+index e593380..8282d42 100644
+--- a/mmngr_drv/mmngr/mmngr-module/files/mmngr/include/mmngr_private.h
++++ b/mmngr_drv/mmngr/mmngr-module/files/mmngr/include/mmngr_private.h
+@@ -211,6 +211,11 @@ static int validate_memory_map(void);
+ #define MM_OMXBUF_SIZE		(256 * 1024 * 1024)
+ #endif /* MMNGR_SALVATORX */
+ 
++#ifdef MMNGR_V3MSK
++#define MM_OMXBUF_ADDR		(0x7F000000UL)
++#define MM_OMXBUF_SIZE		(16 * 1024 * 1024)
++#endif /* MMNGR_V3MSK */
++
+ #define	MM_CO_ORDER		(12)
+ 
+ #ifdef MMNGR_SSP_ENABLE
+-- 
+1.9.1
diff --git a/meta-rcar-gen3-adas/recipes-kernel/kernel-module-mmngr/kernel-module-mmngr.bbappend b/meta-rcar-gen3-adas/recipes-kernel/kernel-module-mmngr/kernel-module-mmngr.bbappend
new file mode 100644
index 0000000..6abdc7d
--- /dev/null
+++ b/meta-rcar-gen3-adas/recipes-kernel/kernel-module-mmngr/kernel-module-mmngr.bbappend
@@ -0,0 +1,6 @@
+FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
+
+MMNGR_CFG_eagle = "MMNGR_V3MSK"
+MMNGR_CFG_v3msk = "MMNGR_V3MSK"
+
+SRC_URI_append = " file://0002-mmngr-Add-V3MSK-board.patch"
diff --git a/meta-rcar-gen3-adas/recipes-kernel/kernel-module-mmngr/kernel-module-mmngrbuf.bbappend b/meta-rcar-gen3-adas/recipes-kernel/kernel-module-mmngr/kernel-module-mmngrbuf.bbappend
new file mode 100644
index 0000000..5120cb1
--- /dev/null
+++ b/meta-rcar-gen3-adas/recipes-kernel/kernel-module-mmngr/kernel-module-mmngrbuf.bbappend
@@ -0,0 +1,3 @@
+FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
+
+SRC_URI_append = " file://0001-free-dma-buf-on-error.patch"