diff options
| author | Mark Hatle <mark.hatle@amd.com> | 2024-05-16 19:55:24 -0600 |
|---|---|---|
| committer | Mark Hatle <mark.hatle@amd.com> | 2024-05-18 13:08:08 -0600 |
| commit | ff9288d64f0b44b88c00ecb0862caa964d984fa9 (patch) | |
| tree | 6c9b1ca26ed7ac2dc87565d02da7fc249f80b6d9 | |
| parent | 364fb5d64cfd7a0c16cf52a1047e43981c831fc6 (diff) | |
| download | meta-xilinx-ff9288d64f0b44b88c00ecb0862caa964d984fa9.tar.gz | |
kernel-module-mali: Fix building with 5.15.x kernels
Signed-off-by: Mark Hatle <mark.hatle@amd.com>
| -rw-r--r-- | meta-xilinx-core/recipes-graphics/mali/kernel-module-mali/0025-Import-DMA_BUF-module-and-update-register_shrinker-f.patch | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/meta-xilinx-core/recipes-graphics/mali/kernel-module-mali/0025-Import-DMA_BUF-module-and-update-register_shrinker-f.patch b/meta-xilinx-core/recipes-graphics/mali/kernel-module-mali/0025-Import-DMA_BUF-module-and-update-register_shrinker-f.patch index f3bcd4f1..eb5406f4 100644 --- a/meta-xilinx-core/recipes-graphics/mali/kernel-module-mali/0025-Import-DMA_BUF-module-and-update-register_shrinker-f.patch +++ b/meta-xilinx-core/recipes-graphics/mali/kernel-module-mali/0025-Import-DMA_BUF-module-and-update-register_shrinker-f.patch | |||
| @@ -23,7 +23,7 @@ index fcdcaac..72e28a8 100644 | |||
| 23 | #include "mali_memory_virtual.h" | 23 | #include "mali_memory_virtual.h" |
| 24 | #include "mali_pp_job.h" | 24 | #include "mali_pp_job.h" |
| 25 | 25 | ||
| 26 | +#if LINUX_VERSION_CODE > KERNEL_VERSION(5, 15, 0) | 26 | +#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 16, 0) |
| 27 | +MODULE_IMPORT_NS(DMA_BUF); | 27 | +MODULE_IMPORT_NS(DMA_BUF); |
| 28 | +#endif | 28 | +#endif |
| 29 | + | 29 | + |
| @@ -38,7 +38,7 @@ index 7de3920..5bf08f8 100644 | |||
| 38 | dma_set_attr(DMA_ATTR_WRITE_COMBINE, &dma_attrs_wc); | 38 | dma_set_attr(DMA_ATTR_WRITE_COMBINE, &dma_attrs_wc); |
| 39 | #endif | 39 | #endif |
| 40 | 40 | ||
| 41 | +#if LINUX_VERSION_CODE > KERNEL_VERSION(5, 15, 0) | 41 | +#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 16, 0) |
| 42 | + register_shrinker(&mali_mem_os_allocator.shrinker, "mali"); | 42 | + register_shrinker(&mali_mem_os_allocator.shrinker, "mali"); |
| 43 | +#else | 43 | +#else |
| 44 | register_shrinker(&mali_mem_os_allocator.shrinker); | 44 | register_shrinker(&mali_mem_os_allocator.shrinker); |
| @@ -55,7 +55,7 @@ index cebd1c8..a9d932f 100644 | |||
| 55 | #endif | 55 | #endif |
| 56 | #include <linux/dma-buf.h> | 56 | #include <linux/dma-buf.h> |
| 57 | 57 | ||
| 58 | +#if LINUX_VERSION_CODE > KERNEL_VERSION(5, 15, 0) | 58 | +#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 16, 0) |
| 59 | +MODULE_IMPORT_NS(DMA_BUF); | 59 | +MODULE_IMPORT_NS(DMA_BUF); |
| 60 | +#endif | 60 | +#endif |
| 61 | + | 61 | + |