update to Starfive 3.0.4 release and bump Star64 Kernel to 5.15.115

conf/machine/JH7110.inc

@@ -22,6 +22,14 @@ PREFERRED_PROVIDER_virtual/libgles1 ?= "visionfive2-pvr-graphics"
 PREFERRED_PROVIDER_virtual/libgles2 ?= "visionfive2-pvr-graphics"
 PREFERRED_PROVIDER_virtual/libgles3 ?= "mesa-pvr"
 PREFERRED_PROVIDER_virtual/libomxil ?= "libsf-omxil"
+PREFERRED_PROVIDER_virtual/opencl-icd ?= "visionfive2-pvr-graphics"
+PREFERRED_PROVIDER_opencl-headers ?= "visionfive2-pvr-graphics"
+
+#Mask out these recipes as the visionfive2-pvr-graphics provides them
+BBMASK:append = " \
+    meta-oe/recipes-core/opencl/opencl-icd-loader_git.bb \
+    meta-oe/recipes-core/opencl/opencl-headers_git.bb \
+"
 
 PREFERRED_VERSION_openocd-native = "riscv"
 PREFERRED_VERSION_openocd = "riscv"

recipes-bsp/common/visionfive2-firmware.inc

@@ -1,6 +1,6 @@
 VISIONFIVE2FW_DATE ?= "20230320"
-# VF2_v2.11.5
+# VF2_v3.0.4 - minus the gcc 12.2 updates 
-SRC_URI += "git://github.com/starfive-tech/soft_3rdpart.git;protocol=https;lfs=1;branch=JH7110_VisionFive2_devel;rev=cd7b50cd9f9eca66c23ebd19f06a172ce0be591f"
+SRC_URI += "git://github.com/starfive-tech/soft_3rdpart.git;protocol=https;lfs=1;branch=JH7110_VisionFive2_devel;rev=d029d9650e584667af013d867f5fa59599e817fa"
 HOMEPAGE ?= "https://github.com/starfive-tech/soft_3rdpart"
 
 PV ?= "${VISIONFIVE2FW_DATE}"

recipes-graphics/drivers/visionfive2-pvr-graphics_1.17.bb

@@ -3,7 +3,13 @@ LICENSE="CLOSED"
 PROVIDES = " \
     virtual/libgles2 \
     virtual/libgles1 \
+    virtual/opencl-icd \
+    virtual/opencl-headers \
+    opencl-icd-loader \
+    opencl-headers \
 "
+#RPROVIDES:${PN} = "virtual/opencl-icd"
+
 COMPATIBLE_MACHINE = "jh7110"
 
 require recipes-bsp/common/visionfive2-firmware.inc
@@ -22,10 +28,12 @@ do_install () {
     tar xz --no-same-owner -f ${S}/IMG_GPU/out/${IMG_GPU_POWERVR_VERSION}.tar.gz -C ${D}
     mv ${D}/${IMG_GPU_POWERVR_VERSION}/target/* ${D}
     install -d ${D}/usr/include/
+    cp -r ${D}/${IMG_GPU_POWERVR_VERSION}/staging/usr/include/CL ${D}/usr/include/
     cp -r ${D}/${IMG_GPU_POWERVR_VERSION}/staging/usr/include/drv/ ${D}/usr/include/
     cp -r ${D}/${IMG_GPU_POWERVR_VERSION}/staging/usr/include/GLES/ ${D}/usr/include/
     cp -r ${D}/${IMG_GPU_POWERVR_VERSION}/staging/usr/include/GLES2/ ${D}/usr/include/
     cp -r ${D}/${IMG_GPU_POWERVR_VERSION}/staging/usr/include/GLES3/ ${D}/usr/include/
+    cp -r ${D}/${IMG_GPU_POWERVR_VERSION}/staging/usr/include/spirv/ ${D}/usr/include/
     install -d ${D}/usr/lib/pkgconfig/
     cp -r ${D}/${IMG_GPU_POWERVR_VERSION}/staging/usr/lib/pkgconfig/* ${D}/usr/lib/pkgconfig/
 
@@ -52,9 +60,12 @@ FILES:${PN}-firmware = " \
     ${base_libdir}/firmware/ \
 "
 
+DEPENDS += " \
+    libdrm \
+"
+
 RDEPENDS:${PN} += " \
     bash \
-    libdrm \
     linux-firmware-visionfive2-imggpu \
 "
 

recipes-kernel/linux/linux-starfive-dev.bb

@@ -9,8 +9,8 @@ SRCREV = "${AUTOREV}"
 
 # pin srcrev for now to have a fixed target
 # release VF2_v2.11.5
-SRCREV:visionfive2 = "a87c6861c6d96621026ee53b94f081a1a00a4cc7"
+SRCREV:visionfive2 = "d9eee31aaec51ade1641391836c1f07dd2151a4a"
-SRCREV:star64 = "7943fd6427b0abd25e1af2756e061a112bde8711"
+SRCREV:star64 = "f491ff412831be64515917b9b42911ae4defb0d0"
 
 BRANCH = "visionfive"
 BRANCH:visionfive2 = "JH7110_VisionFive2_devel"
@@ -38,7 +38,7 @@ SRC_URI:append:jh7110 = " \
 
 LINUX_VERSION ?= "6.2.0"
 LINUX_VERSION:visionfive2 = "5.15.0"
-LINUX_VERSION:star64 = "5.15.107"
+LINUX_VERSION:star64 = "5.15.115"
 LINUX_VERSION_EXTENSION:append:beaglev-starlight-jh7100 = "-starlight"
 
 KBUILD_DEFCONFIG:beaglev-starlight-jh7100 = "starfive_jh7100_fedora_defconfig"

recipes-multimedia/vpu/libsf-omxil.bb

@@ -15,9 +15,9 @@ SOLIBS = ".so"
 FILES_SOLIBSDEV = ""
 INSANE_SKIP:${PN} += "dev-so"
 
-SRC_URI += " \
+SRC_URI += "file://CMakeLists.txt;subdir=git/omx-il \
-     file://CMakeLists.txt;subdir=git/omx-il \
+           file://0001-OMX-Fix-decoder-will-being-stuck-at-OMX_FreeHandle-a.patch;patchdir=.. \
-"
+           "
 
 S = "${WORKDIR}/git/omx-il"
 

recipes-multimedia/vpu/libsf-omxil/0001-OMX-Fix-decoder-will-being-stuck-at-OMX_FreeHandle-a.patch

@@ -0,0 +1,23 @@
+From f1732aad6f1ac5f9766c5a17913659f00cc76ffe Mon Sep 17 00:00:00 2001
+From: Som Qin <som.qin@starfivetech.com>
+Date: Tue, 23 May 2023 15:13:07 +0800
+Subject: [PATCH] OMX: Fix decoder will being stuck at OMX_FreeHandle after
+ decode done
+
+Signed-off-by: Som Qin <som.qin@starfivetech.com>
+---
+ omx-il/component/video/wave5/dec/SF_OMX_Vdec_decoder.c | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/omx-il/component/video/wave5/dec/SF_OMX_Vdec_decoder.c b/omx-il/component/video/wave5/dec/SF_OMX_Vdec_decoder.c
+index 3c31da8..8fe2145 100644
+--- a/omx-il/component/video/wave5/dec/SF_OMX_Vdec_decoder.c
++++ b/omx-il/component/video/wave5/dec/SF_OMX_Vdec_decoder.c
+@@ -2169,7 +2169,6 @@ static OMX_ERRORTYPE SF_OMX_ComponentClear(SF_OMX_COMPONENT *pSfOMXComponent)
+     /* enqueue DEC_StopThread mean cmd thread cycle end */
+     cmd.Cmd = DEC_StopThread;
+     SF_Queue_Enqueue(pSfVideoImplement->CmdQueue, &cmd);
+-    pthread_cancel(pSfVideoImplement->pCmdThread->pthread);
+ 	pthread_join(pSfVideoImplement->pCmdThread->pthread, &ThreadRet);
+     LOG(SF_LOG_INFO, "Cmd thread end %ld\r\n", (Uint64)ThreadRet);
+     SF_Queue_Destroy(pSfVideoImplement->CmdQueue);