Date   

[PATCH 1/4] mesa: Fix do_install_append_imxgpu task

Fabio Berton
 

usr/include/KHR is a directory, remove using rm -rf command.

Signed-off-by: Fabio Berton <fabio.berton@...>
---
recipes-graphics/mesa/mesa_%.bbappend | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/recipes-graphics/mesa/mesa_%.bbappend b/recipes-graphics/mesa/mesa_%.bbappend
index 67e8f5ae..60eaf839 100644
--- a/recipes-graphics/mesa/mesa_%.bbappend
+++ b/recipes-graphics/mesa/mesa_%.bbappend
@@ -36,7 +36,7 @@ do_install_append_imxgpu3d () {
}

do_install_append_imxgpu () {
- rm -f ${D}${includedir}/KHR
+ rm -rf ${D}${includedir}/KHR
if [ "${BACKEND}" = "wayland" ]; then
rm -f ${D}${libdir}/pkgconfig/wayland-egl.pc
fi
--
2.17.1


[PATCH] imx7dsabresd: Use mx7dsabresd_config configuration for sd devices

Fabio Berton
 

Defconfig mx7dsabresd_secure_config was removed on U-Boot:

commit feb14c6348caadfd7bbb1e972f0c484faffa5a72
Author: Fabio Estevam <fabio.estevam@...>
Date: Thu Apr 19 17:34:10 2018 -0300

mx7dsabresd: Remove the mx7dsabresd_secure_defconfig target

mx7dsabresd_secure_defconfig was introduced to allow booting NXP kernel
that has CAAM support and needs to boot in secure mode.

Instead of keeping two different config targets for the same board,
remove mx7dsabresd_secure_defconfig and select
CONFIG_ARMV7_BOOT_SEC_DEFAULT inside mx7dsabresd_defconfig so that
this target could be used to boot both mainline and the vendor kernel.

This makes maintenance task easier and avoid potentially confusion
for the end user.

Signed-off-by: Fabio Estevam <fabio.estevam@...>
Acked-by: Bryan O'Donoghue <bryan.odonoghue@...>

Signed-off-by: Fabio Berton <fabio.berton@...>
---
conf/machine/imx7dsabresd.conf | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/conf/machine/imx7dsabresd.conf b/conf/machine/imx7dsabresd.conf
index f77e537e..be9a6703 100644
--- a/conf/machine/imx7dsabresd.conf
+++ b/conf/machine/imx7dsabresd.conf
@@ -19,7 +19,7 @@ KERNEL_DEVICETREE = "imx7d-sdb.dtb imx7d-sdb-epdc.dtb imx7d-sdb-gpmi-weim.dtb \
KERNEL_DEVICETREE_use-mainline-bsp = "imx7d-sdb.dtb"

UBOOT_CONFIG ??= "sd"
-UBOOT_CONFIG[sd] = "mx7dsabresd_secure_config,sdcard"
+UBOOT_CONFIG[sd] = "mx7dsabresd_config,sdcard"
UBOOT_CONFIG[qspi1] = "mx7dsabresd_qspi1_config"
UBOOT_CONFIG[nand] = "mx7dsabresd_nand_config,ubifs"
UBOOT_CONFIG[epdc] = "mx7dsabresd_epdc_config"
--
2.17.1


Re: [PATCH 16/32] dtc: Add recipe for version 1.4.5

Otavio Salvador <otavio.salvador@...>
 

On Mon, Jul 2, 2018 at 1:42 PM, Ian Coolidge <ian@...> wrote:
Hi All,

Dumb question, can't we just add dtc_1.4.5.bb and set
PREFERRED_VERSION(sp?). That's what I did before this dtc145_git recipe got
added
This leaks a BSP dependency over other machines. This cannot be done.

--
Otavio Salvador O.S. Systems
http://www.ossystems.com.br http://code.ossystems.com.br
Mobile: +55 (53) 9 9981-7854 Mobile: +1 (347) 903-9750


Re: [PATCH 16/32] dtc: Add recipe for version 1.4.5

Ian Coolidge <ian@...>
 

Hi All,

Dumb question, can't we just add dtc_1.4.5.bb and set PREFERRED_VERSION(sp?). That's what I did before this dtc145_git recipe got added

On Fri, Jun 29, 2018 at 10:53 AM, Mihai Lindner <mihai.lindner@...> wrote:
On 06/28/2018 07:49 PM, Otavio Salvador wrote:
> On Thu, Jun 28, 2018 at 12:33 PM, Mihai Lindner <mihai.lindner@...> wrote:
>> This patch seems to break building images that use systemd as
>> init-manager, dtc-145 conflicts with the actual dtc package. Maybe a bit
>> late, as this already landed in master.
>>
>> Somehow, I'm guessing that through PACKAGE_WRITE_DEPS, systemd pulls in
>> qemu, which pulls dtc, and u-boot-imx pulls in dtc-145, resulting in
>> "FileExistsError: [Errno 17] File exists" at do_image_wic.
>>
>> Can this be done by having dtc with 1.4.5 as a version, and setting it
>> as preferred in our environment? Or maybe other solutions to this.
>
> We can rename the binary to dtc-145 and patch U-Boot to use it. Mind
> to prepare a patch?
>

Digging further into this, I don't think that binary renaming is needed,
handling the recipe another way will do fine. The actual issue here is
that we introduce "dtc-145" as a new recipe, with version "git", not as
version 1.4.5 of dtc.

Also, this change might need to be done differently in sumo vs. master.
Actually, not at all in sumo, because dtc is already at version 1.4.5 in
poky. I've just sent a patch for this.

In master, the recipe needs to be handled normally just lower the
version and set it as preferred, maybe in fsl-default-versions.inc. I'm
still working on this one.

Thanks,
Mihai
--
_______________________________________________
meta-freescale mailing list
meta-freescale@yoctoproject.org
https://lists.yoctoproject.org/listinfo/meta-freescale


Re: [PATCH 16/32] dtc: Add recipe for version 1.4.5

Mihai Lindner <mihai.lindner@...>
 

On 06/28/2018 07:49 PM, Otavio Salvador wrote:
On Thu, Jun 28, 2018 at 12:33 PM, Mihai Lindner <mihai.lindner@...> wrote:
This patch seems to break building images that use systemd as
init-manager, dtc-145 conflicts with the actual dtc package. Maybe a bit
late, as this already landed in master.

Somehow, I'm guessing that through PACKAGE_WRITE_DEPS, systemd pulls in
qemu, which pulls dtc, and u-boot-imx pulls in dtc-145, resulting in
"FileExistsError: [Errno 17] File exists" at do_image_wic.

Can this be done by having dtc with 1.4.5 as a version, and setting it
as preferred in our environment? Or maybe other solutions to this.
We can rename the binary to dtc-145 and patch U-Boot to use it. Mind
to prepare a patch?
Digging further into this, I don't think that binary renaming is needed,
handling the recipe another way will do fine. The actual issue here is
that we introduce "dtc-145" as a new recipe, with version "git", not as
version 1.4.5 of dtc.

Also, this change might need to be done differently in sumo vs. master.
Actually, not at all in sumo, because dtc is already at version 1.4.5 in
poky. I've just sent a patch for this.

In master, the recipe needs to be handled normally just lower the
version and set it as preferred, maybe in fsl-default-versions.inc. I'm
still working on this one.

Thanks,
Mihai


[distro][PATCH] fsl-base.inc: Remove UBOOT_MACHINE for mx6

Mihai Lindner <mihai.lindner@...>
 

Cannot be used at the same time with UBOOT_CONFIG, which is already
defined in most of our machine files. The uboot recipes are skipped
because of these conflicting options and errors out the build.

Signed-off-by: Mihai Lindner <mihai.lindner@...>
---
conf/distro/include/fsl-base.inc | 1 -
1 file changed, 1 deletion(-)

diff --git a/conf/distro/include/fsl-base.inc b/conf/distro/include/fsl-base.inc
index 7e1ce3e..32c598d 100644
--- a/conf/distro/include/fsl-base.inc
+++ b/conf/distro/include/fsl-base.inc
@@ -21,7 +21,6 @@ PREFERRED_PROVIDER_u-boot_mx6ull = "u-boot-imx"
PREFERRED_PROVIDER_u-boot_mx7d = "u-boot-imx"
PREFERRED_PROVIDER_u-boot_mx7ulp = "u-boot-imx"

-UBOOT_MACHINE_mx6 = "mx6qsabresd_config"
UBOOT_SUFFIX_mx6 = "imx"
SPL_BINARY_mx6 = ""
UBOOT_MAKE_TARGET_mx6 = "u-boot.imx"
--
2.7.4


[PATCH][sumo] Revert "dtc: Add recipe for version 1.4.5"

Mihai Lindner <mihai.lindner@...>
 

This reverts commit 64fc16b33143a001a895ffaf278964efdd7f3b14.
This doesn't belong in sumo, dtc is already at version 1.4.5.

Signed-off-by: Mihai Lindner <mihai.lindner@...>
---
recipes-bsp/u-boot/u-boot-imx_2017.03.bb | 2 +-
recipes-kernel/dtc/dtc-145_git.bb | 12 ------------
recipes-kernel/dtc/files/make_install.patch | 17 -----------------
3 files changed, 1 insertion(+), 30 deletions(-)
delete mode 100644 recipes-kernel/dtc/dtc-145_git.bb
delete mode 100644 recipes-kernel/dtc/files/make_install.patch

diff --git a/recipes-bsp/u-boot/u-boot-imx_2017.03.bb b/recipes-bsp/u-boot/u-boot-imx_2017.03.bb
index 52ebee9..7220567 100644
--- a/recipes-bsp/u-boot/u-boot-imx_2017.03.bb
+++ b/recipes-bsp/u-boot/u-boot-imx_2017.03.bb
@@ -6,7 +6,7 @@ DESCRIPTION = "i.MX U-Boot suppporting i.MX reference boards."
require recipes-bsp/u-boot/u-boot.inc

PROVIDES += "u-boot"
-DEPENDS_append = "dtc-145-native"
+DEPENDS_append = "dtc-native"

LICENSE = "GPLv2+"
LIC_FILES_CHKSUM = "file://Licenses/gpl-2.0.txt;md5=b234ee4d69f5fce4486a80fdaf4a4263"
diff --git a/recipes-kernel/dtc/dtc-145_git.bb b/recipes-kernel/dtc/dtc-145_git.bb
deleted file mode 100644
index afed62f..0000000
--- a/recipes-kernel/dtc/dtc-145_git.bb
+++ /dev/null
@@ -1,12 +0,0 @@
-require recipes-kernel/dtc/dtc.inc
-
-LIC_FILES_CHKSUM = " \
- file://GPL;md5=94d55d512a9ba36caa9b7df079bae19f \
- file://libfdt/libfdt.h;beginline=3;endline=52;md5=fb360963151f8ec2d6c06b055bcbb68c \
-"
-
-SRCREV = "22a65c5331c22979d416738eb756b9541672e00d"
-
-S = "${WORKDIR}/git"
-
-BBCLASSEXTEND = "native nativesdk"
diff --git a/recipes-kernel/dtc/files/make_install.patch b/recipes-kernel/dtc/files/make_install.patch
deleted file mode 100644
index ccf17b3..0000000
--- a/recipes-kernel/dtc/files/make_install.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Upstream-Status: Inappropriate [configuration]
-
-Index: git/Makefile
-===================================================================
---- git.orig/Makefile
-+++ git/Makefile
-@@ -168,8 +168,8 @@ install-bin: all $(SCRIPTS)
- install-lib: all
- @$(VECHO) INSTALL-LIB
- $(INSTALL) -d $(DESTDIR)$(LIBDIR)
-- $(INSTALL) $(LIBFDT_lib) $(DESTDIR)$(LIBDIR)
-- ln -sf $(notdir $(LIBFDT_lib)) $(DESTDIR)$(LIBDIR)/$(LIBFDT_soname)
-+ $(INSTALL) $(LIBFDT_lib) $(DESTDIR)$(LIBDIR)/$(LIBFDT_soname)
-+ ln -sf $(LIBFDT_soname) $(DESTDIR)$(LIBDIR)/$(notdir $(LIBFDT_lib))
- ln -sf $(LIBFDT_soname) $(DESTDIR)$(LIBDIR)/libfdt.$(SHAREDLIB_EXT)
- $(INSTALL) -m 644 $(LIBFDT_archive) $(DESTDIR)$(LIBDIR)
-
--
2.7.4


Updates to meta-freescale (master and sumo) in 2018-06-29

Otavio Salvador
 

Hello,

I pushed following updates:

commit f5845ffd70cb0b1e1782adc8ae0507adbbad8fb9 (yocto/master-next, yocto/master, github/wip-nxp-4.9.88-2.0.0-without-mx8, wip-nxp-4.9.88-2.0.0-without-mx8)
Author: Tom Hochstein <tom.hochstein@...>
Date: Wed Jun 27 17:17:30 2018 -0500

cogl-1.0: Use imxgpu3d override

CoGL now depends on imxgpu3d since imxgpu2d is no longer used as
"any GPU" selector. See following comment for details:

imx-base.inc: Add imxgpu to MACHINEOVERRIDES_EXTENDER

Signed-off-by: Tom Hochstein <tom.hochstein@...>
Signed-off-by: Otavio Salvador <otavio@...>

commit e4912ae5a83dcaa0cbe9d8fb5a7e7dc84d90bcf2
Author: Tom Hochstein <tom.hochstein@...>
Date: Wed Jun 27 17:17:29 2018 -0500

clutter-1.0: Use imxgpu3d override

Clutter now depends on imxgpu3d since imxgpu2d is no longer used as
"any GPU" selector. See following comment for details:

imx-base.inc: Add imxgpu to MACHINEOVERRIDES_EXTENDER

Signed-off-by: Tom Hochstein <tom.hochstein@...>
Signed-off-by: Otavio Salvador <otavio@...>

commit 5f83013637c668bbf42d9576fb937500558e6b5b
Author: Tom Hochstein <tom.hochstein@...>
Date: Tue Jun 26 20:55:44 2018 -0500

mesa-demos: Include glut for i.MX GPU

Signed-off-by: Tom Hochstein <tom.hochstein@...>
Signed-off-by: Otavio Salvador <otavio@...>

commit 54e0225ba79ae00f17954c6f5055dddaa0b1fd97
Author: Tom Hochstein <tom.hochstein@...>
Date: Tue Jun 26 20:55:43 2018 -0500

mesa-demos: Use the new imxgpu override

Use imxgpu override for GPU 2D or 3D condition

Signed-off-by: Tom Hochstein <tom.hochstein@...>
Signed-off-by: Otavio Salvador <otavio@...>

commit 78af77d37275994be154b730ebeb46e86ecab902
Author: Tom Hochstein <tom.hochstein@...>
Date: Wed Jun 27 17:17:28 2018 -0500

mesa: Update to use new imxgpu override

This makes use of new imxgpu override as future i.MX8M addition
requires it as i.MX8M has 3D GPU but no 2D.

Signed-off-by: Tom Hochstein <tom.hochstein@...>
Signed-off-by: Otavio Salvador <otavio@...>

commit 92d5d69262eac2f397769c3f351001c92f675b1f
Author: Tom Hochstein <tom.hochstein@...>
Date: Fri Jun 22 15:17:18 2018 -0500

imx-base.inc: Add imxgpu to MACHINEOVERRIDES_EXTENDER

Add imxgpu to simplify the conditional for imxgpu2d OR
imxgpu3d. Note that i.MX 8MQ has no 2D, so the previous
idiom of using imxgpu2d to mean any GPU is no longer correct.

Signed-off-by: Tom Hochstein <tom.hochstein@...>
Signed-off-by: Otavio Salvador <otavio@...>

commit 36b1840a853ed1b2d766b06b6644692e7f95d398
Author: Tom Hochstein <tom.hochstein@...>
Date: Wed Jun 27 17:17:27 2018 -0500

mesa: Adjust install for files provided by imx-gpu-viv

- Remove wayland-egl.pc
- Remove KHR headers

Signed-off-by: Tom Hochstein <tom.hochstein@...>
Signed-off-by: Otavio Salvador <otavio@...>

commit 94caa35f706b7bce31ff495bed7dbed4625790d0
Author: Tom Hochstein <tom.hochstein@...>
Date: Tue Jun 26 20:55:40 2018 -0500

mesa: Cleanup

Fix variable order and remove references to non-existent
packages.

Signed-off-by: Tom Hochstein <tom.hochstein@...>
Signed-off-by: Otavio Salvador <otavio@...>

commit 75a3fdf4cb0e3a8bb8a08da0a9a486f541f23124
Author: Otavio Salvador <otavio@...>
Date: Fri Jun 29 13:56:17 2018 -0300

imx-base: Use i.MX's fork of libdrm for i.MX6 and i.MX7

There few components which require the new libdrm fork, so we must use
it when using NXP's BSP components. Besides adding the preferred
version we need also to add it to the SoC architecture filter.

Signed-off-by: Otavio Salvador <otavio@...>

commit 7305e99febb454b216ce7c0ed2ec5495fa73d739
Author: Otavio Salvador <otavio@...>
Date: Fri Jun 29 14:02:25 2018 -0300

libdrm: Remove unused patches

Since we are using the NXP's fork of libdrm, we can now drop the fork
and as consequence the SoC architecture setting for it.

Signed-off-by: Otavio Salvador <otavio@...>

commit 1140b85a914f0746b802ea5aab7699a8c718da32
Author: Yuqing Zhu <carol.zhu@...>
Date: Wed Jun 6 11:46:42 2018 +0800

libdrm: Create i.MX specific version recipe to switch to use i.MX fork

This i.MX specific version is based on v2.4.84

Signed-off-by: Yuqing Zhu <carol.zhu@...>
Acked-by: Marcel Ziswiler <marcel.ziswiler@...>
Signed-off-by: Otavio Salvador <otavio@...>

Regards,

--
Otavio Salvador O.S. Systems
http://www.ossystems.com.br http://code.ossystems.com.br
Mobile: +55 (53) 9981-7854 Mobile: +1 (347) 903-9750


Re: Problem with Vivante driver: Nothing RPROVIDES 'libgl-mesa-dev'

Otavio Salvador <otavio.salvador@...>
 

On Fri, Jun 29, 2018 at 8:28 AM, Doswald Michael
<Michael.Doswald@...> wrote:
On Thu, Jun 28, 2018 at 09:12 PM, Otavio Salvador
<otavio.salvador@...> wrote:
On Thu, Jun 28, 2018 at 8:44 AM, Doswald Michael
<Michael.Doswald@...> wrote:
...
Any hints why the libgl-mesa-dev package is needed in this case? And why is
it not found, as it is provided by the mesa recipes if I am not mistaken.
We are still working on sumo and master, as we are adding the new BSP release.

Is it possible for you to test master-next and see if it works?
Thank you for your input. I have now solved the problem without changing to master.
After creating a new build directory which does not include my own layer, I was able
to build the vivante drivers.
As it turned out, using the bbappend files to overwrite the COMPATIBLE_MACHINE
variable was the wrong way to go. I have now removed the bbappend files and added
the following line in the machine conf file within my layer:

MACHINEOVERRIDES =. "mx6:mx6dl:"

Then I cleaned and rebuilt the whole image and it worked without problems.
Awesome. Thank you for letting us know.

--
Otavio Salvador O.S. Systems
http://www.ossystems.com.br http://code.ossystems.com.br
Mobile: +55 (53) 9 9981-7854 Mobile: +1 (347) 903-9750


Re: Problem with Vivante driver: Nothing RPROVIDES 'libgl-mesa-dev'

Michael Doswald
 

On Thu, Jun 28, 2018 at 09:12 PM, Otavio Salvador
<otavio.salvador@...> wrote:
On Thu, Jun 28, 2018 at 8:44 AM, Doswald Michael
<Michael.Doswald@...> wrote:
I am having problems getting the proprietary vivante driver to work with my
Yocto image. I want to use the gles/egl framebuffer driver without X11 or
wayland. But when building the eglinfo-fb package I get the following error:

NOTE: Resolving any missing task queue dependencies
ERROR: Nothing RPROVIDES 'libgl-mesa-dev' (but
/<cut>/meta-freescale/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.2.2.p0-aarch32.bb
RDEPENDS on or otherwise requires it)
NOTE: Runtime target 'libgl-mesa-dev' is unbuildable, removing...
Missing or unbuildable dependency chain was: ['libgl-mesa-dev']
ERROR: Required build target 'eglinfo-fb' has no buildable providers.
Missing or unbuildable dependency chain was: ['eglinfo-fb', 'virtual/egl',
'libgl-mesa-dev']


I am using Yocto 2.5 (Sumo) together with the meta-freescale layer (branch
sumo @ git://git.yoctoproject.org/meta-freescale) and my own layer. In my
layer, I configured my machine to use the imx kernel and the vivante package
as follows:


PREFERRED_PROVIDER_virtual/kernel = "linux-imx"
PREFERRED_PROVIDER_virtual/egl = "imx-gpu-viv"

The machine I am using is based on a i.MX6 DualLite processor, so I added a
linux-imx_4.9.11.bbappend and a imx-gpu-viv_%.bbappend file which include my
machine name in the COMPATIBLE_MACHINE variable.


In the local.conf file I set the following variables:


MACHINE_HAS_VIVANTE_KERNEL_DRIVER_SUPPORT = "1"

DISTRO_FEATURES_append = " opengl"

DISTRO_FEATURES_remove = "x11 wayland directfb"


Any hints why the libgl-mesa-dev package is needed in this case? And why is
it not found, as it is provided by the mesa recipes if I am not mistaken.
We are still working on sumo and master, as we are adding the new BSP release.

Is it possible for you to test master-next and see if it works?
Thank you for your input. I have now solved the problem without changing to master.
After creating a new build directory which does not include my own layer, I was able
to build the vivante drivers.
As it turned out, using the bbappend files to overwrite the COMPATIBLE_MACHINE
variable was the wrong way to go. I have now removed the bbappend files and added
the following line in the machine conf file within my layer:

MACHINEOVERRIDES =. "mx6:mx6dl:"

Then I cleaned and rebuilt the whole image and it worked without problems.

Regards,
Michael


Re: Problem with Vivante driver: Nothing RPROVIDES 'libgl-mesa-dev'

Otavio Salvador <otavio.salvador@...>
 

On Thu, Jun 28, 2018 at 8:44 AM, Doswald Michael
<Michael.Doswald@...> wrote:
I am having problems getting the proprietary vivante driver to work with my
Yocto image. I want to use the gles/egl framebuffer driver without X11 or
wayland. But when building the eglinfo-fb package I get the following error:

NOTE: Resolving any missing task queue dependencies
ERROR: Nothing RPROVIDES 'libgl-mesa-dev' (but
/<cut>/meta-freescale/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.2.2.p0-aarch32.bb
RDEPENDS on or otherwise requires it)
NOTE: Runtime target 'libgl-mesa-dev' is unbuildable, removing...
Missing or unbuildable dependency chain was: ['libgl-mesa-dev']
ERROR: Required build target 'eglinfo-fb' has no buildable providers.
Missing or unbuildable dependency chain was: ['eglinfo-fb', 'virtual/egl',
'libgl-mesa-dev']


I am using Yocto 2.5 (Sumo) together with the meta-freescale layer (branch
sumo @ git://git.yoctoproject.org/meta-freescale) and my own layer. In my
layer, I configured my machine to use the imx kernel and the vivante package
as follows:


PREFERRED_PROVIDER_virtual/kernel = "linux-imx"
PREFERRED_PROVIDER_virtual/egl = "imx-gpu-viv"

The machine I am using is based on a i.MX6 DualLite processor, so I added a
linux-imx_4.9.11.bbappend and a imx-gpu-viv_%.bbappend file which include my
machine name in the COMPATIBLE_MACHINE variable.


In the local.conf file I set the following variables:


MACHINE_HAS_VIVANTE_KERNEL_DRIVER_SUPPORT = "1"

DISTRO_FEATURES_append = " opengl"

DISTRO_FEATURES_remove = "x11 wayland directfb"


Any hints why the libgl-mesa-dev package is needed in this case? And why is
it not found, as it is provided by the mesa recipes if I am not mistaken.
We are still working on sumo and master, as we are adding the new BSP release.

Is it possible for you to test master-next and see if it works?

--
Otavio Salvador O.S. Systems
http://www.ossystems.com.br http://code.ossystems.com.br
Mobile: +55 (53) 9 9981-7854 Mobile: +1 (347) 903-9750


[PATCH 26/26] xserver-xorg: Fix build issues for i.MX 8MQ

Otavio Salvador
 

From: Tom Hochstein <tom.hochstein@...>

Build now with the default OpenGL configuration except
no glamor for i.MX 6 or 7 with GPU.

Signed-off-by: Tom Hochstein <tom.hochstein@...>
Signed-off-by: Otavio Salvador <otavio@...>
---

Changes in v4:
- New patch

Changes in v3: None
Changes in v2: None

recipes-graphics/xorg-xserver/xserver-xorg_%.bbappend | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/recipes-graphics/xorg-xserver/xserver-xorg_%.bbappend b/recipes-graphics/xorg-xserver/xserver-xorg_%.bbappend
index fd146053..c26bb20d 100644
--- a/recipes-graphics/xorg-xserver/xserver-xorg_%.bbappend
+++ b/recipes-graphics/xorg-xserver/xserver-xorg_%.bbappend
@@ -1 +1,4 @@
-OPENGL_PKGCONFIGS_imxgpu2d = "dri glx"
+IMX_OPENGL_PKGCONFIGS_REMOVE = ""
+IMX_OPENGL_PKGCONFIGS_REMOVE_imxgpu = "glamor"
+OPENGL_PKGCONFIGS_remove_mx6 = "${IMX_OPENGL_PKGCONFIGS_REMOVE}"
+OPENGL_PKGCONFIGS_remove_mx7 = "${IMX_OPENGL_PKGCONFIGS_REMOVE}"
--
2.18.0


[PATCH 25/26] xserver-xf86-config: Add support for i.MX 8MQ

Otavio Salvador
 

From: Tom Hochstein <tom.hochstein@...>

Add DRM driver.

Signed-off-by: Tom Hochstein <tom.hochstein@...>
Signed-off-by: Otavio Salvador <otavio@...>
---

Changes in v4:
- New patch

Changes in v3: None
Changes in v2: None

.../xserver-xf86-config/imxdrm/xorg.conf | 15 +++++++++++++++
1 file changed, 15 insertions(+)
create mode 100644 recipes-graphics/xorg-xserver/xserver-xf86-config/imxdrm/xorg.conf

diff --git a/recipes-graphics/xorg-xserver/xserver-xf86-config/imxdrm/xorg.conf b/recipes-graphics/xorg-xserver/xserver-xf86-config/imxdrm/xorg.conf
new file mode 100644
index 00000000..ec12ed9b
--- /dev/null
+++ b/recipes-graphics/xorg-xserver/xserver-xf86-config/imxdrm/xorg.conf
@@ -0,0 +1,15 @@
+Section "Device"
+ Identifier "i.MX Accelerated DRM Device"
+ Driver "vivante"
+ Option "kmsdev" "/dev/dri/card0"
+EndSection
+
+Section "ServerFlags"
+ Option "BlankTime" "0"
+ Option "StandbyTime" "0"
+ Option "SuspendTime" "0"
+ Option "OffTime" "0"
+ Option "Xinerama" "off"
+ Option "Clone" "on"
+ Option "SWcursor" "true"
+EndSection
--
2.18.0


[PATCH 24/26] imx-dpu-g2d: Limit to i.MX 8MQ support

Otavio Salvador
 

From: Tom Hochstein <tom.hochstein@...>

Signed-off-by: Otavio Salvador <otavio@...>
---

Changes in v4:
- New patch

Changes in v3: None
Changes in v2: None

recipes-graphics/imx-dpu-g2d/imx-dpu-g2d_1.4.2.bb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/recipes-graphics/imx-dpu-g2d/imx-dpu-g2d_1.4.2.bb b/recipes-graphics/imx-dpu-g2d/imx-dpu-g2d_1.4.2.bb
index dd3aa9dd..f6488fe3 100644
--- a/recipes-graphics/imx-dpu-g2d/imx-dpu-g2d_1.4.2.bb
+++ b/recipes-graphics/imx-dpu-g2d/imx-dpu-g2d_1.4.2.bb
@@ -34,4 +34,4 @@ INSANE_SKIP_${PN} += "ldflags"
FILES_${PN} = "${libdir}/libg2d* /opt"
FILES_${PN}-dev = "${libdir}/libg2d${SOLIBSDEV} ${includedir}"

-COMPATIBLE_MACHINE = "(mx8mm)"
+COMPATIBLE_MACHINE = "(mx8mq)"
--
2.18.0


[PATCH 23/26] cogl-1.0: Fix configuration for i.MX 8M

Otavio Salvador
 

From: Tom Hochstein <tom.hochstein@...>

Fix configuration for 8M which has 3D GPU but no 2D.

Signed-off-by: Tom Hochstein <tom.hochstein@...>
Signed-off-by: Otavio Salvador <otavio@...>
---

Changes in v4:
- New patch

Changes in v3: None
Changes in v2: None

recipes-graphics/cogl/cogl-1.0_%.bbappend | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/recipes-graphics/cogl/cogl-1.0_%.bbappend b/recipes-graphics/cogl/cogl-1.0_%.bbappend
index ad433484..afbaee43 100644
--- a/recipes-graphics/cogl/cogl-1.0_%.bbappend
+++ b/recipes-graphics/cogl/cogl-1.0_%.bbappend
@@ -1,5 +1,5 @@
-PACKAGECONFIG_imxgpu2d ??= " \
+PACKAGECONFIG_imxgpu3d ??= " \
cogl-pango gles2 \
${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'egl-wayland', \
bb.utils.contains('DISTRO_FEATURES', 'x11', 'egl-x11', \
- '', d), d)}"
+ '', d), d)}"
--
2.18.0


