debian/changelog | 7 ++ debian/patches/series | 1 debian/patches/sna-reject-cpu-blits-that-require-format-conversions.patch | 24 ++++++++++ debian/rules | 1 4 files changed, 33 insertions(+)
New commits: commit 626be268acfddb3e53db5d1e5311acbdcac869be Author: Robert Hooker <sarv...@ubuntu.com> Date: Wed Oct 28 11:19:54 2015 -0400 Add sna-reject-cpu-blits-that-require-format-conversions.patch and build with --enable-wc-mmap diff --git a/debian/changelog b/debian/changelog index 2b82360..777e0c6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +xserver-xorg-video-intel (2:2.99.917-1~exp1ubuntu2.3) UNRELEASED; urgency=medium + + * Add sna-reject-cpu-blits-that-require-format-conversions.patch and build with + --enable-wc-mmap: Fix webcam problems on Skylake (LP: #1506107) + + -- Robert Hooker <sarv...@ubuntu.com> Tue, 13 Oct 2015 12:25:21 -0400 + xserver-xorg-video-intel (2:2.99.917-1~exp1ubuntu2.2) vivid-proposed; urgency=medium * fix-yuv-to-rgb-shared-on-intel-gen8.patch: Fix faulty yuv2rgb translation diff --git a/debian/patches/series b/debian/patches/series index ceb8885..e6ebe90 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -5,3 +5,4 @@ xmir.patch sna-force-frontbuffer-to-cpu-for-randr-fallback.diff fix-yuv-to-rgb-shared-on-intel-gen8.patch +sna-reject-cpu-blits-that-require-format-conversions.patch diff --git a/debian/patches/sna-reject-cpu-blits-that-require-format-conversions.patch b/debian/patches/sna-reject-cpu-blits-that-require-format-conversions.patch new file mode 100644 index 0000000..23db417 --- /dev/null +++ b/debian/patches/sna-reject-cpu-blits-that-require-format-conversions.patch @@ -0,0 +1,24 @@ +From cc9d7f6777703037d0d7eff346dd350f4d8b3f31 Mon Sep 17 00:00:00 2001 +From: Chris Wilson <ch...@chris-wilson.co.uk> +Date: Tue, 6 Jan 2015 13:29:49 +0000 +Subject: sna: Reject CPU blits that require format conversions + +Signed-off-by: Chris Wilson <ch...@chris-wilson.co.uk> + +diff --git a/src/sna/sna_render.c b/src/sna/sna_render.c +index 3fbb9ec..92c5afc 100644 +--- a/src/sna/sna_render.c ++++ b/src/sna/sna_render.c +@@ -2336,6 +2336,9 @@ memcpy_copy_boxes(struct sna *sna, uint8_t op, + if (op != GXcopy) + return false; + ++ if (src_draw->depth != dst_draw->depth) ++ return false; ++ + clipped = (n > 1 || + box->x1 + dx > 0 || + box->y1 + dy > 0 || +-- +cgit v0.10.2 + diff --git a/debian/rules b/debian/rules index 037f617..241bcf1 100755 --- a/debian/rules +++ b/debian/rules @@ -24,6 +24,7 @@ override_dh_auto_configure: --with-default-accel=sna \ --with-builderstring="$(SOURCE_NAME) $(SOURCE_VERSION) ($(BUILDER))" \ --disable-silent-rules \ + --enable-wc-mmap \ $(valgrind) # Install in debian/tmp to retain control through dh_install: