xdriver_xf86-video-intel: Bump version to 2.99.914, add DRI3 support
cover xdriver_xf86-video-intel: Bump version to 2.99.914, add DRI3 support
Hi,
this small series bumps xdriver_xf86-video-intel to the latest version. While being at it, add DRI3 support to X.org server so the intel driver can pick it up. The patch for xdriver_xf86-video-intel should be one commit, although addressing various topics, because it would otherwise fail at configure stage because of newly introduced DRI checks.
This patch merges and supersedes
my original 2.99.911 bump
http://patchwork.ozlabs.org/patch/370975/
the 2.99.912 bump by Ben Widawsky
http://patchwork.ozlabs.org/patch/371343/
SNA does not depend on xlib_libXcomposite, this patch by Ben is not needed
http://patchwork.ozlabs.org/patch/371342/
sna/dri2: Protect compsiteext.h include with build check by Ben
http://patchwork.ozlabs.org/patch/373074/
was applied upstream and released with 2.99.913
http://cgit.freedesktop.org/xorg/driver/xf86-video-intel/commit/?id=fac6845820e49dbbea2a625b7bb745d8f9159b56
This series was compile-tested using these defconfigs:
- without any DRI support:
BR2_TOOLCHAIN_EXTERNAL=y
BR2_PACKAGE_XORG7=y
BR2_PACKAGE_XSERVER_XORG_SERVER=y
BR2_PACKAGE_XSERVER_XORG_SERVER_MODULAR=y
BR2_PACKAGE_XDRIVER_XF86_VIDEO_INTEL=y
- DRI1 & DRI2 support:
BR2_TOOLCHAIN_EXTERNAL=y
BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y
BR2_PACKAGE_MESA3D=y
BR2_PACKAGE_MESA3D_DRI_DRIVER_I965=y
BR2_PACKAGE_XORG7=y
BR2_PACKAGE_XSERVER_XORG_SERVER=y
BR2_PACKAGE_XSERVER_XORG_SERVER_MODULAR=y
BR2_PACKAGE_XDRIVER_XF86_VIDEO_INTEL=y
- DRI1/2/3 support (added this line to the DRI1/2 defconfig):
BR2_PACKAGE_XPROTO_DRI3PROTO=y
Configure summary for the DRI1/2/3 case:
xf86-video-intel 2.99.914 will be compiled with:
Xorg Video ABI version: 18.0
Acceleration backends: *sna uxa
Additional debugging support? none
Support for Kernel Mode Setting? yes
Support for legacy User Mode Setting (for i810)? yes Support for Direct Rendering Infrastructure: DRI1 DRI2 DRI3 Present
Regards, Bernd
Bernd Kuhls (2):
xserver_xorg-server: Add support for DRI3
xdriver_xf86-video-intel: Bump version to 2.99.914
package/x11r7/xdriver_xf86-video-intel/Config.in | 8 +---- .../xdriver_xf86-video-intel.mk | 33 +++++++++++++++----- .../xserver_xorg-server/xserver_xorg-server.mk | 6 +++- 3 files changed, 32 insertions(+), 15 deletions(-)
Signature · 1 line
1.7.10.4
PATCH 1/2 xserver_xorg-server: Add support for DRI3
--- package/x11r7/xserver_xorg-server/xserver_xorg-server.mk | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
package/x11r7/xserver_xorg-server/xserver_xorg-server.mk +5 -1
@@ -170,8 +170,12 @@ ifeq ($(BR2_PACKAGE_XPROTO_DRI2PROTO),y) XSERVER_XORG_SERVER_DEPENDENCIES += xproto_dri2proto XSERVER_XORG_SERVER_CONF_OPT += --enable-dri2 endif +ifeq ($(BR2_PACKAGE_XPROTO_DRI3PROTO),y) +XSERVER_XORG_SERVER_DEPENDENCIES += xlib_libxshmfence xproto_dri3proto +XSERVER_XORG_SERVER_CONF_OPT += --enable-dri3 +endif else -XSERVER_XORG_SERVER_CONF_OPT += --disable-dri2 +XSERVER_XORG_SERVER_CONF_OPT += --disable-dri2 --disable-dri3 endif ifeq ($(BR2_PACKAGE_XLIB_LIBXSCRNSAVER),y)
Signature · 1 line
1.7.10.4
PATCH 2/2 xdriver_xf86-video-intel: Bump version to 2.99.914
In reply to Bernd Kuhls- enable sna module by default
- optionally enable uxa module if DRI2 support is enabled
- add support for DRI3
- dependencies for DRI1/2/3 modules are provided by xserver_xorg-server, therefore remove mesa3d dependency
- clean-up ums/kms options, configure picks sane defaults
- replace dependencies xproto_randrproto & xproto_renderproto with xlib_libXrandr
--- package/x11r7/xdriver_xf86-video-intel/Config.in | 8 +---- .../xdriver_xf86-video-intel.mk | 33 +++++++++++++++----- 2 files changed, 27 insertions(+), 14 deletions(-)
package/x11r7/xdriver_xf86-video-intel/Config.in +1 -7
@@ -1,17 +1,11 @@ config BR2_PACKAGE_XDRIVER_XF86_VIDEO_INTEL bool "xf86-video-intel" depends on (BR2_i386 || BR2_x86_64) - depends on BR2_PACKAGE_MESA3D select BR2_PACKAGE_XPROTO_FONTSPROTO - select BR2_PACKAGE_XPROTO_RANDRPROTO - select BR2_PACKAGE_XPROTO_RENDERPROTO select BR2_PACKAGE_XPROTO_XPROTO select BR2_PACKAGE_XLIB_LIBPCIACCESS select BR2_PACKAGE_LIBDRM select BR2_PACKAGE_LIBDRM_INTEL + select BR2_PACKAGE_XLIB_LIBXRANDR help Intel video driver - -comment "xf86-video-intel needs mesa3d" - depends on (BR2_i386 || BR2_x86_64) - depends on !BR2_PACKAGE_MESA3D
package/x11r7/xdriver_xf86-video-intel/xdriver_xf86-video-intel.mk +26 -7
@@ -4,25 +4,44 @@ # ################################################################################ -XDRIVER_XF86_VIDEO_INTEL_VERSION = 2.99.907 +XDRIVER_XF86_VIDEO_INTEL_VERSION = 2.99.914 XDRIVER_XF86_VIDEO_INTEL_SOURCE = xf86-video-intel-$(XDRIVER_XF86_VIDEO_INTEL_VERSION).tar.bz2 XDRIVER_XF86_VIDEO_INTEL_SITE = http://xorg.freedesktop.org/releases/individual/driver XDRIVER_XF86_VIDEO_INTEL_LICENSE = MIT XDRIVER_XF86_VIDEO_INTEL_LICENSE_FILES = COPYING -XDRIVER_XF86_VIDEO_INTEL_AUTORECONF = YES XDRIVER_XF86_VIDEO_INTEL_CONF_OPT = \ - --enable-dri \ - --enable-kms-only \ --disable-xvmc \ - --disable-ums-only \ --enable-sna \ - --disable-uxa \ --disable-glamor \ --disable-xaa \ --disable-dga \ --disable-async-swap -XDRIVER_XF86_VIDEO_INTEL_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_xproto libdrm xlib_libpciaccess +XDRIVER_XF86_VIDEO_INTEL_DEPENDENCIES = \ + libdrm \ + xlib_libXrandr \ + xlib_libpciaccess \ + xproto_fontsproto \ + xproto_xproto \ + xserver_xorg-server + +# X.org server support for DRI depends on a Mesa3D DRI driver +ifeq ($(BR2_PACKAGE_MESA3D_DRI_DRIVER),y) +XDRIVER_XF86_VIDEO_INTEL_CONF_OPT += --enable-dri --enable-dri1 +# quote from configure.ac: "UXA doesn't build without DRI2 headers" +ifeq ($(BR2_PACKAGE_XPROTO_DRI2PROTO),y) +XDRIVER_XF86_VIDEO_INTEL_CONF_OPT += --enable-dri2 --enable-uxa +else +XDRIVER_XF86_VIDEO_INTEL_CONF_OPT += --disable-dri2 --disable-uxa +endif +ifeq ($(BR2_PACKAGE_XPROTO_DRI3PROTO),y) +XDRIVER_XF86_VIDEO_INTEL_CONF_OPT += --enable-dri3 +else +XDRIVER_XF86_VIDEO_INTEL_CONF_OPT += --disable-dri3 +endif +else +XDRIVER_XF86_VIDEO_INTEL_CONF_OPT += --disable-dri +endif $(eval $(autotools-package))
Signature · 1 line
1.7.10.4
cover xdriver_xf86-video-intel: Bump version to 2.99.914, add DRI3 support
In reply to Bernd KuhlsDear Bernd Kuhls,
Adding Ben in Cc.
Quoted 5 lines · Bernd Kuhls
this small series bumps xdriver_xf86-video-intel to the latest version. While being at it, add DRI3 support to X.org server so the intel driver can pick it up. The patch for xdriver_xf86-video-intel should be one commit, although addressing various topics, because it would otherwise fail at configure stage because of newly introduced DRI checks.
[...]
Quoted 3 lines
Bernd Kuhls (2):
xserver_xorg-server: Add support for DRI3
xdriver_xf86-video-intel: Bump version to 2.99.914
Thanks, both patches applied.
Ben, can you test the latest Buildroot master, and see if it works for you?
Thanks a lot!
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons Embedded Linux, Kernel and Android engineering http://free-electrons.com