diff mbox series

[v3,2/2] linux-firmware: restore qcom/vpu-1.0/venus.mdt compatibility symlink

Message ID 20240828061937.410739-2-dmitry.baryshkov@linaro.org
State Accepted, archived
Commit e84b673b5788d1eeadf49c009cf58feebfcedede
Headers show
Series [v3,1/2] linux-firmware: package qcom-vpu firmware | expand

Commit Message

Dmitry Baryshkov Aug. 28, 2024, 6:19 a.m. UTC 
The commit [1] has dropped the qcom/vpu-1.0/venus.mdt symlink which is
required for the kernels before 6.6. Pick up a patch restoring this
symlink.

[1] https://gitlab.com/kernel-firmware/linux-firmware/-/commit/36db650dae038be945fb04def591fc726255b09f

Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
---
 ...-compatibility-with-kernels-before-6.patch | 35 +++++++++++++++++++
 .../linux-firmware/linux-firmware_20240811.bb |  3 +-
 2 files changed, 37 insertions(+), 1 deletion(-)
 create mode 100644 meta/recipes-kernel/linux-firmware/linux-firmware/0001-qcom-vpu-restore-compatibility-with-kernels-before-6.patch
diff mbox series

Patch

diff --git a/meta/recipes-kernel/linux-firmware/linux-firmware/0001-qcom-vpu-restore-compatibility-with-kernels-before-6.patch b/meta/recipes-kernel/linux-firmware/linux-firmware/0001-qcom-vpu-restore-compatibility-with-kernels-before-6.patch
new file mode 100644
index 000000000000..b1cb5d1f0bea
--- /dev/null
+++ b/meta/recipes-kernel/linux-firmware/linux-firmware/0001-qcom-vpu-restore-compatibility-with-kernels-before-6.patch
@@ -0,0 +1,35 @@ 
+From 4728fcc52fdf311048f41766aa27cdf5a4a9e7ad Mon Sep 17 00:00:00 2001
+From: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
+Date: Wed, 28 Aug 2024 09:01:14 +0300
+Subject: [PATCH] qcom: vpu: restore compatibility with kernels before 6.6
+
+Linux kernels before 6.6 used qcom/vpu-1.0/venus.mdt as a firmware
+filename for Qualcomm SM8250 devices. Commit 36db650dae03 ("qcom: update
+path for video firmware for vpu-1/2/3.0") moved the VPU firmware, added
+the venus.mbn compatibility symlink, but at the same time it dropped
+the venus.mdt symlink. Bring the historical name back to restore
+compatibility with kernels older than 6.6.
+
+Fixes: 36db650dae03 ("qcom: update path for video firmware for vpu-1/2/3.0")
+Cc: Dikshita Agarwal <quic_dikshita@quicinc.com>
+Upstream-Status: Submitted [https://lore.kernel.org/linux-firmware/20240828060831.34519-1-dmitry.baryshkov@linaro.org]
+Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
+---
+ WHENCE | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/WHENCE b/WHENCE
+index 06c3c6fff673..4d9cd340a9dd 100644
+--- a/WHENCE
++++ b/WHENCE
+@@ -5974,6 +5974,7 @@ Version: VIDEO.VE.6.0-00049-PROD-1
+ 
+ File: qcom/vpu/vpu20_p4.mbn
+ Link: qcom/vpu-1.0/venus.mbn -> ../vpu/vpu20_p4.mbn
++Link: qcom/vpu-1.0/venus.mdt -> ../vpu/vpu20_p4.mbn
+ 
+ Version: VIDEO.VPU.1.0-00087-PROD-1
+ 
+-- 
+2.45.2
+
diff --git a/meta/recipes-kernel/linux-firmware/linux-firmware_20240811.bb b/meta/recipes-kernel/linux-firmware/linux-firmware_20240811.bb
index 3128fc3a4e8e..7a9c2b2b238a 100644
--- a/meta/recipes-kernel/linux-firmware/linux-firmware_20240811.bb
+++ b/meta/recipes-kernel/linux-firmware/linux-firmware_20240811.bb
@@ -156,7 +156,7 @@  LIC_FILES_CHKSUM = "file://LICENCE.Abilis;md5=b5ee3f410780e56711ad48eadc22b8bc \
                     "
 # WHENCE checksum is defined separately to ease overriding it if
 # class-devupstream is selected.
-WHENCE_CHKSUM  = "60b5abcc986d1660637e913a87e1413c"
+WHENCE_CHKSUM  = "5d402bd7c43dd2c2835b81bf872aa127"
 
 # These are not common licenses, set NO_GENERIC_LICENSE for them
 # so that the license files will be copied from fetched source
@@ -237,6 +237,7 @@  PE = "1"
 
 SRC_URI = "\
   ${KERNELORG_MIRROR}/linux/kernel/firmware/${BPN}-${PV}.tar.xz \
+  file://0001-qcom-vpu-restore-compatibility-with-kernels-before-6.patch \
 "
 
 BBCLASSEXTEND = "devupstream:target"