imx-gpu-viv: add G2D libs and GPU tools selection
PATCH 1/1 imx-gpu-viv: add G2D libs and GPU tools selection
GPU package now includes libraries for GPU2D as well as several tools to monitor and debug the GPUs.
GPU2D libraries have been tested with the example provided in the package:
# /usr/share/examples/fsl-samples/g2d/overlay_test/g2d_overlay_test Overlay rendering time 53861us .
The tools have been tested with the following commands:
# cd /usr/share/examples/viv_samples/vdk/ # apitrace trace --api egl ./tutorial7 & # gmem_info ... display memory use per PID ... # killall tutorial7 #?apitrace replay tutorial7.trace #?eglretrace tutorial7.trace
---
Hi all,
This patch adds the selection for several GPU tools as well as the GPU2D libraries. Those tools/libs have been available in Vivante package since the 3.10.53 update but I didn't take the time to look at it before.
Let me know what you think of it.
Regards,
Gary
--- package/freescale-imx/imx-gpu-viv/Config.in | 22 +++++++++++++++ package/freescale-imx/imx-gpu-viv/imx-gpu-viv.mk | 36 ++++++++++++++++++++++++ 2 files changed, 58 insertions(+)
package/freescale-imx/imx-gpu-viv/Config.in +22 -0
@@ -58,6 +58,17 @@ config BR2_PACKAGE_PROVIDES_LIBGLES config BR2_PACKAGE_PROVIDES_LIBOPENVG default "imx-gpu-viv" +config BR2_PACKAGE_IMX_GPU_VIV_APITRACE + bool "install apitrace tools" + # runtime dependency + select BR2_PACKAGE_IMX_GPU_VIV_G2D + help + Copy the apitrace tool to the target. Apitrace consists + of a set of tools to trace, replay and/or inspect OpenGL, + OpenGL ES APIs calls + + http://apitrace.github.io/ + config BR2_PACKAGE_IMX_GPU_VIV_EXAMPLES bool "install examples" help
@@ -65,4 +76,15 @@ config BR2_PACKAGE_IMX_GPU_VIV_EXAMPLES Warning: examples take approximately 150 MB of disk space. +config BR2_PACKAGE_IMX_GPU_VIV_G2D + bool "install G2D libraries" + help + Copy the GPU2D libraries to the target. + +config BR2_PACKAGE_IMX_GPU_VIV_GMEM_INFO + bool "install gmem_info tool" + help + Copy the gmem_info tool to the target which provides + information about GPU memory consumption. + endif
package/freescale-imx/imx-gpu-viv/imx-gpu-viv.mk +36 -0
@@ -62,9 +62,16 @@ define IMX_GPU_VIV_FIXUP_FB_HEADERS endef endif +ifeq ($(BR2_PACKAGE_IMX_GPU_VIV_G2D),y) +define IMX_GPU_VIV_INSTALL_G2D_STAGING + cp -r $(@D)/g2d/usr/* $(STAGING_DIR)/usr +endef +endif + define IMX_GPU_VIV_INSTALL_STAGING_CMDS cp -r $(@D)/gpu-core/usr/* $(STAGING_DIR)/usr $(IMX_GPU_VIV_FIXUP_FB_HEADERS) + $(IMX_GPU_VIV_INSTALL_G2D_STAGING) for lib in egl glesv2 vg; do \ $(INSTALL) -m 0644 -D \ $(@D)/gpu-core/usr/lib/pkgconfig/$${lib}.pc \
@@ -72,6 +79,20 @@ define IMX_GPU_VIV_INSTALL_STAGING_CMDS done endef +ifeq ($(BR2_PACKAGE_IMX_GPU_VIV_APITRACE),y) +ifeq ($(IMX_GPU_VIV_LIB_TARGET),x11) +define IMX_GPU_VIV_INSTALL_APITRACE + cp -a $(@D)/apitrace/x11/usr/bin $(TARGET_DIR)/usr + cp -a $(@D)/apitrace/x11/usr/lib $(TARGET_DIR)/usr +endef +else +define IMX_GPU_VIV_INSTALL_APITRACE + cp -a $(@D)/apitrace/non-x11/usr/bin $(TARGET_DIR)/usr + cp -a $(@D)/apitrace/non-x11/usr/lib $(TARGET_DIR)/usr +endef +endif +endif + ifeq ($(BR2_PACKAGE_IMX_GPU_VIV_EXAMPLES),y) define IMX_GPU_VIV_INSTALL_EXAMPLES mkdir -p $(TARGET_DIR)/usr/share/examples/
@@ -79,11 +100,26 @@ define IMX_GPU_VIV_INSTALL_EXAMPLES endef endif +ifeq ($(BR2_PACKAGE_IMX_GPU_VIV_G2D),y) +define IMX_GPU_VIV_INSTALL_G2D + cp -a $(@D)/g2d/usr/lib $(TARGET_DIR)/usr +endef +endif + +ifeq ($(BR2_PACKAGE_IMX_GPU_VIV_GMEM_INFO),y) +define IMX_GPU_VIV_INSTALL_GMEM_INFO + cp -a $(@D)/gpu-tools/gmem-info/usr/bin $(TARGET_DIR)/usr +endef +endif + # On the target, remove the unused libraries. # Note that this is _required_, else ldconfig may create symlinks # to the wrong library define IMX_GPU_VIV_INSTALL_TARGET_CMDS + $(IMX_GPU_VIV_INSTALL_APITRACE) $(IMX_GPU_VIV_INSTALL_EXAMPLES) + $(IMX_GPU_VIV_INSTALL_G2D) + $(IMX_GPU_VIV_INSTALL_GMEM_INFO) cp -a $(@D)/gpu-core/usr/lib $(TARGET_DIR)/usr for lib in EGL GAL VIVANTE GLESv2; do \ for f in $(TARGET_DIR)/usr/lib/lib$${lib}-*.so; do \
Signature · 1 line
2.5.1
PATCH 1/1 imx-gpu-viv: add G2D libs and GPU tools selection
Gary,
I've applied your patch, but did a few changes before (see below for details).
package/freescale-imx/imx-gpu-viv/Config.in config BR2_PACKAGE_PROVIDES_LIBGLES · line 63
Quoted 3 lines · Gary Bisson
package/freescale-imx/imx-gpu-viv/Config.in +3
-0+config BR2_PACKAGE_IMX_GPU_VIV_APITRACE + bool "install apitrace tools" + # runtime dependency
Indicating "runtime dependency" here is useless. This is only useful if you depend on another package that you "select" from a Config.in point of view, but that you don't need to have in the <pkg>_DEPENDENCIES.
Here, you're selecting a Config.in symbol from the same package, so indicating "runtime dependency" is not needed.
package/freescale-imx/imx-gpu-viv/imx-gpu-viv.mk define IMX_GPU_VIV_FIXUP_FB_HEADERS · line 67
Quoted 11 lines
package/freescale-imx/imx-gpu-viv/imx-gpu-viv.mk +3
-0@@ -62,9 +62,16 @@ define IMX_GPU_VIV_FIXUP_FB_HEADERS endef endif +ifeq ($(BR2_PACKAGE_IMX_GPU_VIV_G2D),y) +define IMX_GPU_VIV_INSTALL_G2D_STAGING + cp -r $(@D)/g2d/usr/* $(STAGING_DIR)/usr
I didn't really like these installation logic that installs "all" directories, and I've replaced with the more explicit:
+ cp -dpfr $(@D)/g2d/usr/include/* $(STAGING_DIR)/usr/include/
+ cp -dpfr $(@D)/g2d/usr/lib/* $(STAGING_DIR)/usr/lib/
Note that I have also changed the 'cp -r' and 'cp -a' to 'cp -dpfr' which is the idiomatic way in Buildroot of doing a recursive copy that preserve symlinks and al.
See
http://git.buildroot.net/buildroot/commit/?id=f640a6659f6c5f9c99684a98de006bbccfded128
for the final commit.
Thanks!
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons Embedded Linux, Kernel and Android engineering http://free-electrons.com