[PATCH 22/26] clutter-1.0: Fix configuration for i.MX 8M

Otavio Salvador
 

From: Tom Hochstein <tom.hochstein@...>

Fix configuration for 8M which has 3D GPU but no 2D.

Signed-off-by: Tom Hochstein <tom.hochstein@...>
Signed-off-by: Otavio Salvador <otavio@...>
---

Changes in v4:
- New patch

Changes in v3: None
Changes in v2: None

recipes-graphics/clutter/clutter-1.0_%.bbappend | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/recipes-graphics/clutter/clutter-1.0_%.bbappend b/recipes-graphics/clutter/clutter-1.0_%.bbappend
index 6f139f03..0b4c4861 100644
--- a/recipes-graphics/clutter/clutter-1.0_%.bbappend
+++ b/recipes-graphics/clutter/clutter-1.0_%.bbappend
@@ -1,5 +1,5 @@
-PACKAGECONFIG_imxgpu2d ??= " \
+PACKAGECONFIG_imxgpu3d ??= " \
${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'wayland egl', \
bb.utils.contains('DISTRO_FEATURES', 'x11', 'glx x11', \
- '', d), d)} \
+ '', d), d)} \
"
--
2.18.0


[PATCH 21/26] imx-gpu-g2d: Improve COMPATIBLE_MACHINE

Otavio Salvador
 

From: Tom Hochstein <tom.hochstein@...>

Signed-off-by: Tom Hochstein <tom.hochstein@...>
Signed-off-by: Otavio Salvador <otavio@...>
---

Changes in v4:
- New patch

Changes in v3: None
Changes in v2: None

recipes-graphics/imx-gpu-g2d/imx-gpu-g2d_6.2.4.p1.2.bb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/recipes-graphics/imx-gpu-g2d/imx-gpu-g2d_6.2.4.p1.2.bb b/recipes-graphics/imx-gpu-g2d/imx-gpu-g2d_6.2.4.p1.2.bb
index eab1d31b..6a023507 100644
--- a/recipes-graphics/imx-gpu-g2d/imx-gpu-g2d_6.2.4.p1.2.bb
+++ b/recipes-graphics/imx-gpu-g2d/imx-gpu-g2d_6.2.4.p1.2.bb
@@ -35,4 +35,4 @@ FILES_${PN} = "${libdir}/libg2d* /opt"
FILES_${PN}-dev = "${includedir}"
INSANE_SKIP_${PN} = "ldflags"

-COMPATIBLE_MACHINE = "(mx6|mx7ulp)"
+COMPATIBLE_MACHINE = "(mx6|mx7)"
--
2.18.0


[PATCH 20/26] xf86-video-imx-vivante: Add i.MX 8 support

Otavio Salvador
 

From: Tom Hochstein <tom.hochstein@...>

Signed-off-by: Tom Hochstein <tom.hochstein@...>
Signed-off-by: Otavio Salvador <otavio@...>
---

Changes in v4: None
Changes in v3: None
Changes in v2: None

.../xorg-driver/xf86-video-imx-vivante_6.2.4.p1.2.bb | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/recipes-graphics/xorg-driver/xf86-video-imx-vivante_6.2.4.p1.2.bb b/recipes-graphics/xorg-driver/xf86-video-imx-vivante_6.2.4.p1.2.bb
index fa3a1a35..0bc0bab1 100644
--- a/recipes-graphics/xorg-driver/xf86-video-imx-vivante_6.2.4.p1.2.bb
+++ b/recipes-graphics/xorg-driver/xf86-video-imx-vivante_6.2.4.p1.2.bb
@@ -51,6 +51,8 @@ RDEPENDS_${PN} += "libvivante-dri-imx \
xserver-xorg-extension-dri \
xserver-xorg-extension-dri2 \
xserver-xorg-extension-glx"
+RDEPENDS_${PN}_remove_mx8mq = "xserver-xorg-extension-glx"
+RDEPENDS_${PN}_append_mx8 = " kernel-module-vivante"

