From 796f3e9f90e76c21ec0603a366e767a51574158b Mon Sep 17 00:00:00 2001 From: Carlos Rafael Giani Date: Sun, 18 Oct 2020 13:48:29 +0200 Subject: libimxdmabuffer: Fix allocator packageconfigs for mx8qm and mx8qxp SoCs The i.MX8 QuadMax and QuadXPlus SoCs can use the ION allocator. Also, if there is a DPU, then G2D will be emulated via the DPU. However, the emulation's allocation functions are broken, so disable the G2D allocator then. Signed-off-by: Carlos Rafael Giani --- recipes-bsp/libimxdmabuffer/libimxdmabuffer_1.0.1.bb | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/recipes-bsp/libimxdmabuffer/libimxdmabuffer_1.0.1.bb b/recipes-bsp/libimxdmabuffer/libimxdmabuffer_1.0.1.bb index 20b1ec13..c1228b4d 100644 --- a/recipes-bsp/libimxdmabuffer/libimxdmabuffer_1.0.1.bb +++ b/recipes-bsp/libimxdmabuffer/libimxdmabuffer_1.0.1.bb @@ -22,11 +22,19 @@ EXTRA_OECONF = "--imx-linux-headers-path=${STAGING_INCDIR_IMX} \ --libdir=${libdir} \ ${PACKAGECONFIG_CONFARGS}" +# If imxdpu is in use, the DPU is also used for implementing +# libg2d. However, that implementation's g2d_alloc() function +# is broken, so we cannot use it. +LIBG2D_PACKAGECONFIG = "g2d" +LIBG2D_PACKAGECONFIG_imxdpu = "" + PACKAGECONFIG ?= " " -PACKAGECONFIG_append_imxgpu2d = " g2d" +PACKAGECONFIG_append_imxgpu2d = " ${LIBG2D_PACKAGECONFIG}" PACKAGECONFIG_append_imxipu = " ipu" PACKAGECONFIG_append_imxpxp = " pxp" -PACKAGECONFIG_append_mx8m = " dwl ion" +PACKAGECONFIG_append_mx8m = " ion dwl" +PACKAGECONFIG_append_mx8qm = " ion" +PACKAGECONFIG_append_mx8qxp = " ion" HANTRO_CONF = "--hantro-headers-path=${STAGING_INCDIR}/hantro_dec --hantro-decoder-version=G2" -- cgit v1.2.3-54-g00ecf