opencv: Follow IMXGPU_OPENCL_PROVIDER for OpenCL support

OpenCL was enabled for every i.MX GPU but i.MX 8M Mini. On i.MX 7ULP
the Vivante driver has no OpenCL either, and on i.MX 95 the Mali GPU
relies on the standard ICD loader, which requires the opencl distro
feature; without it virtual/libopencl1 has no provider and opencv
cannot be built.

Enable OpenCL on Vivante GPUs only when IMXGPU_OPENCL_PROVIDER is
set, which covers the i.MX 8M Mini case without a SoC-specific
override, and on other GPUs only when the opencl distro feature is
enabled.

Tested with 'bitbake -n opencv' for imx7ulpevk, imx8mm-lpddr4-evk,
imx8mp-lpddr4-evk, imx8mq-evk and imx95-19x19-verdin, with and without
the opencl distro feature.

Reported-by: Francesco Dolcini <francesco.dolcini@toradex.com>
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
(cherry picked from commit 6fba0d2cc3f6142d13ecc98ac443a83cbf674dc6)

1 files changed, 5 insertions, 2 deletions

diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/opencv_4.13.0.imx.inc b/dynamic-layers/openembedded-layer/recipes-support/opencv/opencv_4.13.0.imx.inc
index 10d7fccfd..9e74337f9 100644
--- a/dynamic-layers/openembedded-layer/recipes-support/opencv/opencv_4.13.0.imx.inc
+++ b/dynamic-layers/openembedded-layer/recipes-support/opencv/opencv_4.13.0.imx.inc
@@ -61,9 +61,12 @@ PACKAGECONFIG:append = " \
     ${PACKAGECONFIG_OPENCL} \
 "
 
+# Vivante GPUs use OpenCL only when their driver provides it (see
+# IMXGPU_OPENCL_PROVIDER), other GPUs rely on the standard ICD loader, which
+# needs the opencl distro feature.
 PACKAGECONFIG_OPENCL = ""
-PACKAGECONFIG_OPENCL:imxgpu = "opencl"
-PACKAGECONFIG_OPENCL:mx8mm-nxp-bsp = ""
+PACKAGECONFIG_OPENCL:imxgpu = "${@bb.utils.filter('DISTRO_FEATURES', 'opencl', d)}"
+PACKAGECONFIG_OPENCL:imxviv = "${@oe.utils.ifelse(d.getVar('IMXGPU_OPENCL_PROVIDER'), 'opencl', '')}"
 
 PACKAGECONFIG[openvx] = "-DWITH_OPENVX=ON -DOPENVX_ROOT=${STAGING_LIBDIR} -DOPENVX_LIB_CANDIDATES='OpenVX;OpenVXU',-DWITH_OPENVX=OFF,virtual/libopenvx,"
 PACKAGECONFIG[qt5] = "-DWITH_QT=ON -DOE_QMAKE_PATH_EXTERNAL_HOST_BINS=${STAGING_BINDIR_NATIVE} -DCMAKE_PREFIX_PATH=${STAGING_BINDIR_NATIVE}/cmake,-DWITH_QT=OFF,qtbase qtbase-native,"