diff options
| author |   Khang Nguyen <khang.nguyen.xw@renesas.com> | 2019-07-30 10:01:56 +0700 |
|---|---|---|
| committer | Khang Nguyen <khang.nguyen.xw@renesas.com> | 2019-07-31 15:18:52 +0700 |
| commit | 27b104d0eb1583d746f7a4804d12948affe5cab5 (patch) | |
| tree | 76b31117b9d415fdcb817f9dcd0b1a11e01338be /meta-rcar-gen3 | |
| parent | fd27dbe637bc0426d34dc9fc79c403a0192f7f40 (diff) | |
rcar-gen3: mmngrbuf: Fix HW overlay mode patch applying conflict
The patch applying conflict occurs due to the MMNGRBUF has been
updated to v1.3, this commit refreshes the patch to fix it.
Change-Id: I67a4dd6277deb846b536064b328f524240513129
Signed-off-by: Khang Nguyen <khang.nguyen.xw@renesas.com>
Signed-off-by: Takamitsu Honda <takamitsu.honda.pv@renesas.com>
Diffstat (limited to 'meta-rcar-gen3')
| -rw-r--r-- | meta-rcar-gen3/recipes-kernel/kernel-module-mmngr/kernel-module-mmngrbuf/0001-mmngr_drv-mmngrbuf-Take-care-of-any-migration-of-sca.patch | 17 |
1 files changed, 4 insertions, 13 deletions
diff --git a/meta-rcar-gen3/recipes-kernel/kernel-module-mmngr/kernel-module-mmngrbuf/0001-mmngr_drv-mmngrbuf-Take-care-of-any-migration-of-sca.patch b/meta-rcar-gen3/recipes-kernel/kernel-module-mmngr/kernel-module-mmngrbuf/0001-mmngr_drv-mmngrbuf-Take-care-of-any-migration-of-sca.patch index 2537a7c..7e5ca0a 100644 --- a/meta-rcar-gen3/recipes-kernel/kernel-module-mmngr/kernel-module-mmngrbuf/0001-mmngr_drv-mmngrbuf-Take-care-of-any-migration-of-sca.patch +++ b/meta-rcar-gen3/recipes-kernel/kernel-module-mmngr/kernel-module-mmngrbuf/0001-mmngr_drv-mmngrbuf-Take-care-of-any-migration-of-sca.patch @@ -1,4 +1,4 @@ -From be1ce185051b49ae471dbf9d3a5a90df5633aa98 Mon Sep 17 00:00:00 2001 +From 43d2cc7496340eea3f96cb3c3cf66139e0878f3c Mon Sep 17 00:00:00 2001 From: Hai Nguyen Pham <hai.pham.ud@renesas.com> Date: Tue, 26 Mar 2019 15:56:30 +0700 Subject: [PATCH] mmngr_drv: mmngrbuf: Take care of any migration of @@ -13,22 +13,13 @@ Initialize the scatterlist entry so that it can be happily traversed. Signed-off-by: Hai Nguyen Pham <hai.pham.ud@renesas.com> --- - .../mmngrbuf/mmngrbuf-module/files/mmngrbuf/drv/mmngr_buf_drv.c | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) + mmngr_drv/mmngrbuf/mmngrbuf-module/files/mmngrbuf/drv/mmngr_buf_drv.c | 3 +++ + 1 file changed, 3 insertions(+) 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 778bb69..7496dbf 100644 +index fe3db08..d9189e9 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 -@@ -1,7 +1,7 @@ - /*************************************************************************/ /* - MMNGR - -- Copyright (C) 2015-2016 Renesas Electronics Corporation -+ Copyright (C) 2015-2019 Renesas Electronics Corporation - - License Dual MIT/GPLv2 - @@ -256,6 +256,9 @@ static struct sg_table *dmabuf_map_dma_buf(struct dma_buf_attachment *attach, return NULL; } |