diff mbox

[2/2] package/x11r7/xdriver_xf86-video-nouveau: Fix DRI dependency

Message ID 1450544015-17658-2-git-send-email-bernd.kuhls@t-online.de
State Superseded
Headers show

Commit Message

Bernd Kuhls Dec. 19, 2015, 4:53 p.m. UTC
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
 package/x11r7/xdriver_xf86-video-nouveau/Config.in | 4 ++++
 1 file changed, 4 insertions(+)

Comments

Thomas Petazzoni Dec. 20, 2015, 1 p.m. UTC | #1
Dear Bernd Kuhls,

On Sat, 19 Dec 2015 17:53:35 +0100, Bernd Kuhls wrote:

>  config BR2_PACKAGE_XDRIVER_XF86_VIDEO_NOUVEAU
>  	bool "xf86-video-nouveau"
>  	depends on BR2_PACKAGE_MESA3D
> +	# package depends on DRI support in xserver_xorg-server
> +	# libdrm locking macros use armv6+ instructions on arm
> +	depends on !BR2_ARM_CPU_ARMV4 && !BR2_ARM_CPU_ARMV5
>  	select BR2_PACKAGE_MESA3D_DRI_DRIVER_NOUVEAU
>  	select BR2_PACKAGE_LIBDRM
>  	select BR2_PACKAGE_LIBDRM_NOUVEAU

I don't quite understand this one. Where are these locking macros
implemented? In the nouveau xf86 driver? In the libdrm nouveau part? In
the mesa3d nouveau part?

The way you worded the comment makes me think it's in libdrm (but I was
unable to find those macros). And if they are in libdrm, then the
dependency should also be used for the libdrm package.

Could you clarify?

Thanks,

Thomas
Bernd Kuhls Dec. 20, 2015, 5:09 p.m. UTC | #2
Hi Thomas,

Am Sun, 20 Dec 2015 14:00:03 +0100 schrieb Thomas Petazzoni:

> Dear Bernd Kuhls,
> 
> On Sat, 19 Dec 2015 17:53:35 +0100, Bernd Kuhls wrote:
> 
>>  config BR2_PACKAGE_XDRIVER_XF86_VIDEO_NOUVEAU
>>  	bool "xf86-video-nouveau"
>>  	depends on BR2_PACKAGE_MESA3D
>> +	# package depends on DRI support in xserver_xorg-server +	# 
libdrm
>> locking macros use armv6+ instructions on arm +	depends on
>> !BR2_ARM_CPU_ARMV4 && !BR2_ARM_CPU_ARMV5
>>  	select BR2_PACKAGE_MESA3D_DRI_DRIVER_NOUVEAU select
>>  	BR2_PACKAGE_LIBDRM select BR2_PACKAGE_LIBDRM_NOUVEAU
> 
> I don't quite understand this one. Where are these locking macros
> implemented? In the nouveau xf86 driver? In the libdrm nouveau part? In
> the mesa3d nouveau part?

the limitation comes from xserver_xorg-server:
https://git.busybox.net/buildroot/tree/package/x11r7/xserver_xorg-server/
xserver_xorg-server.mk#n133

xdriver_xf86-video-nouveau needs DRI support enabled in the xserver_xorg-
server package, this is only true in this case:
ifeq ($(BR2_PACKAGE_MESA3D_DRI_DRIVER)n$(BR2_ARM_CPU_ARMV4)
$(BR2_ARM_CPU_ARMV5),yn)

I ported this limitation (no DRI support for armv4/5) to package/x11r7/
xdriver_xf86-video-nouveau/Config.in with this patch, along with the 
comment from xserver_xorg-server.mk and a reference to the xserver_xorg-
server package to fix your build error on armv5:
http://article.gmane.org/gmane.comp.lib.uclibc.buildroot/135186

Regards, Bernd
Thomas Petazzoni March 22, 2016, 9:31 p.m. UTC | #3
Hello,

On Sat, 19 Dec 2015 17:53:35 +0100, Bernd Kuhls wrote:
> Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
> ---
>  package/x11r7/xdriver_xf86-video-nouveau/Config.in | 4 ++++
>  1 file changed, 4 insertions(+)

I've just sent a series at
http://lists.busybox.net/pipermail/buildroot/2016-March/156858.html,
which I believe is a better fix for this problem. More details are
available in the cover letter.

Thanks!

Thomas
diff mbox

Patch

diff --git a/package/x11r7/xdriver_xf86-video-nouveau/Config.in b/package/x11r7/xdriver_xf86-video-nouveau/Config.in
index 7e756e2..5fe659c 100644
--- a/package/x11r7/xdriver_xf86-video-nouveau/Config.in
+++ b/package/x11r7/xdriver_xf86-video-nouveau/Config.in
@@ -1,6 +1,9 @@ 
 config BR2_PACKAGE_XDRIVER_XF86_VIDEO_NOUVEAU
 	bool "xf86-video-nouveau"
 	depends on BR2_PACKAGE_MESA3D
+	# package depends on DRI support in xserver_xorg-server
+	# libdrm locking macros use armv6+ instructions on arm
+	depends on !BR2_ARM_CPU_ARMV4 && !BR2_ARM_CPU_ARMV5
 	select BR2_PACKAGE_MESA3D_DRI_DRIVER_NOUVEAU
 	select BR2_PACKAGE_LIBDRM
 	select BR2_PACKAGE_LIBDRM_NOUVEAU
@@ -16,3 +19,4 @@  config BR2_PACKAGE_XDRIVER_XF86_VIDEO_NOUVEAU
 
 comment "xf86-video-nouveau needs mesa3d"
 	depends on !BR2_PACKAGE_MESA3D
+	depends on !BR2_ARM_CPU_ARMV4 && !BR2_ARM_CPU_ARMV5