[Buildroot] [PATCH 1/2] package/x11r7/xdriver_xf86-video-amdgpu: needs opengl

[Buildroot] [PATCH 1/2] package/x11r7/xdriver_xf86-video-amdgpu: needs opengl

[Bernd Kuhls]

The package needs dri.h
https://cgit.freedesktop.org/xorg/driver/xf86-video-amdgpu/tree/src/amdgpu_probe.c#n53
https://cgit.freedesktop.org/xorg/driver/xf86-video-amdgpu/tree/src/drmmode_display.c#n50

which is only provided by xserver_xorg-server when opengl is enabled:
https://git.buildroot.net/buildroot/tree/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk#n123

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
The build error was not recorded by the autobuilders because they fail
already during at configure stage due to wrong dependencies for glamor
support fixed in the second patch of this series.

 package/x11r7/xdriver_xf86-video-amdgpu/Config.in | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/package/x11r7/xdriver_xf86-video-amdgpu/Config.in b/package/x11r7/xdriver_xf86-video-amdgpu/Config.in
index c42255f55c..fb18c0d812 100644
--- a/package/x11r7/xdriver_xf86-video-amdgpu/Config.in
+++ b/package/x11r7/xdriver_xf86-video-amdgpu/Config.in
@@ -2,6 +2,7 @@ config BR2_PACKAGE_XDRIVER_XF86_VIDEO_AMDGPU
 	bool "xf86-video-amdgpu"
 	depends on BR2_USE_MMU # libdrm
 	depends on BR2_PACKAGE_MESA3D_DRI_DRIVER
+	depends on BR2_PACKAGE_MESA3D_OPENGL_GLX # dri.h
 	depends on BR2_PACKAGE_MESA3D_OPENGL_EGL # gbm
 	select BR2_PACKAGE_LIBDRM
 	select BR2_PACKAGE_LIBDRM_AMDGPU
@@ -14,4 +15,5 @@ config BR2_PACKAGE_XDRIVER_XF86_VIDEO_AMDGPU
 comment "xf86-video-amdgpu needs egl/opengl support from mesa3d"
 	depends on BR2_USE_MMU
 	depends on !BR2_PACKAGE_MESA3D_OPENGL_EGL || \
+		!BR2_PACKAGE_MESA3D_OPENGL_GLX || \
 		!BR2_PACKAGE_MESA3D_DRI_DRIVER
-- 
2.25.0

[Buildroot] [PATCH 2/2] package/x11r7/xdriver_xf86-video-amdgpu: fix glamor dependency

[Bernd Kuhls]

Copy glamor dependencies from xserver_xorg-server omitting libgl/libegl
because this package already depends on both options:
https://git.buildroot.net/buildroot/tree/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk#n192

Fixes:
http://autobuild.buildroot.net/results/4da/4da87d30e6f5a10aafae60abce1b89ed92204a4e/
http://autobuild.buildroot.net/results/74c/74ceb71bd48ea3a2bf6ff68aec0af76a11662f1f/

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
 .../xdriver_xf86-video-amdgpu/xdriver_xf86-video-amdgpu.mk  | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/package/x11r7/xdriver_xf86-video-amdgpu/xdriver_xf86-video-amdgpu.mk b/package/x11r7/xdriver_xf86-video-amdgpu/xdriver_xf86-video-amdgpu.mk
index e7196956a3..ccb5b30d90 100644
--- a/package/x11r7/xdriver_xf86-video-amdgpu/xdriver_xf86-video-amdgpu.mk
+++ b/package/x11r7/xdriver_xf86-video-amdgpu/xdriver_xf86-video-amdgpu.mk
@@ -15,6 +15,12 @@ XDRIVER_XF86_VIDEO_AMDGPU_DEPENDENCIES = \
 	xorgproto \
 	xserver_xorg-server
 
+ifeq ($(BR2_PACKAGE_LIBEPOXY),y)
+XDRIVER_XF86_VIDEO_AMDGPU_CONF_OPTS = --enable-glamor
+else
+XDRIVER_XF86_VIDEO_AMDGPU_CONF_OPTS = --disable-glamor
+endif
+
 # xdriver_xf86-video-amdgpu requires O_CLOEXEC
 XDRIVER_XF86_VIDEO_AMDGPU_CONF_ENV += CFLAGS="$(TARGET_CFLAGS) -D_GNU_SOURCE"
 
-- 
2.25.0

[Buildroot] [PATCH 2/2]package/x11r7/xdriver_xf86-video-amdgpu:fix glamor dependency

[Bernd Kuhls]

Am Fri, 10 Apr 2020 14:32:07 +0200 schrieb Bernd Kuhls:

> Copy glamor dependencies from xserver_xorg-server omitting libgl/libegl
> because this package already depends on both options:
> https://git.buildroot.net/buildroot/tree/package/x11r7/xserver_xorg-
server/xserver_xorg-server.mk#n192
> 
> Fixes:
> http://autobuild.buildroot.net/results/4da/
4da87d30e6f5a10aafae60abce1b89ed92204a4e/
> http://autobuild.buildroot.net/results/74c/
74ceb71bd48ea3a2bf6ff68aec0af76a11662f1f/

Hi,

this patch series[1] is still needed:

http://autobuild.buildroot.net/results/
541/54193d198efe371bdb19ac4981d631ff1e279717//

Regards, Bernd

[1] http://patchwork.ozlabs.org/project/buildroot/list/?series=169608

Re: [Buildroot] [PATCH 1/2] package/x11r7/xdriver_xf86-video-amdgpu: needs opengl

[Arnout Vandecappelle]

On 10/04/2020 14:32, Bernd Kuhls wrote:
> The package needs dri.h
> https://cgit.freedesktop.org/xorg/driver/xf86-video-amdgpu/tree/src/amdgpu_probe.c#n53
> https://cgit.freedesktop.org/xorg/driver/xf86-video-amdgpu/tree/src/drmmode_display.c#n50
> 
> which is only provided by xserver_xorg-server when opengl is enabled:
> https://git.buildroot.net/buildroot/tree/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk#n123
> 
> Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
> ---
> The build error was not recorded by the autobuilders because they fail
> already during at configure stage due to wrong dependencies for glamor
> support fixed in the second patch of this series.
> 
>   package/x11r7/xdriver_xf86-video-amdgpu/Config.in | 2 ++
>   1 file changed, 2 insertions(+)
> 
> diff --git a/package/x11r7/xdriver_xf86-video-amdgpu/Config.in b/package/x11r7/xdriver_xf86-video-amdgpu/Config.in
> index c42255f55c..fb18c0d812 100644
> --- a/package/x11r7/xdriver_xf86-video-amdgpu/Config.in
> +++ b/package/x11r7/xdriver_xf86-video-amdgpu/Config.in
> @@ -2,6 +2,7 @@ config BR2_PACKAGE_XDRIVER_XF86_VIDEO_AMDGPU
>   	bool "xf86-video-amdgpu"
>   	depends on BR2_USE_MMU # libdrm
>   	depends on BR2_PACKAGE_MESA3D_DRI_DRIVER
> +	depends on BR2_PACKAGE_MESA3D_OPENGL_GLX # dri.h

  The condition in xorg-server is:

ifeq ($(BR2_PACKAGE_HAS_LIBGL),y)
XSERVER_XORG_SERVER_CONF_OPTS += --enable-dri --enable-glx
XSERVER_XORG_SERVER_DEPENDENCIES += libgl
else
XSERVER_XORG_SERVER_CONF_OPTS += --disable-dri --disable-glx
endif

So this should depend on HAS_LIBGL, no?


>   	depends on BR2_PACKAGE_MESA3D_OPENGL_EGL # gbm

  This one should probably also switch to the new gbm option.

  Regards,
  Arnout

>   	select BR2_PACKAGE_LIBDRM
>   	select BR2_PACKAGE_LIBDRM_AMDGPU
> @@ -14,4 +15,5 @@ config BR2_PACKAGE_XDRIVER_XF86_VIDEO_AMDGPU
>   comment "xf86-video-amdgpu needs egl/opengl support from mesa3d"
>   	depends on BR2_USE_MMU
>   	depends on !BR2_PACKAGE_MESA3D_OPENGL_EGL || \
> +		!BR2_PACKAGE_MESA3D_OPENGL_GLX || \
>   		!BR2_PACKAGE_MESA3D_DRI_DRIVER
> 
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH 2/2] package/x11r7/xdriver_xf86-video-amdgpu: fix glamor dependency

[Arnout Vandecappelle]

On 10/04/2020 14:32, Bernd Kuhls wrote:
> Copy glamor dependencies from xserver_xorg-server omitting libgl/libegl
> because this package already depends on both options:
> https://git.buildroot.net/buildroot/tree/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk#n192
> 
> Fixes:
> http://autobuild.buildroot.net/results/4da/4da87d30e6f5a10aafae60abce1b89ed92204a4e/
> http://autobuild.buildroot.net/results/74c/74ceb71bd48ea3a2bf6ff68aec0af76a11662f1f/
> 
> Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
> ---
>   .../xdriver_xf86-video-amdgpu/xdriver_xf86-video-amdgpu.mk  | 6 ++++++
>   1 file changed, 6 insertions(+)
> 
> diff --git a/package/x11r7/xdriver_xf86-video-amdgpu/xdriver_xf86-video-amdgpu.mk b/package/x11r7/xdriver_xf86-video-amdgpu/xdriver_xf86-video-amdgpu.mk
> index e7196956a3..ccb5b30d90 100644
> --- a/package/x11r7/xdriver_xf86-video-amdgpu/xdriver_xf86-video-amdgpu.mk
> +++ b/package/x11r7/xdriver_xf86-video-amdgpu/xdriver_xf86-video-amdgpu.mk
> @@ -15,6 +15,12 @@ XDRIVER_XF86_VIDEO_AMDGPU_DEPENDENCIES = \
>   	xorgproto \
>   	xserver_xorg-server
>   
> +ifeq ($(BR2_PACKAGE_LIBEPOXY),y)

  libepoxy is already select'ed in Config.in, so this condition is useless. 
Thus, this patch does exactly nothing since glamor is always enabled.

  But I guess the select could be removed from Config.in?

  I thought that maybe the issue was that libepoxy has to be added to _DEPENDS, 
but in fact, in the autobuild failures libepoxy is already built before this 
package (indirect dependency through xorg-server). So I'm not sure how this 
really should be fixed...

  BTW, the issue is still happening in autobuilders [1], just very very rarely 
(once every 4 months or so).

  Regards,
  Arnout


[1] http://autobuild.buildroot.net/?reason=xdriver_xf86-video-amdgpu%25



> +XDRIVER_XF86_VIDEO_AMDGPU_CONF_OPTS = --enable-glamor
> +else
> +XDRIVER_XF86_VIDEO_AMDGPU_CONF_OPTS = --disable-glamor
> +endif
> +
>   # xdriver_xf86-video-amdgpu requires O_CLOEXEC
>   XDRIVER_XF86_VIDEO_AMDGPU_CONF_ENV += CFLAGS="$(TARGET_CFLAGS) -D_GNU_SOURCE"
>   
> 
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot