From 76f274063363f79c467c16452d0f1275f1d783c3 Mon Sep 17 00:00:00 2001 From: Gary Bisson Date: Wed, 16 Nov 2022 10:12:48 +0100 Subject: [PATCH] package/freescale-imx/imx-vpu-hantro: bump version to 1.27.0 - Same version as NXP release 5.15.52_2.1.0 - EULA/COPYING: update to LA_OPT_NXP_Software_License v39 - No official changelog but the main addition is the support of skipped h.264 frames - Add patch to fix kernel version test from the package - Yocto doesn't need that workaround as it installs the kernel headers - This is needed for NXP 5.15+ kernels (using DMABUF) Signed-off-by: Gary Bisson Signed-off-by: Thomas Petazzoni --- ...0003-Fix-Linux-kernel-version-header.patch | 45 +++++++++++++++++++ .../imx-vpu-hantro/imx-vpu-hantro.hash | 6 +-- .../imx-vpu-hantro/imx-vpu-hantro.mk | 2 +- 3 files changed, 49 insertions(+), 4 deletions(-) create mode 100644 package/freescale-imx/imx-vpu-hantro/0003-Fix-Linux-kernel-version-header.patch diff --git a/package/freescale-imx/imx-vpu-hantro/0003-Fix-Linux-kernel-version-header.patch b/package/freescale-imx/imx-vpu-hantro/0003-Fix-Linux-kernel-version-header.patch new file mode 100644 index 0000000000..427ebeb38a --- /dev/null +++ b/package/freescale-imx/imx-vpu-hantro/0003-Fix-Linux-kernel-version-header.patch @@ -0,0 +1,45 @@ +From 73cd57c18066ff863335a8616d0b348541d26118 Mon Sep 17 00:00:00 2001 +From: Gary Bisson +Date: Tue, 15 Nov 2022 21:43:47 +0100 +Subject: [PATCH] Fix Linux kernel version header + +- Up to kernel 5.10, NXP was using ION for memory management +- Starting with 5.15 kernels, NXP uses DMABUF and the ION header is no + longer in the kernel +- So keep the previous patch for people using kernel <= 5.10 +- Add path to the version.h header as imx-vpu-hantro will only include + ion.h depending on the kernel version + +Signed-off-by: Gary Bisson +--- + Makefile_G1G2 | 1 + + Makefile_H1 | 1 + + 2 files changed, 2 insertions(+) + +diff --git a/Makefile_G1G2 b/Makefile_G1G2 +index 25884fa..8e03e91 100755 +--- a/Makefile_G1G2 ++++ b/Makefile_G1G2 +@@ -11,6 +11,7 @@ INCLUDE_HEADERS = -I./decoder_sw -I$(SOURCE_ROOT)/source/inc -I$(SOURCE_ROOT)/so + INCLUDE_HEADERS += -I$(SOURCE_ROOT)/linux/memalloc + #INCLUDE_HEADERS += -I$(SOURCE_ROOT)/linux/ldriver + INCLUDE_HEADERS += -I$(LINUX_KERNEL_ROOT)/include/uapi -I$(LINUX_KERNEL_ROOT)/include ++INCLUDE_HEADERS += -I$(LINUX_KERNEL_ROOT)/include/generated/uapi + INCLUDE_HEADERS += -I$(LINUX_KERNEL_ROOT)/drivers/staging/android/uapi + + CFLAGS += -DDEC_MODULE_PATH=\"/dev/mxc_hantro\" -DUSE_FAKE_RFC_TABLE -DFIFO_DATATYPE=void* -DNDEBUG -DDOWN_SCALER \ +diff --git a/Makefile_H1 b/Makefile_H1 +index 479940a..7ac6f8d 100755 +--- a/Makefile_H1 ++++ b/Makefile_H1 +@@ -18,6 +18,7 @@ ENV = -DENC_MODULE_PATH=\\\"/dev/mxc_hantro_h1\\\" + ENV += -DEWL_NO_HW_TIMEOUT + ENV += -DUSE_ION + ENV += -I$(LINUX_KERNEL_ROOT)/include/uapi -I$(LINUX_KERNEL_ROOT)/include ++ENV += -I$(LINUX_KERNEL_ROOT)/include/generated/uapi + ENV += -I$(LINUX_KERNEL_ROOT)/drivers/staging/android/uapi + + ifeq ($(CFG_SECURE_DATA_PATH), y) +-- +2.35.1 + diff --git a/package/freescale-imx/imx-vpu-hantro/imx-vpu-hantro.hash b/package/freescale-imx/imx-vpu-hantro/imx-vpu-hantro.hash index dd3b167e3e..637d7898cf 100644 --- a/package/freescale-imx/imx-vpu-hantro/imx-vpu-hantro.hash +++ b/package/freescale-imx/imx-vpu-hantro/imx-vpu-hantro.hash @@ -1,4 +1,4 @@ # Locally computed: -sha256 03c61dfb268b31a0d25a4d1387cb3ad0261029ad5de801f72224602e2b37da00 imx-vpu-hantro-1.22.0.bin -sha256 ea58636bf34f589048fcd46e38497c47229fde8498df086ff5fb52f9ef8e15ee COPYING -sha256 50099e283cfd307f84f159aeb1a6f462351320273dbcdb80d7f2c9db0494b71c EULA +sha256 7e9bcdbd067ce66a1247373cbf088945346feb0027deb61af541ebc1256277c3 imx-vpu-hantro-1.27.0.bin +sha256 5bd7aab9dc380a6f9577443b2e90bd5ca73d9528175fad04b6d17da43a05a48e COPYING +sha256 654f0c4ce6d08f9a6d74e29c58206742cb7469a6a7c25413028a9bdbe647aa13 EULA diff --git a/package/freescale-imx/imx-vpu-hantro/imx-vpu-hantro.mk b/package/freescale-imx/imx-vpu-hantro/imx-vpu-hantro.mk index 9d34c7add7..4cfc8f41ff 100644 --- a/package/freescale-imx/imx-vpu-hantro/imx-vpu-hantro.mk +++ b/package/freescale-imx/imx-vpu-hantro/imx-vpu-hantro.mk @@ -4,7 +4,7 @@ # ################################################################################ -IMX_VPU_HANTRO_VERSION = 1.22.0 +IMX_VPU_HANTRO_VERSION = 1.27.0 IMX_VPU_HANTRO_SITE = $(FREESCALE_IMX_SITE) IMX_VPU_HANTRO_SOURCE = imx-vpu-hantro-$(IMX_VPU_HANTRO_VERSION).bin IMX_VPU_HANTRO_DEPENDENCIES = linux