diff options
| author | Sai Hari Chandana Kalluri <chandana.kalluri@xilinx.com> | 2021-02-12 11:54:37 -0800 |
|---|---|---|
| committer | Sai Hari Chandana Kalluri <chandana.kalluri@xilinx.com> | 2021-07-14 14:24:24 -0700 |
| commit | 3f52572b2aacd82d87000bfd3e85e75dd0467e8b (patch) | |
| tree | ca6181a2583953924635f057268dc717cc50c7d4 | |
| parent | 4952cc30ca5f63a7a06e2c10d8e760430dfb08f1 (diff) | |
| download | meta-xilinx-3f52572b2aacd82d87000bfd3e85e75dd0467e8b.tar.gz | |
Kernel-module-mali: Update patch fix-ioremap to include all correct symbols
Fix symbols for 0020-Fix-ioremap_nocache-deprecation-in-kernel-5.6.patch to fix do_patch failures
Signed-off-by: Sai Hari Chandana Kalluri <chandana.kalluri@xilinx.com>
| -rw-r--r-- | meta-xilinx-bsp/recipes-graphics/mali/kernel-module-mali/0020-Fix-ioremap_nocache-deprecation-in-kernel-5.6.patch | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/meta-xilinx-bsp/recipes-graphics/mali/kernel-module-mali/0020-Fix-ioremap_nocache-deprecation-in-kernel-5.6.patch b/meta-xilinx-bsp/recipes-graphics/mali/kernel-module-mali/0020-Fix-ioremap_nocache-deprecation-in-kernel-5.6.patch index 9a72b9b2..ff86091f 100644 --- a/meta-xilinx-bsp/recipes-graphics/mali/kernel-module-mali/0020-Fix-ioremap_nocache-deprecation-in-kernel-5.6.patch +++ b/meta-xilinx-bsp/recipes-graphics/mali/kernel-module-mali/0020-Fix-ioremap_nocache-deprecation-in-kernel-5.6.patch | |||
| @@ -20,17 +20,17 @@ index 1dae1d6..6fadd42 100644 | |||
| 20 | --- a/linux/mali_memory_cow.c | 20 | --- a/linux/mali_memory_cow.c |
| 21 | +++ b/linux/mali_memory_cow.c | 21 | +++ b/linux/mali_memory_cow.c |
| 22 | @@ -693,7 +693,11 @@ void _mali_mem_cow_copy_page(mali_page_node *src_node, mali_page_node *dst_node) | 22 | @@ -693,7 +693,11 @@ void _mali_mem_cow_copy_page(mali_page_node *src_node, mali_page_node *dst_node) |
| 23 | /* | 23 | /* |
| 24 | * use ioremap to map src for BLOCK memory | 24 | * use ioremap to map src for BLOCK memory |
| 25 | */ | 25 | */ |
| 26 | +#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 6, 0) | 26 | +#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 6, 0) |
| 27 | + src = ioremap(_mali_page_node_get_dma_addr(src_node), _MALI_OSK_MALI_PAGE_SIZE); | 27 | + src = ioremap(_mali_page_node_get_dma_addr(src_node), _MALI_OSK_MALI_PAGE_SIZE); |
| 28 | +#else | 28 | +#else |
| 29 | src = ioremap_nocache(_mali_page_node_get_dma_addr(src_node), _MALI_OSK_MALI_PAGE_SIZE); | 29 | src = ioremap_nocache(_mali_page_node_get_dma_addr(src_node), _MALI_OSK_MALI_PAGE_SIZE); |
| 30 | +#endif | 30 | +#endif |
| 31 | memcpy(dst, src , _MALI_OSK_MALI_PAGE_SIZE); | 31 | memcpy(dst, src , _MALI_OSK_MALI_PAGE_SIZE); |
| 32 | iounmap(src); | 32 | iounmap(src); |
| 33 | } | 33 | } |
| 34 | diff --git a/linux/mali_osk_low_level_mem.c b/linux/mali_osk_low_level_mem.c | 34 | diff --git a/linux/mali_osk_low_level_mem.c b/linux/mali_osk_low_level_mem.c |
| 35 | index 84f93d9..5a0a725 100644 | 35 | index 84f93d9..5a0a725 100644 |
| 36 | --- a/linux/mali_osk_low_level_mem.c | 36 | --- a/linux/mali_osk_low_level_mem.c |