REALSOLIBS := "${SOLIBS}"
SOLIBS = "${SOLIBSDEV}"
@@ -62,4 +64,4 @@ FILES_${PN}-dbg = "${libdir}/*/*/*/.debug ${libdir}/.debug/libfsl_x11_ext${SOLIB
FILES_xserver-xorg-extension-viv-autohdmi = " ${libdir}/libfsl_x11_ext${SOLIBS} ${exec_prefix}/bin/autohdmi ${sysconfdir}/init.d/rc.autohdmi"

PACKAGE_ARCH = "${MACHINE_SOCARCH}"
-COMPATIBLE_MACHINE = "(mx6|mx7ulp)"
+COMPATIBLE_MACHINE = "(mx6|mx7ulp|mx8)"
--
2.18.0


[PATCH 19/26] imx-gpu-viv: Add i.MX 8 support

Otavio Salvador
 

From: Tom Hochstein <tom.hochstein@...>

Signed-off-by: Tom Hochstein <tom.hochstein@...>
Signed-off-by: Otavio Salvador <otavio@...>
---

Changes in v4: None
Changes in v3:
- Fix GLES supported versions
- Remove features of unsuported SoCs

Changes in v2: None

.../imx-gpu-viv/imx-gpu-viv-6.inc | 32 +++++++++++++++----
.../imx-gpu-viv_6.2.4.p1.2-aarch64.bb | 6 ++++
2 files changed, 32 insertions(+), 6 deletions(-)
create mode 100644 recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.2.4.p1.2-aarch64.bb

diff --git a/recipes-graphics/imx-gpu-viv/imx-gpu-viv-6.inc b/recipes-graphics/imx-gpu-viv/imx-gpu-viv-6.inc
index 3c159807..6e8887d5 100644
--- a/recipes-graphics/imx-gpu-viv/imx-gpu-viv-6.inc
+++ b/recipes-graphics/imx-gpu-viv/imx-gpu-viv-6.inc
@@ -51,6 +51,8 @@ inherit fsl-eula-unpack
SRC_URI = "${FSL_MIRROR}/${PN}-${PV}.bin;fsl-eula=true"

# Note : If you add a package here, to prevent a naming conflict see the python_anonymous() futher below
+IMX_PACKAGES_GBM = ""
+IMX_PACKAGES_GBM_mx8 = "libgbm-imx libgbm-imx-dev"
PACKAGES =+ "libclc-imx libclc-imx-dev \
libgl-imx libgl-imx-dev \
libgles-imx libgles-imx-dev \
@@ -64,7 +66,7 @@ PACKAGES =+ "libclc-imx libclc-imx-dev \
libgal-imx libgal-imx-dev \
libvivante-dri-imx \
libvsc-imx \
- libgbm-imx libgbm-imx-dev \
+ ${IMX_PACKAGES_GBM} \
libwayland-viv-imx libwayland-viv-imx-dev \
libgc-wayland-protocol-imx libgc-wayland-protocol-imx-dev \
libwayland-egl-imx-dev \
@@ -122,9 +124,16 @@ python __anonymous() {
IS_MX6SL = "0"
IS_MX6SL_mx6sl = "1"

+IS_MX8 = "0"
+IS_MX8_mx8 = "1"
+
PACKAGE_FP_TYPE = "hardfp"

-GLES3_HEADER_REMOVALS = "gl31.h gl32.h"
+HAS_GBM = "false"
+HAS_GBM_mx8 = "true"
+
+GLES3_HEADER_REMOVALS = "gl31.h gl32.h"
+GLES3_HEADER_REMOVALS_mx8mq = "gl32.h"

do_install () {
install -d ${D}${libdir}
@@ -140,6 +149,9 @@ do_install () {
rm -rf ${D}${includedir}/vulkan/vulkan.h

install -d ${D}${libdir}/pkgconfig
+ if ${HAS_GBM}; then
+ install -m 0644 ${S}/gpu-core/usr/lib/pkgconfig/gbm.pc ${D}${libdir}/pkgconfig/gbm.pc
+ fi

# The preference order, based in DISTRO_FEATURES, is Wayland (with or without X11), X11 and fb
if [ "${USE_WL}" = "yes" ]; then
@@ -212,6 +224,14 @@ do_install () {
ln -sf libGLESv2.so.2.0.0 ${D}${libdir}/libGLESv2.so.2
ln -sf libGLESv2.so.2.0.0 ${D}${libdir}/libGLESv2.so

+ if [ "${IS_MX8}" = "1" ]; then
+ # Install the vulkan driver in a sub-folder. When installed in the same
+ # folder as the vulkan loader layer library, an incorrect linkage is
+ # created from libvulkan.so.1 to our library instead of the loader
+ # layer library.
+ install -d ${D}${libdir}/vulkan
+ mv ${D}${libdir}/libvulkan-${backend}.so ${D}${libdir}/vulkan/libvulkan_VSI.so
+ fi
for header in ${GLES3_HEADER_REMOVALS}; do
rm -f ${D}${includedir}/GLES3/${header}
done
@@ -276,9 +296,9 @@ INSANE_SKIP_libgal-imx += "build-deps"

FILES_libvsc-imx = "${libdir}/libVSC${SOLIBS}"

-FILES_libgbm-imx = "${libdir}/libgbm${SOLIBS} ${libdir}/gbm_viv${SOLIBS}"
-FILES_libgbm-imx-dev = "${libdir}/pkgconfig/gbm.pc ${includedir}/gbm.h ${libdir}/libgbm${SOLIBSDEV}"
-RDEPENDS_libgbm-imx += "libdrm"
+FILES_libgbm-imx_mx8 = "${libdir}/libgbm${SOLIBS} ${libdir}/gbm_viv${SOLIBS}"
+FILES_libgbm-imx-dev_mx8 = "${libdir}/pkgconfig/gbm.pc ${includedir}/gbm.h ${libdir}/libgbm${SOLIBSDEV}"
+RDEPENDS_libgbm-imx_append_mx8 = " libdrm"

FILES_libvulkan-imx = "${libdir}/vulkan/libvulkan_VSI${SOLIBS}"
FILES_libvulkan-imx-dev = "${includedir}/vulkan ${libdir}/vulkan/libvulkan_VSI${SOLIBSDEV}"
@@ -344,4 +364,4 @@ FILES_imx-gpu-viv-tools = "${bindir}/gmem_info"
FILES_imx-gpu-viv-demos = "/opt"
INSANE_SKIP_imx-gpu-viv-demos += "rpaths dev-deps"

-# COMPATIBLE_MACHINE = "(mx6q|mx6dl|mx6sx|mx6sl)"
+# COMPATIBLE_MACHINE = "(mx6q|mx6dl|mx6sx|mx6sl|mx8)"
diff --git a/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.2.4.p1.2-aarch64.bb b/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.2.4.p1.2-aarch64.bb
new file mode 100644
index 00000000..4b1a72ca
--- /dev/null
+++ b/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.2.4.p1.2-aarch64.bb
@@ -0,0 +1,6 @@
+require imx-gpu-viv-6.inc
+
+SRC_URI[md5sum] = "28ef177f53be40c738f46018cebf055c"
+SRC_URI[sha256sum] = "27ed3f58681cef18f87ea20946cc89b2cef4848006064303d20583e6ed7aeec7"
+
+COMPATIBLE_MACHINE = "(mx8)"
--
2.18.0


[PATCH 18/26] imx-base.inc: Add imxfbdev and imxdrm to MACHINEOVERRIDES_EXTENDER

Otavio Salvador
 

From: Tom Hochstein <tom.hochstein@...>

- weston uses the imxfbdev override for backend configuration
- imx-gpu-viv uses the imxdrm override for dependency configuration

Signed-off-by: Tom Hochstein <tom.hochstein@...>
Signed-off-by: Otavio Salvador <otavio@...>
---

Changes in v4:
- Rebase due removal of imxdpu and imxdpublit overrides
- Rebase due removal of mx8mm override

Changes in v3: None
Changes in v2: None

conf/machine/include/imx-base.inc | 20 +++++++++----------
.../imx-gpu-viv/imx-gpu-viv-6.inc | 2 +-
recipes-graphics/wayland/weston_4.0.0.imx.bb | 9 ++-------
3 files changed, 13 insertions(+), 18 deletions(-)

diff --git a/conf/machine/include/imx-base.inc b/conf/machine/include/imx-base.inc
index 461927f3..7c48f584 100644
--- a/conf/machine/include/imx-base.inc
+++ b/conf/machine/include/imx-base.inc
@@ -59,16 +59,16 @@ DEFAULTTUNE_vf ?= "cortexa5thf-neon"
INHERIT += "machine-overrides-extender"

MACHINEOVERRIDES_EXTENDER_mx25 = "use-mainline-bsp"
-MACHINEOVERRIDES_EXTENDER_mx6q = "imxipu:imxvpu:imxgpu:imxgpu2d:imxgpu3d"
-MACHINEOVERRIDES_EXTENDER_mx6dl = "imxpxp:imxipu:imxvpu:imxgpu:imxgpu2d:imxgpu3d:imxepdc"
-MACHINEOVERRIDES_EXTENDER_mx6sx = "imxpxp:imxgpu:imxgpu2d:imxgpu3d"
-MACHINEOVERRIDES_EXTENDER_mx6sl = "imxpxp:imxgpu:imxgpu2d:imxepdc"
-MACHINEOVERRIDES_EXTENDER_mx6sll = "imxpxp:imxepdc"
-MACHINEOVERRIDES_EXTENDER_mx6ul = "imxpxp"
-MACHINEOVERRIDES_EXTENDER_mx6ull = "imxpxp:imxepdc"
-MACHINEOVERRIDES_EXTENDER_mx7d = "imxpxp:imxepdc"
-MACHINEOVERRIDES_EXTENDER_mx7ulp = "imxpxp:imxgpu:imxgpu2d:imxgpu3d"
-MACHINEOVERRIDES_EXTENDER_mx8mq = "imxvpu:imxgpu:imxgpu3d"
+MACHINEOVERRIDES_EXTENDER_mx6q = "imxfbdev:imxipu:imxvpu:imxgpu:imxgpu2d:imxgpu3d"
+MACHINEOVERRIDES_EXTENDER_mx6dl = "imxfbdev:imxpxp:imxipu:imxvpu:imxgpu:imxgpu2d:imxgpu3d:imxepdc"
+MACHINEOVERRIDES_EXTENDER_mx6sx = "imxfbdev:imxpxp:imxgpu:imxgpu2d:imxgpu3d"
+MACHINEOVERRIDES_EXTENDER_mx6sl = "imxfbdev:imxpxp:imxgpu:imxgpu2d:imxepdc"
+MACHINEOVERRIDES_EXTENDER_mx6sll = "imxfbdev:imxpxp:imxepdc"
+MACHINEOVERRIDES_EXTENDER_mx6ul = "imxfbdev:imxpxp"
+MACHINEOVERRIDES_EXTENDER_mx6ull = "imxfbdev:imxpxp:imxepdc"
+MACHINEOVERRIDES_EXTENDER_mx7d = "imxfbdev:imxpxp:imxepdc"
+MACHINEOVERRIDES_EXTENDER_mx7ulp = "imxfbdev:imxpxp:imxgpu:imxgpu2d:imxgpu3d"
+MACHINEOVERRIDES_EXTENDER_mx8mq = "imxdrm:imxvpu:imxgpu:imxgpu3d"

MACHINEOVERRIDES_EXTENDER_FILTER_OUT_use-mainline-bsp = " \
mx6 \
diff --git a/recipes-graphics/imx-gpu-viv/imx-gpu-viv-6.inc b/recipes-graphics/imx-gpu-viv/imx-gpu-viv-6.inc
index 0dfc0763..3c159807 100644
--- a/recipes-graphics/imx-gpu-viv/imx-gpu-viv-6.inc
+++ b/recipes-graphics/imx-gpu-viv/imx-gpu-viv-6.inc
@@ -12,11 +12,11 @@ DEPENDS += " \
bb.utils.contains('DISTRO_FEATURES', 'x11', 'virtual/libx11 libxdamage libxext libxfixes', \
'', d), d)} \
"
-DEPENDS += "libdrm"
DEPENDS += " \
${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'libxcb libxshmfence libxxf86vm', \
'', d)} \
"
+DEPENDS_append_imxdrm = " libdrm wayland"

# imx-gpu-viv does not provide everything it needs to for virtual/libgl
# on x11 backend or on Wayland backend with XWayland support.
diff --git a/recipes-graphics/wayland/weston_4.0.0.imx.bb b/recipes-graphics/wayland/weston_4.0.0.imx.bb
index d656aa25..85a73b3e 100644
--- a/recipes-graphics/wayland/weston_4.0.0.imx.bb
+++ b/recipes-graphics/wayland/weston_4.0.0.imx.bb
@@ -38,19 +38,14 @@ EXTRA_OECONF_append_qemux86 = "\
EXTRA_OECONF_append_qemux86-64 = "\
WESTON_NATIVE_BACKEND=fbdev-backend.so \
"
-EXTRA_OECONF_append_mx6 = "\
- WESTON_NATIVE_BACKEND=fbdev-backend.so \
- "
-EXTRA_OECONF_append_mx7 = "\
+EXTRA_OECONF_append_imxfbdev = "\
WESTON_NATIVE_BACKEND=fbdev-backend.so \
"
PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'kms fbdev wayland egl', '', d)} \
${@bb.utils.contains('DISTRO_FEATURES', 'x11 wayland', 'xwayland', '', d)} \
${@bb.utils.filter('DISTRO_FEATURES', 'opengl pam systemd x11', d)} \
clients launch"
-# drm is not supported on mx6/mx7
-PACKAGECONFIG_remove_mx6 = "kms"
-PACKAGECONFIG_remove_mx7 = "kms"
+PACKAGECONFIG_remove_imxfbdev = "kms"
PACKAGECONFIG_append_imxgpu2d = " imxg2d"
PACKAGECONFIG_append_imxgpu3d = " cairo-glesv2"
#
--
2.18.0

2041 - 2060 of 24894