From patchwork Fri Jan 5 14:39:36 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gary Bisson X-Patchwork-Id: 856067 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=busybox.net (client-ip=140.211.166.138; helo=whitealder.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=boundarydevices-com.20150623.gappssmtp.com header.i=@boundarydevices-com.20150623.gappssmtp.com header.b="E1GWlLJt"; dkim-atps=neutral Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3zCnQ44ZyPz9sNr for ; Sat, 6 Jan 2018 01:40:12 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id A364B89CC3; Fri, 5 Jan 2018 14:40:09 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id a6Ywuqh7nI0l; Fri, 5 Jan 2018 14:40:06 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id 6DF4389CBA; Fri, 5 Jan 2018 14:40:06 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id 017D11BFF0C for ; Fri, 5 Jan 2018 14:40:04 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id E221F30A56 for ; Fri, 5 Jan 2018 14:40:03 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Cg4W0fpIoK99 for ; Fri, 5 Jan 2018 14:40:01 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from mail-lf0-f54.google.com (mail-lf0-f54.google.com [209.85.215.54]) by silver.osuosl.org (Postfix) with ESMTPS id CFB6F30A54 for ; Fri, 5 Jan 2018 14:40:00 +0000 (UTC) Received: by mail-lf0-f54.google.com with SMTP id y71so5333757lfd.12 for ; Fri, 05 Jan 2018 06:40:00 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=boundarydevices-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=mcTenixaZmk8MzJ/FOS1E/b+I5kpNyQ2EAKvTXyAi3o=; b=E1GWlLJtiUz+0I92FdanZcugKIlJEJpZHHl76Hc8rgb/yEEhZ+XnqfyXjTVFIsL73a N1FgU9U+RmROC4Fvt3SaiNhUQAKmaJDAGadkN7hHkfZ3HGIs983S7R/LBB0NIP5CWk19 KiUWeu08eXiC6+Doegp270i+t/D7FWZQBQDEe7w4ITHRnsCQaEP0cpHG1XlaI6ZLgwsu mHDGBae5sDBagYyqA9R85peuyBo8M214Cd6xSMkhZl+4GyCMWjBQWTMp3uA/HbB3x6mA +WjBkTF1sRTXv2ocCpiWTPoRfBkeMplnIXaRv/mPnRIw6kpLaF5V5oc5njwDXqkjSpmb hBzA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=mcTenixaZmk8MzJ/FOS1E/b+I5kpNyQ2EAKvTXyAi3o=; b=nl+fml6QfkuqEuEYagyb7GaJLO8e2zom5QPNSpZdVHlG0PTdl6MlODmzNoXAy8c2hw w8D9Ict9D7+HLXBPIGrz/aRrnbp5I5Mehwthc2NuEGJqFH043yvZUGDa/ZRaU1Gcx9qh T/RVAqWsuLFTyjcgjSKXKtKwf9U3XqLV+eMv3DnxAjfHkw8zhDx45OhnRr+RmQN+ieQE iSEoTwi3NFAb1+0dIv7psQr26Epwkor9RV+ziC60sykpPj5CH0hN++EC4u42oXbCgW6a ZCpSUfOHU2R94bPaRTZPp7uK1nyA9wEBU9DrBlorxsx1eNqmjmzjtUUEY2UTdIl9xSzX qvWw== X-Gm-Message-State: AKGB3mLyPkIm9cfBBBRLymC2yEuZOKK/4jKWZNVUW0nEkw8ebd2UntBe TuxoEaeqvN+HaJODxxC6KnDFZoqC X-Google-Smtp-Source: ACJfBovGiiAeqxwTCJQ1yz8qQpNKD1L0XSj6XIXZcpJfvswgb2qw7o5ST7NY5CNssZ4HoJLd7Amt5w== X-Received: by 10.46.13.18 with SMTP id 18mr1863339ljn.98.1515163198825; Fri, 05 Jan 2018 06:39:58 -0800 (PST) Received: from t450s.lan (89-92-157-126.hfc.dyn.abo.bbox.fr. [89.92.157.126]) by smtp.googlemail.com with ESMTPSA id i1sm1035158lji.22.2018.01.05.06.39.57 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 05 Jan 2018 06:39:57 -0800 (PST) From: Gary Bisson To: buildroot@buildroot.org Date: Fri, 5 Jan 2018 15:39:36 +0100 Message-Id: <20180105143947.26934-5-gary.bisson@boundarydevices.com> X-Mailer: git-send-email 2.15.1 In-Reply-To: <20180105143947.26934-1-gary.bisson@boundarydevices.com> References: <20180105143947.26934-1-gary.bisson@boundarydevices.com> Subject: [Buildroot] [PATCH v2 04/15] imx-gpu-viv: bump to version 6.2.2.p0 X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.24 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: thomas.petazzoni@free-electrons.com MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" New features: - Added mutex protection for referencing gctSIGNAL in gckOS_MapSignal to fix a MT race issue. - Streamlined GPU address calculation base on MC20 (0/1) and MMU (0/1) combinations. - Fixed multiple Android HWC 2.0 rendering issues. Refined HWC 2.0 driver implementation. - Improved HWC2.0 composition performance by composing damaged regions only. - Enabled offline/online compiler IR assembly dump function for users. - Implemented the direct rendering support (no-resolve) for Wayland platform. - Added EGL_EXT_buffer_age extension for Wayland and fbdev platforms. - Updated wayland-viv protocol to support tile status sync from client to server. - Improved OpenCL 1.2 builtin function support with native GPU instructions. - Enabled OpenCL 1.2 API trace dump function controlled by VIV_TRACE environment variable. - Support for OpenGL4.0 - Cleaned up driver code issues reported by Klocwork and Coverity. Full changelog: http://git.freescale.com/git/cgit.cgi/imx/fsl-arm-yocto-bsp.git/tree/GraphicsChangeLogv6?h=imx-morty Note that the apitrace tool and the G2D libraries are not part of the package any longer. Those will be added as separate packages later on. This package has been tested with both X11 and Framebuffer backends: # cd /usr/share/examples/viv_samples/vdk/ # ./tutorial7 # gmem_info ... display memory use per PID ... Also update packages that depended on g2d libraries to match new package name. Signed-off-by: Gary Bisson --- Changelog v2: - Add missing Config.in.legacy options (Thomas) - Squash gst1-imx changes (Thomas) --- Config.in.legacy | 14 +++++++++ package/freescale-imx/imx-gpu-viv/Config.in | 16 ---------- package/freescale-imx/imx-gpu-viv/imx-gpu-viv.hash | 2 +- package/freescale-imx/imx-gpu-viv/imx-gpu-viv.mk | 36 ++-------------------- package/gstreamer1/gst1-imx/Config.in | 6 ++-- package/gstreamer1/gst1-imx/gst1-imx.mk | 4 +++ 6 files changed, 25 insertions(+), 53 deletions(-) diff --git a/Config.in.legacy b/Config.in.legacy index 1f83c0dfd2..1833c7246b 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -161,6 +161,20 @@ config BR2_PACKAGE_GNUPG2_GPGV2 The gpgv2 executable is now named gpgv. The config option has been renamed accordingly. +config BR2_PACKAGE_IMX_GPU_VIV_APITRACE + bool "Vivante apitrace tool option removed" + select BR2_LEGACY + help + The apitrace tool for Vivante is not provided by the + imx-gpu-viv package any longer. + +config BR2_PACKAGE_IMX_GPU_VIV_G2D + bool "Vivante G2D libraries from imx-gpu-viv removed" + select BR2_LEGACY + select BR2_PACKAGE_IMX_GPU_G2D + help + The G2D libraries are now provided by the imx-gpu-g2d package. + ############################################################################### comment "Legacy options removed in 2017.11" diff --git a/package/freescale-imx/imx-gpu-viv/Config.in b/package/freescale-imx/imx-gpu-viv/Config.in index dba378c2d2..cf58ad475c 100644 --- a/package/freescale-imx/imx-gpu-viv/Config.in +++ b/package/freescale-imx/imx-gpu-viv/Config.in @@ -60,17 +60,6 @@ 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" - select BR2_PACKAGE_IMX_GPU_VIV_G2D - select BR2_PACKAGE_LIBPNG - 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 @@ -78,11 +67,6 @@ 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 diff --git a/package/freescale-imx/imx-gpu-viv/imx-gpu-viv.hash b/package/freescale-imx/imx-gpu-viv/imx-gpu-viv.hash index 6c526c5876..894bc90dae 100644 --- a/package/freescale-imx/imx-gpu-viv/imx-gpu-viv.hash +++ b/package/freescale-imx/imx-gpu-viv/imx-gpu-viv.hash @@ -1 +1 @@ -sha256 caaabd59a259e29aa5b7f9d1d7f3fe71cff9336ba44904485d258baef276351f imx-gpu-viv-5.0.11.p8.6-hfp.bin +sha256 4f93a4412c93ca5959aa2437bfed2ecbaf983b5b272be5977f76a967de5db150 imx-gpu-viv-6.2.2.p0-aarch32.bin diff --git a/package/freescale-imx/imx-gpu-viv/imx-gpu-viv.mk b/package/freescale-imx/imx-gpu-viv/imx-gpu-viv.mk index 961f574c8b..5d3d9c671b 100644 --- a/package/freescale-imx/imx-gpu-viv/imx-gpu-viv.mk +++ b/package/freescale-imx/imx-gpu-viv/imx-gpu-viv.mk @@ -4,7 +4,7 @@ # ################################################################################ -IMX_GPU_VIV_VERSION = 5.0.11.p8.6-hfp +IMX_GPU_VIV_VERSION = 6.2.2.p0-aarch32 IMX_GPU_VIV_SITE = $(FREESCALE_IMX_SITE) IMX_GPU_VIV_SOURCE = imx-gpu-viv-$(IMX_GPU_VIV_VERSION).bin @@ -45,6 +45,7 @@ define IMX_GPU_VIV_BUILD_CMDS ln -sf libGLESv2-$(IMX_GPU_VIV_LIB_TARGET).so $(@D)/gpu-core/usr/lib/libGLESv2.so.2.0.0 ln -sf libVIVANTE-$(IMX_GPU_VIV_LIB_TARGET).so $(@D)/gpu-core/usr/lib/libVIVANTE.so ln -sf libGAL-$(IMX_GPU_VIV_LIB_TARGET).so $(@D)/gpu-core/usr/lib/libGAL.so + ln -sf libVDK-$(IMX_GPU_VIV_LIB_TARGET).so $(@D)/gpu-core/usr/lib/libVDK.so endef ifeq ($(IMX_GPU_VIV_LIB_TARGET),fb) @@ -56,17 +57,9 @@ 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 -dpfr $(@D)/g2d/usr/include/* $(STAGING_DIR)/usr/include/ - cp -dpfr $(@D)/g2d/usr/lib/* $(STAGING_DIR)/usr/lib/ -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 \ @@ -74,21 +67,6 @@ define IMX_GPU_VIV_INSTALL_STAGING_CMDS done endef -ifeq ($(BR2_PACKAGE_IMX_GPU_VIV_APITRACE),y) -IMX_GPU_VIV_DEPENDENCIES += libpng -ifeq ($(IMX_GPU_VIV_LIB_TARGET),x11) -define IMX_GPU_VIV_INSTALL_APITRACE - cp -dpfr $(@D)/apitrace/x11/usr/bin/* $(TARGET_DIR)/usr/bin/ - cp -dpfr $(@D)/apitrace/x11/usr/lib/* $(TARGET_DIR)/usr/lib/ -endef -else -define IMX_GPU_VIV_INSTALL_APITRACE - cp -dpfr $(@D)/apitrace/non-x11/usr/bin/* $(TARGET_DIR)/usr/bin/ - cp -dpfr $(@D)/apitrace/non-x11/usr/lib/* $(TARGET_DIR)/usr/lib/ -endef -endif -endif - ifeq ($(BR2_PACKAGE_IMX_GPU_VIV_EXAMPLES),y) define IMX_GPU_VIV_INSTALL_EXAMPLES mkdir -p $(TARGET_DIR)/usr/share/examples/ @@ -96,12 +74,6 @@ define IMX_GPU_VIV_INSTALL_EXAMPLES endef endif -ifeq ($(BR2_PACKAGE_IMX_GPU_VIV_G2D),y) -define IMX_GPU_VIV_INSTALL_G2D - cp -dpfr $(@D)/g2d/usr/lib/* $(TARGET_DIR)/usr/lib/ -endef -endif - ifeq ($(BR2_PACKAGE_IMX_GPU_VIV_GMEM_INFO),y) define IMX_GPU_VIV_INSTALL_GMEM_INFO cp -dpfr $(@D)/gpu-tools/gmem-info/usr/bin/* $(TARGET_DIR)/usr/bin/ @@ -112,12 +84,10 @@ endif # 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 lib in EGL GAL VIVANTE GLESv2 VDK; do \ for f in $(TARGET_DIR)/usr/lib/lib$${lib}-*.so; do \ case $$f in \ *-$(IMX_GPU_VIV_LIB_TARGET).so) : ;; \ diff --git a/package/gstreamer1/gst1-imx/Config.in b/package/gstreamer1/gst1-imx/Config.in index e4cee05b90..7b46233b53 100644 --- a/package/gstreamer1/gst1-imx/Config.in +++ b/package/gstreamer1/gst1-imx/Config.in @@ -27,12 +27,12 @@ comment "imxeglvivsink needs the Vivante 3D libraries" config BR2_PACKAGE_GST1_IMX_G2D bool "imxg2d" - depends on BR2_PACKAGE_IMX_GPU_VIV_G2D + depends on BR2_PACKAGE_IMX_GPU_G2D help Elements leveraging the 2D GPU -comment "imxg2d needs the Vivante 2D libraries" - depends on !BR2_PACKAGE_IMX_GPU_VIV_G2D +comment "imxg2d needs the G2D libraries" + depends on !BR2_PACKAGE_IMX_GPU_G2D config BR2_PACKAGE_GST1_IMX_IPU bool "imxipu" diff --git a/package/gstreamer1/gst1-imx/gst1-imx.mk b/package/gstreamer1/gst1-imx/gst1-imx.mk index a8fe6fe041..43b4d9b15f 100644 --- a/package/gstreamer1/gst1-imx/gst1-imx.mk +++ b/package/gstreamer1/gst1-imx/gst1-imx.mk @@ -33,6 +33,10 @@ ifeq ($(BR2_PACKAGE_IMX_GPU_VIV),y) GST1_IMX_DEPENDENCIES += imx-gpu-viv endif +ifeq ($(BR2_PACKAGE_IMX_GPU_G2D),y) +GST1_IMX_DEPENDENCIES += imx-gpu-g2d +endif + ifeq ($(BR2_PACKAGE_GST1_IMX_EGLVISINK),y) # There's no --enable-eglvivsink option ifeq ($(BR2_PACKAGE_XLIB_LIBX11),y)