xserver-xorg-video-intel: Changes to 'ubuntu'
debian/changelog | 8 +
debian/patches/series | 2
debian/patches/sna-force-frontbuffer-to-cpu-for-randr-fallback.diff | 61 ++++++++++
debian/source/local-options | 1
4 files changed, 72 insertions(+)
New commits:
commit 503e4a0b179ab2f6dfd21872bc886eeb06d3c471
Author: Timo Aaltonen <tjaalton@debian.org>
Date: Wed Apr 22 19:48:37 2015 +0300
release to vivid
diff --git a/debian/changelog b/debian/changelog
index 63a980f..12eaca5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,10 @@
-xserver-xorg-video-intel (2:2.99.917-1~exp1ubuntu2.1) UNRELEASED; urgency=medium
+xserver-xorg-video-intel (2:2.99.917-1~exp1ubuntu2.1) vivid; urgency=medium
* sna-force-frontbuffer-to-cpu-for-randr-fallback.diff: Fix rotation
on SKL. (LP: #1447143)
* source: Add extend-diff-ignore to not complain about symlinks.
- -- Timo Aaltonen <tjaalton@debian.org> Wed, 22 Apr 2015 15:20:45 +0300
+ -- Timo Aaltonen <tjaalton@debian.org> Wed, 22 Apr 2015 19:48:22 +0300
xserver-xorg-video-intel (2:2.99.917-1~exp1ubuntu2) vivid; urgency=medium
commit 27a2eac808540b5f50f26b863dfb22cc42483469
Author: Timo Aaltonen <tjaalton@debian.org>
Date: Wed Apr 22 15:24:44 2015 +0300
source: Add extend-diff-ignore to not complain about symlinks.
diff --git a/debian/changelog b/debian/changelog
index beb590d..63a980f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ xserver-xorg-video-intel (2:2.99.917-1~exp1ubuntu2.1) UNRELEASED; urgency=medium
* sna-force-frontbuffer-to-cpu-for-randr-fallback.diff: Fix rotation
on SKL. (LP: #1447143)
+ * source: Add extend-diff-ignore to not complain about symlinks.
-- Timo Aaltonen <tjaalton@debian.org> Wed, 22 Apr 2015 15:20:45 +0300
diff --git a/debian/source/local-options b/debian/source/local-options
new file mode 100644
index 0000000..10404f5
--- /dev/null
+++ b/debian/source/local-options
@@ -0,0 +1 @@
+--extend-diff-ignore=src/render_program/exa_.*.g8a
commit a4b2ef82281e77c672bdd42413f778e557d2e14d
Author: Timo Aaltonen <tjaalton@debian.org>
Date: Wed Apr 22 15:24:05 2015 +0300
sna-force-frontbuffer-to-cpu-for-randr-fallback.diff: Fix rotation on SKL. (LP: #1447143)
diff --git a/debian/changelog b/debian/changelog
index a41fdf9..beb590d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xserver-xorg-video-intel (2:2.99.917-1~exp1ubuntu2.1) UNRELEASED; urgency=medium
+
+ * sna-force-frontbuffer-to-cpu-for-randr-fallback.diff: Fix rotation
+ on SKL. (LP: #1447143)
+
+ -- Timo Aaltonen <tjaalton@debian.org> Wed, 22 Apr 2015 15:20:45 +0300
+
xserver-xorg-video-intel (2:2.99.917-1~exp1ubuntu2) vivid; urgency=medium
* Fix rotating external display with optimus results in corruption.
diff --git a/debian/patches/series b/debian/patches/series
index 6229fcf..f458319 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,5 @@ fix-sna-external-slave-rotation.patch
# XMir series
xmir.patch
+
+sna-force-frontbuffer-to-cpu-for-randr-fallback.diff
diff --git a/debian/patches/sna-force-frontbuffer-to-cpu-for-randr-fallback.diff b/debian/patches/sna-force-frontbuffer-to-cpu-for-randr-fallback.diff
new file mode 100644
index 0000000..53d50fb
--- /dev/null
+++ b/debian/patches/sna-force-frontbuffer-to-cpu-for-randr-fallback.diff
@@ -0,0 +1,61 @@
+commit 15c307d70e00bc035bb61be5d8b6f727925e3d34
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Tue Mar 10 08:48:48 2015 +0000
+
+ sna: Force frontbuffer to CPU for randr fallback
+
+ When we are using the fallback method, we need to make sure the source
+ is on the CPU.
+
+ Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=89053
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+diff --git a/src/sna/sna_display.c b/src/sna/sna_display.c
+index fd6c46c..f648d62 100644
+--- a/src/sna/sna_display.c
++++ b/src/sna/sna_display.c
+@@ -6977,6 +6977,14 @@ sna_crtc_redisplay__fallback(xf86CrtcPtr crtc, RegionPtr region, struct kgem_bo
+ __FUNCTION__, format->format, depth, draw->bitsPerPixel,
+ bo->pitch, crtc->mode.HDisplay, crtc->mode.VDisplay));
+
++ if (sx | sy)
++ RegionTranslate(region, sx, sy);
++ error = !sna_drawable_move_region_to_cpu(draw, region, MOVE_READ);
++ if (sx | sy)
++ RegionTranslate(region, -sx, -sy);
++ if (error)
++ return;
++
+ ptr = kgem_bo_map__gtt(&sna->kgem, bo);
+ if (ptr == NULL)
+ return;
+@@ -6999,6 +7007,29 @@ sna_crtc_redisplay__fallback(xf86CrtcPtr crtc, RegionPtr region, struct kgem_bo
+ pixman_transform_init_translate(&T, sx << 16, sy << 16);
+ pixman_transform_multiply(&T, &T, &crtc->crtc_to_framebuffer);
+ if (!sna_transform_is_integer_translation(&T, &sx, &sy)) {
++#define f2d(x) (((double)(x))/65536.)
++ DBG(("%s: transform=[[%f %f %f], [%f %f %f], [%f %f %f]] (raw [[%x %x %x], [%x %x %x], [%x %x %x]])\n",
++ __FUNCTION__,
++ f2d(T.matrix[0][0]),
++ f2d(T.matrix[0][1]),
++ f2d(T.matrix[0][2]),
++ f2d(T.matrix[1][0]),
++ f2d(T.matrix[1][1]),
++ f2d(T.matrix[1][2]),
++ f2d(T.matrix[2][0]),
++ f2d(T.matrix[2][1]),
++ f2d(T.matrix[2][2]),
++ T.matrix[0][0],
++ T.matrix[0][1],
++ T.matrix[0][2],
++ T.matrix[1][0],
++ T.matrix[1][1],
++ T.matrix[1][2],
++ T.matrix[2][0],
++ T.matrix[2][1],
++ T.matrix[2][2]));
++#undef f2d
++
+ error = SetPictureTransform(src, &T);
+ if (error)
+ goto free_src;
Reply to: