[Buildroot] [PATCH 1/2] support/testing: test_glxinfo: switch to Gallium swrast

[Buildroot] [PATCH 1/2] support/testing: test_glxinfo: switch to Gallium swrast

[Romain Naour]

Since the mesa3d bump to version 21.0.3 [1], the
BR2_PACKAGE_MESA3D_DRI_DRIVER_SWRAST option is not supported anymore
since the mesa DRI swrast driver has been removed upstream

So, switch to Gallium swrast.

[1]15a2f9b819806d38a7d8172a20f80130b1d60e63

Signed-off-by: Romain Naour <romain.naour@gmail.com>
Cc: Bernd Kuhls <bernd.kuhls@t-online.de>
---
 support/testing/tests/package/test_glxinfo.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/support/testing/tests/package/test_glxinfo.py b/support/testing/tests/package/test_glxinfo.py
index f37236d161..44ac92347a 100644
--- a/support/testing/tests/package/test_glxinfo.py
+++ b/support/testing/tests/package/test_glxinfo.py
@@ -25,7 +25,7 @@ class TestGlxinfo(infra.basetest.BRTest):
         BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/x86/linux.config"
         BR2_PACKAGE_MESA3D_DEMOS=y
         BR2_PACKAGE_MESA3D=y
-        BR2_PACKAGE_MESA3D_DRI_DRIVER_SWRAST=y
+        BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_SWRAST=y
         BR2_PACKAGE_MESA3D_OPENGL_GLX=y
         BR2_PACKAGE_XORG7=y
         BR2_PACKAGE_XSERVER_XORG_SERVER=y
-- 
2.31.1

[Buildroot] [PATCH 2/2] support/testing: test_glxinfo load X11 modules in the right order

[Romain Naour]

From [1]
"Xorg does not implement real dynamic linking and requires that its
modules get loaded in the right order."

From /var/log/Xorg.0.0.log:
 (II) LoadModule: "modesetting"
 (II) Loading /usr/lib/xorg/modules/drivers/modesetting_drv.so
 (EE) Failed to load /usr/lib/xorg/modules/drivers/modesetting_drv.so: /usr/lib/xorg/modules/drivers/modesetting_drv.so: undefined symbol: shadowRemove

Fixes:
https://gitlab.com/buildroot.org/buildroot/-/jobs/1255661899

[1] https://forums.gentoo.org/viewtopic-p-8245578.html#8245578

Signed-off-by: Romain Naour <romain.naour@gmail.com>
---
 support/testing/tests/package/test_glxinfo.py         |  4 +++-
 .../etc/X11/xorg.conf.d/01-modules.conf               | 11 +++++++++++
 2 files changed, 14 insertions(+), 1 deletion(-)
 create mode 100644 support/testing/tests/package/test_glxinfo/rootfs-overlay/etc/X11/xorg.conf.d/01-modules.conf

diff --git a/support/testing/tests/package/test_glxinfo.py b/support/testing/tests/package/test_glxinfo.py
index 44ac92347a..3417e48612 100644
--- a/support/testing/tests/package/test_glxinfo.py
+++ b/support/testing/tests/package/test_glxinfo.py
@@ -32,7 +32,9 @@ class TestGlxinfo(infra.basetest.BRTest):
         BR2_TARGET_GENERIC_GETTY_PORT="ttyS0"
         BR2_TARGET_ROOTFS_EXT2=y
         # BR2_TARGET_ROOTFS_TAR is not set
-        """
+        BR2_ROOTFS_OVERLAY="{}"
+        """.format(
+          infra.filepath("tests/package/test_glxinfo/rootfs-overlay"))
 
     def wait_for_xserver(self):
         # xserver takes some time to start up
diff --git a/support/testing/tests/package/test_glxinfo/rootfs-overlay/etc/X11/xorg.conf.d/01-modules.conf b/support/testing/tests/package/test_glxinfo/rootfs-overlay/etc/X11/xorg.conf.d/01-modules.conf
new file mode 100644
index 0000000000..c693c213f5
--- /dev/null
+++ b/support/testing/tests/package/test_glxinfo/rootfs-overlay/etc/X11/xorg.conf.d/01-modules.conf
@@ -0,0 +1,11 @@
+
+# Xorg does not implement real dynamic linking and requires that its
+# modules get loaded in the right order.
+# https://forums.gentoo.org/viewtopic-p-8245578.html#8245578
+Section "Module"
+   Load "vgahw"
+   Load "fb"
+   Load "shadowfb"
+   Load "shadow"
+   Load "glamoregl"
+EndSection
-- 
2.31.1

[Buildroot] [PATCH 2/2] support/testing: test_glxinfo load X11 modules in the right order

[Yann E. MORIN]

Romain, All,

On 2021-05-13 16:11 +0200, Romain Naour spake thusly:
> From [1]
> "Xorg does not implement real dynamic linking and requires that its
> modules get loaded in the right order."
> 
> From /var/log/Xorg.0.0.log:
>  (II) LoadModule: "modesetting"
>  (II) Loading /usr/lib/xorg/modules/drivers/modesetting_drv.so
>  (EE) Failed to load /usr/lib/xorg/modules/drivers/modesetting_drv.so: /usr/lib/xorg/modules/drivers/modesetting_drv.so: undefined symbol: shadowRemove
> 
> Fixes:
> https://gitlab.com/buildroot.org/buildroot/-/jobs/1255661899
> 
> [1] https://forums.gentoo.org/viewtopic-p-8245578.html#8245578
> 
> Signed-off-by: Romain Naour <romain.naour@gmail.com>

Applied to master, thanks.

Regards,
Yann E. MORIN.

> ---
>  support/testing/tests/package/test_glxinfo.py         |  4 +++-
>  .../etc/X11/xorg.conf.d/01-modules.conf               | 11 +++++++++++
>  2 files changed, 14 insertions(+), 1 deletion(-)
>  create mode 100644 support/testing/tests/package/test_glxinfo/rootfs-overlay/etc/X11/xorg.conf.d/01-modules.conf
> 
> diff --git a/support/testing/tests/package/test_glxinfo.py b/support/testing/tests/package/test_glxinfo.py
> index 44ac92347a..3417e48612 100644
> --- a/support/testing/tests/package/test_glxinfo.py
> +++ b/support/testing/tests/package/test_glxinfo.py
> @@ -32,7 +32,9 @@ class TestGlxinfo(infra.basetest.BRTest):
>          BR2_TARGET_GENERIC_GETTY_PORT="ttyS0"
>          BR2_TARGET_ROOTFS_EXT2=y
>          # BR2_TARGET_ROOTFS_TAR is not set
> -        """
> +        BR2_ROOTFS_OVERLAY="{}"
> +        """.format(
> +          infra.filepath("tests/package/test_glxinfo/rootfs-overlay"))
>  
>      def wait_for_xserver(self):
>          # xserver takes some time to start up
> diff --git a/support/testing/tests/package/test_glxinfo/rootfs-overlay/etc/X11/xorg.conf.d/01-modules.conf b/support/testing/tests/package/test_glxinfo/rootfs-overlay/etc/X11/xorg.conf.d/01-modules.conf
> new file mode 100644
> index 0000000000..c693c213f5
> --- /dev/null
> +++ b/support/testing/tests/package/test_glxinfo/rootfs-overlay/etc/X11/xorg.conf.d/01-modules.conf
> @@ -0,0 +1,11 @@
> +
> +# Xorg does not implement real dynamic linking and requires that its
> +# modules get loaded in the right order.
> +# https://forums.gentoo.org/viewtopic-p-8245578.html#8245578
> +Section "Module"
> +   Load "vgahw"
> +   Load "fb"
> +   Load "shadowfb"
> +   Load "shadow"
> +   Load "glamoregl"
> +EndSection
> -- 
> 2.31.1
> 
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot

-- 
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 561 099 427 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'

[Buildroot] [PATCH 2/2] support/testing: test_glxinfo load X11 modules in the right order

[Peter Korsgaard]

>>>>> "Romain" == Romain Naour <romain.naour@gmail.com> writes:

 > From [1]
 > "Xorg does not implement real dynamic linking and requires that its
 > modules get loaded in the right order."

 > From /var/log/Xorg.0.0.log:
 >  (II) LoadModule: "modesetting"
 >  (II) Loading /usr/lib/xorg/modules/drivers/modesetting_drv.so
 >  (EE) Failed to load /usr/lib/xorg/modules/drivers/modesetting_drv.so: /usr/lib/xorg/modules/drivers/modesetting_drv.so: undefined symbol: shadowRemove

 > Fixes:
 > https://gitlab.com/buildroot.org/buildroot/-/jobs/1255661899

 > [1] https://forums.gentoo.org/viewtopic-p-8245578.html#8245578

 > Signed-off-by: Romain Naour <romain.naour@gmail.com>

Is this also applicable to 2021.02.x, E.G. where we use the older swrast
driver?

-- 
Bye, Peter Korsgaard

[Buildroot] [PATCH 2/2] support/testing: test_glxinfo load X11 modules in the right order

[Romain Naour]

Hello Peter,

Le 20/05/2021 ? 11:18, Peter Korsgaard a ?crit?:
>>>>>> "Romain" == Romain Naour <romain.naour@gmail.com> writes:
> 
>  > From [1]
>  > "Xorg does not implement real dynamic linking and requires that its
>  > modules get loaded in the right order."
> 
>  > From /var/log/Xorg.0.0.log:
>  >  (II) LoadModule: "modesetting"
>  >  (II) Loading /usr/lib/xorg/modules/drivers/modesetting_drv.so
>  >  (EE) Failed to load /usr/lib/xorg/modules/drivers/modesetting_drv.so: /usr/lib/xorg/modules/drivers/modesetting_drv.so: undefined symbol: shadowRemove
> 
>  > Fixes:
>  > https://gitlab.com/buildroot.org/buildroot/-/jobs/1255661899
> 
>  > [1] https://forums.gentoo.org/viewtopic-p-8245578.html#8245578
> 
>  > Signed-off-by: Romain Naour <romain.naour@gmail.com>
> 
> Is this also applicable to 2021.02.x, E.G. where we use the older swrast
> driver?
> 

This patch is needed after the switch to the gallium swrast.
Since the test_glxinfo was working for the 2021.02 release the backport is not
needed.

Best regards,
Romain

[Buildroot] [PATCH 2/2] support/testing: test_glxinfo load X11 modules in the right order

[Peter Korsgaard]

>>>>> "Romain" == Romain Naour <romain.naour@gmail.com> writes:

Hi,

 >> > Fixes:
 >> > https://gitlab.com/buildroot.org/buildroot/-/jobs/1255661899
 >> 
 >> > [1] https://forums.gentoo.org/viewtopic-p-8245578.html#8245578
 >> 
 >> > Signed-off-by: Romain Naour <romain.naour@gmail.com>
 >> 
 >> Is this also applicable to 2021.02.x, E.G. where we use the older swrast
 >> driver?

 > This patch is needed after the switch to the gallium swrast.
 > Since the test_glxinfo was working for the 2021.02 release the backport is not
 > needed.

Ok, thanks!

-- 
Bye, Peter Korsgaard

[Buildroot] [PATCH 1/2] support/testing: test_glxinfo: switch to Gallium swrast

[Yann E. MORIN]

Romain, All,

On 2021-05-13 16:11 +0200, Romain Naour spake thusly:
> Since the mesa3d bump to version 21.0.3 [1], the
> BR2_PACKAGE_MESA3D_DRI_DRIVER_SWRAST option is not supported anymore
> since the mesa DRI swrast driver has been removed upstream
> 
> So, switch to Gallium swrast.
> 
> [1]15a2f9b819806d38a7d8172a20f80130b1d60e63
> 
> Signed-off-by: Romain Naour <romain.naour@gmail.com>
> Cc: Bernd Kuhls <bernd.kuhls@t-online.de>

Applied to master, thanks.

Regards,
Yann E. MORIN.

> ---
>  support/testing/tests/package/test_glxinfo.py | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/support/testing/tests/package/test_glxinfo.py b/support/testing/tests/package/test_glxinfo.py
> index f37236d161..44ac92347a 100644
> --- a/support/testing/tests/package/test_glxinfo.py
> +++ b/support/testing/tests/package/test_glxinfo.py
> @@ -25,7 +25,7 @@ class TestGlxinfo(infra.basetest.BRTest):
>          BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/x86/linux.config"
>          BR2_PACKAGE_MESA3D_DEMOS=y
>          BR2_PACKAGE_MESA3D=y
> -        BR2_PACKAGE_MESA3D_DRI_DRIVER_SWRAST=y
> +        BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_SWRAST=y
>          BR2_PACKAGE_MESA3D_OPENGL_GLX=y
>          BR2_PACKAGE_XORG7=y
>          BR2_PACKAGE_XSERVER_XORG_SERVER=y
> -- 
> 2.31.1
> 
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot

-- 
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 561 099 427 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'