| Message ID | 20150511132307.GA21085@kwain |
|---|---|
| State | Superseded |
| Headers | show |
Antoine, All, On Mon, May 11, 2015 at 3:23 PM, Antoine Ténart <antoine.tenart@free-electrons.com> wrote: > On Tue, May 05, 2015 at 11:07:59AM +0200, Gary Bisson wrote: >> On Tue, May 5, 2015 at 10:10 AM, Thomas Petazzoni >> <thomas.petazzoni@free-electrons.com> wrote: >> > On Tue, 5 May 2015 10:06:11 +0200, Gary Bisson wrote: >> >> Antoine, do you have a patch ready for the GPU package? Because it >> seems that it's not just a version bump: >> https://github.com/Freescale/meta-fsl-arm/commit/74c86aa9639f6f20991ab64ea75177a017f8749a > > Please find the patch I used to bump the Vivante version to 5.0.11.p4.1 > attached. > > I'll be happy to have some feedbacks and to update the patch > accordingly. Thanks for the patch! Maybe we should start a new thread for this? Here are my remarks with the current version: - The package has been renamed from gpu-viv-bin-mx6q to imx-gpu-viv in Yocto, I guess it'd be nice to follow their lead as I'm sure it announces that this package will be used on other iMX platforms. Then I don't know if it's better to have a commit just for renaming the package and another one for the version bump. - Also in Yocto they get rid of all the pkg-config files, do we still need those in our case? - Finally I'd copy/paste the commit log from Yocto as it explains what's new in this version Let me know if I can be of any help. Thanks, Gary
Hello Gary, On Monday 11 May 2015 18:32:35 Gary Bisson wrote: > Antoine, All, > > On Mon, May 11, 2015 at 3:23 PM, Antoine Ténart > <antoine.tenart@free-electrons.com> wrote: > > On Tue, May 05, 2015 at 11:07:59AM +0200, Gary Bisson wrote: > >> On Tue, May 5, 2015 at 10:10 AM, Thomas Petazzoni > >> <thomas.petazzoni@free-electrons.com> wrote: > >> > On Tue, 5 May 2015 10:06:11 +0200, Gary Bisson wrote: > >> > >> Antoine, do you have a patch ready for the GPU package? Because it > >> seems that it's not just a version bump: > >> https://github.com/Freescale/meta-fsl-arm/commit/74c86aa9639f6f20991ab64ea75177a017f8749a > > > > Please find the patch I used to bump the Vivante version to 5.0.11.p4.1 > > attached. > > > > I'll be happy to have some feedbacks and to update the patch > > accordingly. > > Thanks for the patch! Maybe we should start a new thread for this? > > Here are my remarks with the current version: > - The package has been renamed from gpu-viv-bin-mx6q to imx-gpu-viv in > Yocto, I guess it'd be nice to follow their lead as I'm sure it > announces that this package will be used on other iMX platforms. Then > I don't know if it's better to have a commit just for renaming the > package and another one for the version bump. Since this package seems to be incompatible with kernels < 3.10.54, maybe we should provide imx-gpu-viv AND gpu-viv-bin-mx6q, no? > - Also in Yocto they get rid of all the pkg-config files, do we still > need those in our case? True, it seems they are not needed anymore.
Hi Jerome, On Mon, May 11, 2015 at 7:48 PM, Jérôme Pouiller <jezz@sysmic.org> wrote: > Hello Gary, > > On Monday 11 May 2015 18:32:35 Gary Bisson wrote: >> Antoine, All, >> >> On Mon, May 11, 2015 at 3:23 PM, Antoine Ténart >> <antoine.tenart@free-electrons.com> wrote: >> > On Tue, May 05, 2015 at 11:07:59AM +0200, Gary Bisson wrote: >> >> On Tue, May 5, 2015 at 10:10 AM, Thomas Petazzoni >> >> <thomas.petazzoni@free-electrons.com> wrote: >> >> > On Tue, 5 May 2015 10:06:11 +0200, Gary Bisson wrote: >> >> >> >> Antoine, do you have a patch ready for the GPU package? Because it >> >> seems that it's not just a version bump: >> >> https://github.com/Freescale/meta-fsl-arm/commit/74c86aa9639f6f20991ab64ea75177a017f8749a >> > >> > Please find the patch I used to bump the Vivante version to 5.0.11.p4.1 >> > attached. >> > >> > I'll be happy to have some feedbacks and to update the patch >> > accordingly. >> >> Thanks for the patch! Maybe we should start a new thread for this? >> >> Here are my remarks with the current version: >> - The package has been renamed from gpu-viv-bin-mx6q to imx-gpu-viv in >> Yocto, I guess it'd be nice to follow their lead as I'm sure it >> announces that this package will be used on other iMX platforms. Then >> I don't know if it's better to have a commit just for renaming the >> package and another one for the version bump. > Since this package seems to be incompatible with kernels < 3.10.54, maybe we > should provide imx-gpu-viv AND gpu-viv-bin-mx6q, no? Well the gpu-viv-bin-mx6q is only good for 3.10.17 whereas the new imx-gpu-viv apparently works for both 3.10.53 and 3.14.28. Also most of the kernels offered by manufacturers are now 3.10.53 or above. But let's consider the option, wouldn't it be a headache for packages that depend on it such as gst1-imx or xdriver_xf86-video-imx-viv? I guess it'd need to check on the kernel headers versions to know which package it depends on. Thanks, Gary
Dear Gary Bisson, On Tue, 12 May 2015 09:56:10 +0200, Gary Bisson wrote: > > Since this package seems to be incompatible with kernels < 3.10.54, maybe we > > should provide imx-gpu-viv AND gpu-viv-bin-mx6q, no? > > Well the gpu-viv-bin-mx6q is only good for 3.10.17 whereas the new > imx-gpu-viv apparently works for both 3.10.53 and 3.14.28. Also most > of the kernels offered by manufacturers are now 3.10.53 or above. But > let's consider the option, wouldn't it be a headache for packages that > depend on it such as gst1-imx or xdriver_xf86-video-imx-viv? I guess > it'd need to check on the kernel headers versions to know which > package it depends on. We could use a virtual package, but it indeed seems to be too much of an headache. If the new version of the i.MX6 GPU drivers support both 3.10.53 and 3.14.28, then I think we should package just this latest version. People running 3.10.17 should upgrade :) Best regards, Thomas
From 92b93d9a86fb4199a44cdb75fd2235f90810d338 Mon Sep 17 00:00:00 2001 From: Antoine Tenart <antoine.tenart@free-electrons.com> Date: Thu, 12 Feb 2015 11:46:41 +0100 Subject: [PATCH] gpu-viv-bin-mx6q: bump to 5.0.11.p4.1 Bump the Vivante drivers to 5.0.11.p4.1. The version scheme has changed and 5.0.11.p4.1 is indeed the latest version. In addition to the version bump, other changes are done to handle the new directory organisation. The work behind this commit was funded by ECA Group <http://www.ecagroup.com>. ECA Group is the copyright owner of the contributed code. Signed-off-by: Antoine Tenart <antoine.tenart@free-electrons.com> --- .../0001-correct-HAL-include.patch | 16 ---------- .../gpu-viv-bin-mx6q/gpu-viv-bin-mx6q.mk | 36 +++++++++++----------- 2 files changed, 18 insertions(+), 34 deletions(-) delete mode 100644 package/freescale-imx/gpu-viv-bin-mx6q/0001-correct-HAL-include.patch diff --git a/package/freescale-imx/gpu-viv-bin-mx6q/0001-correct-HAL-include.patch b/package/freescale-imx/gpu-viv-bin-mx6q/0001-correct-HAL-include.patch deleted file mode 100644 index c83cd559b12a..000000000000 --- a/package/freescale-imx/gpu-viv-bin-mx6q/0001-correct-HAL-include.patch +++ /dev/null @@ -1,16 +0,0 @@ -Correct the directory path for gc_hal_eglplatform_type.h - -Signed-off-by: Henk Fijnvandraat <h.fijnvandraat@inter.nl.net> - -diff -rup gpu-viv-bin-mx6q-1.1.0-orig/usr/include/gc_vdk_types.h gpu-viv-bin-mx6q-1.1.0/usr/include/gc_vdk_types.h ---- gpu-viv-bin-mx6q-1.1.0-orig/usr/include/gc_vdk_types.h 2012-12-18 10:35:55.000000000 +0100 -+++ gpu-viv-bin-mx6q-1.1.0/usr/include/gc_vdk_types.h 2013-05-09 21:09:28.080138681 +0200 -@@ -39,7 +39,7 @@ extern "C" { - #endif - - #include <EGL/egl.h> --#include "gc_hal_eglplatform_type.h" -+#include <HAL/gc_hal_eglplatform_type.h> - - - /******************************************************************************* diff --git a/package/freescale-imx/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q.mk b/package/freescale-imx/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q.mk index ec779a406e11..a48c49777f73 100644 --- a/package/freescale-imx/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q.mk +++ b/package/freescale-imx/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q.mk @@ -4,14 +4,14 @@ # ################################################################################ -GPU_VIV_BIN_MX6Q_BASE_VERSION = 3.10.17-1.0.1 +GPU_VIV_BIN_MX6Q_BASE_VERSION = 5.0.11.p4.1 ifeq ($(BR2_ARM_EABIHF),y) GPU_VIV_BIN_MX6Q_VERSION = $(GPU_VIV_BIN_MX6Q_BASE_VERSION)-hfp else GPU_VIV_BIN_MX6Q_VERSION = $(GPU_VIV_BIN_MX6Q_BASE_VERSION)-sfp endif GPU_VIV_BIN_MX6Q_SITE = $(FREESCALE_IMX_SITE) -GPU_VIV_BIN_MX6Q_SOURCE = gpu-viv-bin-mx6q-$(GPU_VIV_BIN_MX6Q_VERSION).bin +GPU_VIV_BIN_MX6Q_SOURCE = imx-gpu-viv-$(GPU_VIV_BIN_MX6Q_VERSION).bin GPU_VIV_BIN_MX6Q_INSTALL_STAGING = YES @@ -30,23 +30,23 @@ endef # in the upstream archive here. # Make sure these commands are idempotent. define GPU_VIV_BIN_MX6Q_BUILD_CMDS - $(SED) 's/defined(LINUX)/defined(__linux__)/g' $(@D)/usr/include/*/*.h - ln -sf libGL.so.1.2 $(@D)/usr/lib/libGL.so - ln -sf libGL.so.1.2 $(@D)/usr/lib/libGL.so.1 - ln -sf libGL.so.1.2 $(@D)/usr/lib/libGL.so.1.2.0 - ln -sf libEGL-$(GPU_VIV_BIN_MX6Q_LIB_TARGET).so $(@D)/usr/lib/libEGL.so - ln -sf libEGL-$(GPU_VIV_BIN_MX6Q_LIB_TARGET).so $(@D)/usr/lib/libEGL.so.1 - ln -sf libEGL-$(GPU_VIV_BIN_MX6Q_LIB_TARGET).so $(@D)/usr/lib/libEGL.so.1.0 - ln -sf libGLESv2-$(GPU_VIV_BIN_MX6Q_LIB_TARGET).so $(@D)/usr/lib/libGLESv2.so - ln -sf libGLESv2-$(GPU_VIV_BIN_MX6Q_LIB_TARGET).so $(@D)/usr/lib/libGLESv2.so.2 - ln -sf libGLESv2-$(GPU_VIV_BIN_MX6Q_LIB_TARGET).so $(@D)/usr/lib/libGLESv2.so.2.0.0 - ln -sf libVIVANTE-$(GPU_VIV_BIN_MX6Q_LIB_TARGET).so $(@D)/usr/lib/libVIVANTE.so - ln -sf libGAL-$(GPU_VIV_BIN_MX6Q_LIB_TARGET).so $(@D)/usr/lib/libGAL.so + $(SED) 's/defined(LINUX)/defined(__linux__)/g' $(@D)/gpu-core/usr/include/*/*.h + ln -sf libGL.so.1.2 $(@D)/gpu-core/usr/lib/libGL.so + ln -sf libGL.so.1.2 $(@D)/gpu-core/usr/lib/libGL.so.1 + ln -sf libGL.so.1.2 $(@D)/gpu-core/usr/lib/libGL.so.1.2.0 + ln -sf libEGL-$(GPU_VIV_BIN_MX6Q_LIB_TARGET).so $(@D)/gpu-core/usr/lib/libEGL.so + ln -sf libEGL-$(GPU_VIV_BIN_MX6Q_LIB_TARGET).so $(@D)/gpu-core/usr/lib/libEGL.so.1 + ln -sf libEGL-$(GPU_VIV_BIN_MX6Q_LIB_TARGET).so $(@D)/gpu-core/usr/lib/libEGL.so.1.0 + ln -sf libGLESv2-$(GPU_VIV_BIN_MX6Q_LIB_TARGET).so $(@D)/gpu-core/usr/lib/libGLESv2.so + ln -sf libGLESv2-$(GPU_VIV_BIN_MX6Q_LIB_TARGET).so $(@D)/gpu-core/usr/lib/libGLESv2.so.2 + ln -sf libGLESv2-$(GPU_VIV_BIN_MX6Q_LIB_TARGET).so $(@D)/gpu-core/usr/lib/libGLESv2.so.2.0.0 + ln -sf libVIVANTE-$(GPU_VIV_BIN_MX6Q_LIB_TARGET).so $(@D)/gpu-core/usr/lib/libVIVANTE.so + ln -sf libGAL-$(GPU_VIV_BIN_MX6Q_LIB_TARGET).so $(@D)/gpu-core/usr/lib/libGAL.so endef ifeq ($(GPU_VIV_BIN_MX6Q_LIB_TARGET),fb) define GPU_VIV_BIN_MX6Q_FIXUP_FB_HEADERS - $(SED) '/#define EGLAPIENTRY/ a \ + $(SED) '39i\ #if !defined(EGL_API_X11) && !defined(EGL_API_DFB) && !defined(EGL_API_FB) \n\ #define EGL_API_FB \n\ #endif' $(STAGING_DIR)/usr/include/EGL/eglvivante.h @@ -54,7 +54,7 @@ endef endif define GPU_VIV_BIN_MX6Q_INSTALL_STAGING_CMDS - cp -r $(@D)/usr/* $(STAGING_DIR)/usr + cp -r $(@D)/gpu-core/usr/* $(STAGING_DIR)/usr $(GPU_VIV_BIN_MX6Q_FIXUP_FB_HEADERS) for lib in egl glesv2 vg; do \ $(INSTALL) -m 0644 -D \ @@ -66,7 +66,7 @@ endef ifeq ($(BR2_PACKAGE_GPU_VIV_BIN_MX6Q_EXAMPLES),y) define GPU_VIV_BIN_MX6Q_INSTALL_EXAMPLES mkdir -p $(TARGET_DIR)/usr/share/examples/ - cp -r $(@D)/opt/* $(TARGET_DIR)/usr/share/examples/ + cp -r $(@D)/gpu-demos/opt/* $(TARGET_DIR)/usr/share/examples/ endef endif @@ -75,7 +75,7 @@ endif # to the wrong library define GPU_VIV_BIN_MX6Q_INSTALL_TARGET_CMDS $(GPU_VIV_BIN_MX6Q_INSTALL_EXAMPLES) - cp -a $(@D)/usr/lib $(TARGET_DIR)/usr + 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 \ case $$f in \ -- 2.4.0