Patchwork [1/2] xf86-video-intel: Disable SNA without composite

login
register
mail settings
Submitter Ben Widawsky
Date July 18, 2014, 5:27 a.m.
Message ID <1405661249-6506-1-git-send-email-ben@bwidawsk.net>
Download mbox | patch
Permalink /patch/371342/
State Superseded
Headers show

Comments

Ben Widawsky - July 18, 2014, 5:27 a.m.
SNA requires the composite extension. Fallback to UXA is the user has
decided not to add this. Ideally we could fall back to glamor, but that
was more work.

Cc: Bernd Kuhls <berndkuhls@hotmail.com>
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Ben Widawsky <ben@bwidawsk.net>
---
 .../xdriver_xf86-video-intel/xdriver_xf86-video-intel.mk | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)
Ben Widawsky - July 18, 2014, 11:23 p.m.
On Fri, Jul 18, 2014 at 07:40:34AM +0100, Chris Wilson wrote:
> We shouldn't include calls to the composite extension if it has not been
> built.
> 
> Reported-by: Ben Widawsky <ben@bwidawsk.net>
> Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>

This patch does not apply cleanly to .912. The wiggled patch does build.
With my earlier patch reverted.

If this patch will be in .913, and .913 is coming relatively soon, we
can ignore this entirely for buildroot and simply do a version bump to
.913 when its available.

Thanks.
Thomas Petazzoni - July 23, 2014, 9:44 p.m.
Dear Ben Widawsky,

On Fri, 18 Jul 2014 16:23:37 -0700, Ben Widawsky wrote:
> On Fri, Jul 18, 2014 at 07:40:34AM +0100, Chris Wilson wrote:
> > We shouldn't include calls to the composite extension if it has not been
> > built.
> > 
> > Reported-by: Ben Widawsky <ben@bwidawsk.net>
> > Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
> 
> This patch does not apply cleanly to .912. The wiggled patch does build.
> With my earlier patch reverted.
> 
> If this patch will be in .913, and .913 is coming relatively soon, we
> can ignore this entirely for buildroot and simply do a version bump to
> .913 when its available.

I'm sorry, but I don't understand your comment. Your patch was against
Buildroot, but you say it doesn't apply against .912, which is a
version of the intel driver. Could you explain a bit more if your
patches http://patchwork.ozlabs.org/patch/371342/ and
http://patchwork.ozlabs.org/patch/371343/ are still applicable?

Thanks,

Thomas
Bernd Kuhls - July 29, 2014, 7:21 p.m.
Ben Widawsky <ben@bwidawsk.net> wrote in 
news:1405661249-6506-1-git-send-email-ben@bwidawsk.net:

> SNA requires the composite extension.

Hi,

I could compile the sna module of 2.99.914 using

# BR2_PACKAGE_XLIB_LIBXCOMPOSITE is not set

snippet from configure:

xf86-video-intel 2.99.914 will be compiled with:
  Xorg Video ABI version: 18.0
  Acceleration backends: *sna

2.99.913 included a patch to address this:

* Fix build without Composite extension.

Regards, Bernd

Patch

diff --git a/package/x11r7/xdriver_xf86-video-intel/xdriver_xf86-video-intel.mk b/package/x11r7/xdriver_xf86-video-intel/xdriver_xf86-video-intel.mk
index 332de54..787b8fa 100644
--- a/package/x11r7/xdriver_xf86-video-intel/xdriver_xf86-video-intel.mk
+++ b/package/x11r7/xdriver_xf86-video-intel/xdriver_xf86-video-intel.mk
@@ -16,13 +16,23 @@  XDRIVER_XF86_VIDEO_INTEL_CONF_OPT = \
 	--enable-kms-only \
 	--disable-xvmc \
 	--disable-ums-only \
-	--enable-sna \
-	--disable-uxa \
-	--disable-glamor \
 	--disable-xaa \
 	--disable-dga \
 	--disable-async-swap
 
+ifeq ($(BR2_PACKAGE_XLIB_LIBXCOMPOSITE),y)
+	XDRIVER_XF86_VIDEO_INTEL_CONF_OPT += \
+		--enable-sna \
+		--disable-uxa \
+		--disable-glamor
+else
+	XDRIVER_XF86_VIDEO_INTEL_CONF_OPT += \
+		--disable-sna \
+		--enable-uxa \
+		--disable-glamor
+endif
+
+
 XDRIVER_XF86_VIDEO_INTEL_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_xproto libdrm xlib_libpciaccess
 
 $(eval $(autotools-package))