xserver-xorg-video-intel: Changes to 'ubuntu-trusty'
debian/changelog |7
debian/patches/series|1
debian/patches/sna-mark-the-chv-vsync-method-as-unknown.diff | 79 +++
3 files changed, 87 insertions(+)
New commits:
commit 74fc25242ee851cddbd9f8281ca8ab0c855cdb2e
Author: Timo Aaltonen tjaal...@debian.org
Date: Fri Apr 17 08:02:56 2015 +0300
sna-mark-the-chv-vsync-method-as-unknown.diff: Fix video playback on CHV.
(LP: #1445221)
diff --git a/debian/changelog b/debian/changelog
index 9173a6c..c451dc3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xserver-xorg-video-intel (2:2.99.910-0ubuntu1.6) trusty-proposed;
urgency=medium
+
+ * sna-mark-the-chv-vsync-method-as-unknown.diff: Fix video playback
+on CHV. (LP: #1445221)
+
+ -- Timo Aaltonen tjaal...@debian.org Fri, 17 Apr 2015 08:00:47 +0300
+
xserver-xorg-video-intel (2:2.99.910-0ubuntu1.5) trusty-proposed;
urgency=medium
* bdw-annotate-more-64bit-pointer-locations.diff
diff --git a/debian/patches/series b/debian/patches/series
index d59c64f..936f609 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -28,3 +28,4 @@ sna-add-more-checks-and-asserts-for-blt.diff
fix-sna-external-slave-rotation.patch
bdw-annotate-more-64bit-pointer-locations.diff
bdw-clamp-urb-allocations-for-gt3.diff
+sna-mark-the-chv-vsync-method-as-unknown.diff
diff --git a/debian/patches/sna-mark-the-chv-vsync-method-as-unknown.diff
b/debian/patches/sna-mark-the-chv-vsync-method-as-unknown.diff
new file mode 100644
index 000..1e90381
--- /dev/null
+++ b/debian/patches/sna-mark-the-chv-vsync-method-as-unknown.diff
@@ -0,0 +1,79 @@
+commit 2afeef0c3ffeae768198fc08c9f365ccd28b7f5d
+Author: Chris Wilson ch...@chris-wilson.co.uk
+Date: Thu May 15 11:28:48 2014 +0100
+
+sna: Mark the CHV vsync method as unknown
+
+Similar to the story with Baytrail, vsync is a lost art.
+
+Signed-off-by: Chris Wilson ch...@chris-wilson.co.uk
+
+--- a/src/sna/sna_display.c
b/src/sna/sna_display.c
+@@ -4209,52 +4209,6 @@ static bool sna_emit_wait_for_scanline_h
+ return true;
+ }
+
+-static bool sna_emit_wait_for_scanline_vlv(struct sna *sna,
+- xf86CrtcPtr crtc,
+- int pipe, int y1, int y2,
+- bool full_height)
+-{
+- uint32_t display_base = 0x18;
+- uint32_t event;
+- uint32_t *b;
+-
+- return false; /* synchronisation? I've heard of that */
+-
+- if (!sna-kgem.has_secure_batches)
+- return false;
+-
+- assert(y1 = 0);
+- assert(y2 y1);
+- assert(sna-kgem.mode);
+-
+- /* Always program one less than the desired value */
+- if (--y1 0)
+- y1 = crtc-bounds.y2;
+- y2--;
+-
+- b = kgem_get_batch(sna-kgem);
+- sna-kgem.nbatch += 4;
+-
+- if (pipe == 0) {
+- if (full_height)
+- event = MI_WAIT_FOR_PIPEA_SVBLANK;
+- else
+- event = MI_WAIT_FOR_PIPEA_SCAN_LINE_WINDOW;
+- } else {
+- if (full_height)
+- event = MI_WAIT_FOR_PIPEB_SVBLANK;
+- else
+- event = MI_WAIT_FOR_PIPEB_SCAN_LINE_WINDOW;
+- }
+- b[0] = MI_LOAD_REGISTER_IMM | 1;
+- b[1] = display_base + 0x70004 + 0x1000 * pipe;
+- b[2] = (1 31) | (y1 16) | y2;
+- b[3] = MI_WAIT_FOR_EVENT | event;
+-
+- sna-kgem.batch_flags |= I915_EXEC_SECURE;
+- return true;
+-}
+-
+ static bool sna_emit_wait_for_scanline_ivb(struct sna *sna,
+ xf86CrtcPtr crtc,
+ int pipe, int y1, int y2,
+@@ -4472,10 +4426,12 @@ sna_wait_for_scanline(struct sna *sna,
+
+ if (sna-kgem.gen = 0110)
+ ret = false;
++ else if (sna-kgem.gen == 0101)
++ ret = false; /* chv, vsync method unknown */
+ else if (sna-kgem.gen = 075)
+ ret = sna_emit_wait_for_scanline_hsw(sna, crtc, pipe, y1, y2,
full_height);
+ else if (sna-kgem.gen == 071)
+- ret = sna_emit_wait_for_scanline_vlv(sna, crtc, pipe, y1, y2,
full_height);
++ ret = false; /* vlv, vsync method unknown */
+ else if (sna-kgem.gen = 070)
+ ret = sna_emit_wait_for_scanline_ivb(sna, crtc, pipe, y1, y2,
full_height);
+ else if (sna-kgem.gen = 060)
--
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: https://lists.debian.org/e1ykt4f-0001yd...@moszumanska.debian.org
xserver-xorg-video-intel: Changes to 'ubuntu-trusty'
debian/changelog |8
debian/patches/bdw-annotate-more-64bit-pointer-locations.diff | 132 ++
debian/patches/bdw-clamp-urb-allocations-for-gt3.diff | 38 ++
debian/patches/series |2
4 files changed, 180 insertions(+)
New commits:
commit 0bcef3a37658e785436fd34ac2b6709e17b00aea
Author: Timo Aaltonen tjaal...@debian.org
Date: Thu Apr 16 07:28:22 2015 +0300
release to trusty
diff --git a/debian/changelog b/debian/changelog
index db2b4a9..9173a6c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,10 @@
-xserver-xorg-video-intel (2:2.99.910-0ubuntu1.5) UNRELEASED; urgency=medium
+xserver-xorg-video-intel (2:2.99.910-0ubuntu1.5) trusty-proposed;
urgency=medium
* bdw-annotate-more-64bit-pointer-locations.diff
bdw-clamp-urb-allocations-for-gt3.diff:
-Fix BDW GT3. (#136)
+Fix BDW GT3. (LP: #136)
- -- Timo Aaltonen tjaal...@debian.org Wed, 15 Apr 2015 14:38:51 +0300
+ -- Timo Aaltonen tjaal...@debian.org Thu, 16 Apr 2015 07:27:37 +0300
xserver-xorg-video-intel (2:2.99.910-0ubuntu1.4) trusty-proposed;
urgency=medium
commit ef84ded97408acfff1a90562b3fdd2c8c4e99402
Author: Timo Aaltonen tjaal...@debian.org
Date: Wed Apr 15 15:11:22 2015 +0300
bdw-annotate-more-64bit-pointer-locations.diff
bdw-clamp-urb-allocations-for-gt3.diff: Fix BDW GT3. (#136)
diff --git a/debian/changelog b/debian/changelog
index 8a25ddd..db2b4a9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+xserver-xorg-video-intel (2:2.99.910-0ubuntu1.5) UNRELEASED; urgency=medium
+
+ * bdw-annotate-more-64bit-pointer-locations.diff
+bdw-clamp-urb-allocations-for-gt3.diff:
+Fix BDW GT3. (#136)
+
+ -- Timo Aaltonen tjaal...@debian.org Wed, 15 Apr 2015 14:38:51 +0300
+
xserver-xorg-video-intel (2:2.99.910-0ubuntu1.4) trusty-proposed;
urgency=medium
[ Timo Aaltonen ]
diff --git a/debian/patches/bdw-annotate-more-64bit-pointer-locations.diff
b/debian/patches/bdw-annotate-more-64bit-pointer-locations.diff
new file mode 100644
index 000..3ba449b
--- /dev/null
+++ b/debian/patches/bdw-annotate-more-64bit-pointer-locations.diff
@@ -0,0 +1,132 @@
+commit de54a93217cc550c44ee138f0511ede6925d84e0
+Author: Chris Wilson ch...@chris-wilson.co.uk
+Date: Wed Oct 22 19:30:21 2014 +0100
+
+sna/gen8: Annotate more 64bit pointer locations
+
+Signed-off-by: Chris Wilson ch...@chris-wilson.co.uk
+
+--- a/src/sna/gen8_render.c
b/src/sna/gen8_render.c
+@@ -474,7 +474,7 @@ gen8_emit_vs_invariant(struct sna *sna)
+ OUT_BATCH(GEN8_3DSTATE_VS | (9 - 2));
+ OUT_BATCH64(0); /* no VS kernel */
+ OUT_BATCH(0);
+- OUT_BATCH64(0);
++ OUT_BATCH64(0); /* scratch */
+ OUT_BATCH(0);
+ OUT_BATCH(1 1); /* pass-through */
+ OUT_BATCH(1 16 | 1 21); /* urb write to SBE */
+@@ -500,12 +500,10 @@ static void
+ gen8_emit_hs_invariant(struct sna *sna)
+ {
+ OUT_BATCH(GEN8_3DSTATE_HS | (9 - 2));
+- OUT_BATCH(0); /* no HS kernel */
+- OUT_BATCH(0);
+- OUT_BATCH(0);
+- OUT_BATCH(0);
+ OUT_BATCH(0);
+ OUT_BATCH(0);
++ OUT_BATCH64(0); /* no HS kernel */
++ OUT_BATCH64(0); /* scratch */
+ OUT_BATCH(0);
+ OUT_BATCH(0); /* pass-through */
+
+@@ -541,11 +539,9 @@ static void
+ gen8_emit_ds_invariant(struct sna *sna)
+ {
+ OUT_BATCH(GEN8_3DSTATE_DS | (9 - 2));
++ OUT_BATCH64(0); /* no kernel */
+ OUT_BATCH(0);
+- OUT_BATCH(0);
+- OUT_BATCH(0);
+- OUT_BATCH(0);
+- OUT_BATCH(0);
++ OUT_BATCH64(0); /* scratch */
+ OUT_BATCH(0);
+ OUT_BATCH(0);
+ OUT_BATCH(0);
+@@ -573,15 +569,13 @@ static void
+ gen8_emit_gs_invariant(struct sna *sna)
+ {
+ OUT_BATCH(GEN8_3DSTATE_GS | (10 - 2));
+- OUT_BATCH(0); /* no GS kernel */
+- OUT_BATCH(0);
+- OUT_BATCH(0);
+- OUT_BATCH(0);
++ OUT_BATCH64(0); /* no GS kernel */
+ OUT_BATCH(0);
++ OUT_BATCH64(0); /* scratch */
+ OUT_BATCH(0);
++ OUT_BATCH(0); /* pass-through */
+ OUT_BATCH(0);
+ OUT_BATCH(0);
+- OUT_BATCH(0); /* pass-through */
+
+ #if SIM
+ OUT_BATCH(GEN8_3DSTATE_CONSTANT_GS | (11 - 2));
+@@ -690,13 +684,15 @@ gen8_emit_wm_invariant(struct sna *sna)
+ OUT_BATCH(WM_PERSPECTIVE_PIXEL_BARYCENTRIC);
+
+ #if SIM
+- OUT_BATCH(GEN8_3DSTATE_WM_HZ_OP | (5 - 2));
++ OUT_BATCH(GEN8_3DSTATE_WM_CHROMAKEY | (2 - 2));
+ OUT_BATCH(0);
++#endif
++
++#if 0
++ OUT_BATCH(GEN8_3DSTATE_WM_HZ_OP | (5 - 2));
+ OUT_BATCH(0);
+ OUT_BATCH(0);
+ OUT_BATCH(0);
+-
+- OUT_BATCH(GEN8_3DSTATE_WM_CHROMAKEY | (2 - 2));
+ OUT_BATCH(0);
+ #endif
+
+@@ -834,6 +830,7 @@ gen8_emit_cc(struct sna *sna, uint32_t b
+ } else
+ OUT_BATCH(PS_BLEND_HAS_WRITEABLE_RT);
+
++ assert(is_aligned(render-cc_blend + blend *
GEN8_BLEND_STATE_PADDED_SIZE,
xserver-xorg-video-intel: Changes to 'ubuntu-trusty'
debian/changelog |2
debian/patches/fix-sna-external-slave-rotation.patch | 69 +++
debian/patches/series|1
3 files changed, 72 insertions(+)
New commits:
commit 39d471fc14d92696f6eb9cfe414010fa36cb90ae
Author: Maarten Lankhorst maarten.lankho...@ubuntu.com
Date: Tue Jan 13 14:32:52 2015 +0100
Fix rotating external display with optimus results in corruption.
fix-sna-external-slave-rotation.patch (LP: #1410238)
diff --git a/debian/changelog b/debian/changelog
index 62cab64..a9b61ff 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,8 @@ xserver-xorg-video-intel (2:2.99.910-0ubuntu1.4) UNRELEASED;
urgency=medium
[ Maarten Lankhorst ]
* Fix regression with external displays on sna. (LP: #1405325)
+ * Fix rotating external display with optimus results in corruption.
+- fix-sna-external-slave-rotation.patch (LP: #1410238)
-- Timo Aaltonen tjaal...@debian.org Fri, 12 Dec 2014 11:06:26 +0200
diff --git a/debian/patches/fix-sna-external-slave-rotation.patch
b/debian/patches/fix-sna-external-slave-rotation.patch
new file mode 100644
index 000..80b79f3
--- /dev/null
+++ b/debian/patches/fix-sna-external-slave-rotation.patch
@@ -0,0 +1,69 @@
+commit 1cffbd9a8e96642bdbabf4e40829a5f1473b5bf9
+Author: Chris Wilson ch...@chris-wilson.co.uk
+Date: Tue Jan 13 10:50:36 2015 +
+
+sna: Combine slave CRTC offsets with rotation
+
+When applying both a slave offset and an output rotation, order is
+important. To get the order right, we need to combine the two into a
+single transformation.
+
+Reported-by: Maarten Lankhorst maarten.lankho...@canonical.com
+Signed-off-by: Chris Wilson ch...@chris-wilson.co.uk
+
+diff --git a/src/sna/sna_display.c b/src/sna/sna_display.c
+index 569c585..0657c47 100644
+--- a/src/sna/sna_display.c
b/src/sna/sna_display.c
+@@ -6696,6 +6696,7 @@ sna_crtc_redisplay__fallback(xf86CrtcPtr crtc, RegionPtr
region, struct kgem_bo
+ ScreenPtr screen = sna-scrn-pScreen;
+ DrawablePtr draw = crtc_source(crtc, sx, sy);
+ PictFormatPtr format;
++ PictTransform T;
+ PicturePtr src, dst;
+ PixmapPtr pixmap;
+ int depth, error;
+@@ -6735,9 +6736,14 @@ sna_crtc_redisplay__fallback(xf86CrtcPtr crtc,
RegionPtr region, struct kgem_bo
+ if (!src)
+ goto free_pixmap;
+
+- error = SetPictureTransform(src, crtc-crtc_to_framebuffer);
+- if (error)
+- goto free_src;
++ 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)) {
++ error = SetPictureTransform(src, T);
++ if (error)
++ goto free_src;
++ sx = sy = 0;
++ }
+
+ if (crtc-filter crtc-transform_in_use)
+ SetPicturePictFilter(src, crtc-filter,
+@@ -6789,6 +6795,7 @@ sna_crtc_redisplay__composite(xf86CrtcPtr crtc,
RegionPtr region, struct kgem_bo
+ DrawablePtr draw = crtc_source(crtc, sx, sy);
+ struct sna_composite_op tmp;
+ PictFormatPtr format;
++ PictTransform T;
+ PicturePtr src, dst;
+ PixmapPtr pixmap;
+ const BoxRec *b;
+@@ -6829,9 +6836,14 @@ sna_crtc_redisplay__composite(xf86CrtcPtr crtc,
RegionPtr region, struct kgem_bo
+ if (!src)
+ goto free_pixmap;
+
+- error = SetPictureTransform(src, crtc-crtc_to_framebuffer);
+- if (error)
+- goto free_src;
++ 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)) {
++ error = SetPictureTransform(src, T);
++ if (error)
++ goto free_src;
++ sx = sy = 0;
++ }
+
+ if (crtc-filter crtc-transform_in_use)
+ SetPicturePictFilter(src, crtc-filter,
diff --git a/debian/patches/series b/debian/patches/series
index e232f4e..6552b77 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -25,3 +25,4 @@ sna-use-vmask-in-3dstate-ps.diff
sna-fix-gen8-blt.diff
sna-tweak-alignment-constraints-on-gen8.diff
sna-add-more-checks-and-asserts-for-blt.diff
+fix-sna-external-slave-rotation.patch
--
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: https://lists.debian.org/e1yb2qi-00057o...@moszumanska.debian.org
xserver-xorg-video-intel: Changes to 'ubuntu-trusty'
debian/changelog |6 ++ debian/patches/10-handle-rotated-slaves.diff |2 +- 2 files changed, 7 insertions(+), 1 deletion(-) New commits: commit e1103d1723905589e0ab13aa3ccf54fafd177c9b Author: Maarten Lankhorst maarten.lankho...@ubuntu.com Date: Tue Jan 13 11:22:57 2015 +0100 Fix regression with external displays on sna. (LP: #1405325) diff --git a/debian/changelog b/debian/changelog index 5121f03..83ee4ef 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +xserver-xorg-video-intel (2:2.99.910-0ubuntu1.5) trusty-proposed; urgency=medium + + * Fix regression with external displays on sna. (LP: #1405325) + + -- Maarten Lankhorst maarten.lankho...@ubuntu.com Tue, 13 Jan 2015 11:20:44 +0100 + xserver-xorg-video-intel (2:2.99.910-0ubuntu1.4) trusty-proposed; urgency=medium * sna-fix-gen8-blt.diff: Fix GEN8 BLT with 4bit address. (LP: #1401788) diff --git a/debian/patches/10-handle-rotated-slaves.diff b/debian/patches/10-handle-rotated-slaves.diff index 9ddafb3..aa3b6e1 100644 --- a/debian/patches/10-handle-rotated-slaves.diff +++ b/debian/patches/10-handle-rotated-slaves.diff @@ -372,7 +372,7 @@ Date: Thu Jul 17 14:40:51 2014 +0100 if (sna-render.copy_boxes(sna, GXcopy, - sna-front, priv-gpu_bo, 0, 0, -+ container_of(draw, PixmapRec, drawable), priv-gpu_bo, 0, 0, ++ container_of(draw, PixmapRec, drawable), priv-gpu_bo, sx, sy, tmp, sna_crtc-bo, -tx, -ty, REGION_RECTS(region), REGION_NUM_RECTS(region), 0)) return; -- To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org Archive: https://lists.debian.org/e1yaycq-0008cc...@moszumanska.debian.org
xserver-xorg-video-intel: Changes to 'ubuntu-trusty'
debian/changelog| 17 - debian/patches/series |2 debian/patches/sna-add-more-checks-and-asserts-for-blt.diff | 200 debian/patches/sna-tweak-alignment-constraints-on-gen8.diff | 34 ++ 4 files changed, 245 insertions(+), 8 deletions(-) New commits: commit 35e5a5a4818b581a7f739b5c0c0d5347ee3cb872 Author: Timo Aaltonen tjaal...@debian.org Date: Tue Jan 13 14:25:23 2015 +0200 fix changelog diff --git a/debian/changelog b/debian/changelog index 4de6d74..62cab64 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,16 +1,14 @@ -xserver-xorg-video-intel (2:2.99.910-0ubuntu1.5) trusty-proposed; urgency=medium - - * Fix regression with external displays on sna. (LP: #1405325) - - -- Maarten Lankhorst maarten.lankho...@ubuntu.com Tue, 13 Jan 2015 11:20:44 +0100 - xserver-xorg-video-intel (2:2.99.910-0ubuntu1.4) UNRELEASED; urgency=medium + [ Timo Aaltonen ] * sna-fix-gen8-blt.diff sna-tweak-alignment-constraints-on-gen8.diff sna-add-more-checks-and-asserts-for-blt.diff: - Fix GEN8 BLT with 4bit address. (LP: #1401788) + [ Maarten Lankhorst ] + * Fix regression with external displays on sna. (LP: #1405325) + -- Timo Aaltonen tjaal...@debian.org Fri, 12 Dec 2014 11:06:26 +0200 xserver-xorg-video-intel (2:2.99.910-0ubuntu1.3) trusty-proposed; urgency=medium @@ -32,6 +30,9 @@ xserver-xorg-video-intel (2:2.99.910-0ubuntu1.2) trusty-proposed; urgency=medium [ Timo Aaltonen ] * fix-no-backlight.diff: Don't let backlight switch off when cycling through display modes. (LP: #1373776) + + -- Maarten Lankhorst maarten.lankho...@ubuntu.com Mon, 20 Oct 2014 09:54:57 +0200 + xserver-xorg-video-intel (2:2.99.910-0ubuntu1.1) trusty; urgency=medium * Backport fixes from upstream driver for fglrx and broadwell. (LP: #1359105) commit 1cabef339563e0b4daee50580a1b75596844a62a Author: Timo Aaltonen tjaal...@debian.org Date: Tue Jan 13 14:20:28 2015 +0200 not really released, so mark as such diff --git a/debian/changelog b/debian/changelog index ef7fe94..4de6d74 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,7 +4,7 @@ xserver-xorg-video-intel (2:2.99.910-0ubuntu1.5) trusty-proposed; urgency=medium -- Maarten Lankhorst maarten.lankho...@ubuntu.com Tue, 13 Jan 2015 11:20:44 +0100 -xserver-xorg-video-intel (2:2.99.910-0ubuntu1.4) trusty-proposed; urgency=medium +xserver-xorg-video-intel (2:2.99.910-0ubuntu1.4) UNRELEASED; urgency=medium * sna-fix-gen8-blt.diff sna-tweak-alignment-constraints-on-gen8.diff commit 46077a767ff807f793bde32de15f0ad589d1a067 Author: Timo Aaltonen tjaal...@debian.org Date: Tue Jan 13 12:31:00 2015 +0200 add two more patches diff --git a/debian/changelog b/debian/changelog index 83ee4ef..ef7fe94 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,7 +6,10 @@ xserver-xorg-video-intel (2:2.99.910-0ubuntu1.5) trusty-proposed; urgency=medium xserver-xorg-video-intel (2:2.99.910-0ubuntu1.4) trusty-proposed; urgency=medium - * sna-fix-gen8-blt.diff: Fix GEN8 BLT with 4bit address. (LP: #1401788) + * sna-fix-gen8-blt.diff +sna-tweak-alignment-constraints-on-gen8.diff +sna-add-more-checks-and-asserts-for-blt.diff: +- Fix GEN8 BLT with 4bit address. (LP: #1401788) -- Timo Aaltonen tjaal...@debian.org Fri, 12 Dec 2014 11:06:26 +0200 @@ -29,9 +32,6 @@ xserver-xorg-video-intel (2:2.99.910-0ubuntu1.2) trusty-proposed; urgency=medium [ Timo Aaltonen ] * fix-no-backlight.diff: Don't let backlight switch off when cycling through display modes. (LP: #1373776) - - -- Maarten Lankhorst maarten.lankho...@ubuntu.com Mon, 20 Oct 2014 09:54:57 +0200 - xserver-xorg-video-intel (2:2.99.910-0ubuntu1.1) trusty; urgency=medium * Backport fixes from upstream driver for fglrx and broadwell. (LP: #1359105) diff --git a/debian/patches/series b/debian/patches/series index 98e9055..e232f4e 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -23,3 +23,5 @@ fix-no-backlight.diff 10-handle-rotated-slaves.diff sna-use-vmask-in-3dstate-ps.diff sna-fix-gen8-blt.diff +sna-tweak-alignment-constraints-on-gen8.diff +sna-add-more-checks-and-asserts-for-blt.diff diff --git a/debian/patches/sna-add-more-checks-and-asserts-for-blt.diff b/debian/patches/sna-add-more-checks-and-asserts-for-blt.diff new file mode 100644 index 000..c9e9068 --- /dev/null +++ b/debian/patches/sna-add-more-checks-and-asserts-for-blt.diff @@ -0,0 +1,200 @@ +commit 8dee52997891108eec8e4df12dd02f3a060d9cb8 +Author: Chris Wilson ch...@chris-wilson.co.uk +Date: Wed Nov 19 13:38:20 2014 + + +sna: Add more checks and asserts for BLT capable bo + +Before we use the BLT for core acceleration, double check that we can. +This should catch the case where we attempt to operate on SHM pixmaps +which do not meet the restrictions. + +Signed-off-by: Chris Wilson
xserver-xorg-video-intel: Changes to 'ubuntu-trusty'
debian/changelog |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 0ef9ee9f70358ad04fca52c7ca7240d6ab1645f7 Author: Maarten Lankhorst maarten.lankho...@ubuntu.com Date: Tue Jan 13 17:14:25 2015 +0100 release to trusty-proposed diff --git a/debian/changelog b/debian/changelog index a9b61ff..8a25ddd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -xserver-xorg-video-intel (2:2.99.910-0ubuntu1.4) UNRELEASED; urgency=medium +xserver-xorg-video-intel (2:2.99.910-0ubuntu1.4) trusty-proposed; urgency=medium [ Timo Aaltonen ] * sna-fix-gen8-blt.diff @@ -11,7 +11,7 @@ xserver-xorg-video-intel (2:2.99.910-0ubuntu1.4) UNRELEASED; urgency=medium * Fix rotating external display with optimus results in corruption. - fix-sna-external-slave-rotation.patch (LP: #1410238) - -- Timo Aaltonen tjaal...@debian.org Fri, 12 Dec 2014 11:06:26 +0200 + -- Maarten Lankhorst maarten.lankho...@ubuntu.com Tue, 13 Jan 2015 17:14:19 +0100 xserver-xorg-video-intel (2:2.99.910-0ubuntu1.3) trusty-proposed; urgency=medium -- To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org Archive: https://lists.debian.org/e1yb47i-0004fq...@moszumanska.debian.org
xserver-xorg-video-intel: Changes to 'ubuntu-trusty'
debian/changelog |8 -
debian/patches/series|1
debian/patches/sna-fix-gen8-blt.diff | 51 +++
3 files changed, 58 insertions(+), 2 deletions(-)
New commits:
commit de69fc8c50cd0981713aec3bbafb78deabfdd4a2
Author: Timo Aaltonen tjaal...@debian.org
Date: Fri Dec 12 11:10:25 2014 +0200
release to trusty
diff --git a/debian/changelog b/debian/changelog
index b3c5d88..5121f03 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xserver-xorg-video-intel (2:2.99.910-0ubuntu1.4) UNRELEASED; urgency=medium
+xserver-xorg-video-intel (2:2.99.910-0ubuntu1.4) trusty-proposed;
urgency=medium
* sna-fix-gen8-blt.diff: Fix GEN8 BLT with 4bit address. (LP: #1401788)
commit 1b2ea030df615244b0041c42cda65597e1f35b7c
Author: Timo Aaltonen tjaal...@debian.org
Date: Fri Dec 12 11:08:22 2014 +0200
sna-fix-gen8-blt.diff: Fix GEN8 BLT with 4bit address. (LP: #1401788)
diff --git a/debian/changelog b/debian/changelog
index 74b824f..b3c5d88 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-video-intel (2:2.99.910-0ubuntu1.4) UNRELEASED; urgency=medium
+
+ * sna-fix-gen8-blt.diff: Fix GEN8 BLT with 4bit address. (LP: #1401788)
+
+ -- Timo Aaltonen tjaal...@debian.org Fri, 12 Dec 2014 11:06:26 +0200
+
xserver-xorg-video-intel (2:2.99.910-0ubuntu1.3) trusty-proposed;
urgency=medium
[ Maarten Lankhorst ]
diff --git a/debian/patches/series b/debian/patches/series
index fd5e9b5..98e9055 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -22,3 +22,4 @@ fix-no-backlight.diff
09-reduce-reflections-onto-rotations.diff
10-handle-rotated-slaves.diff
sna-use-vmask-in-3dstate-ps.diff
+sna-fix-gen8-blt.diff
diff --git a/debian/patches/sna-fix-gen8-blt.diff
b/debian/patches/sna-fix-gen8-blt.diff
new file mode 100644
index 000..2ec721d
--- /dev/null
+++ b/debian/patches/sna-fix-gen8-blt.diff
@@ -0,0 +1,51 @@
+commit 3a22b6f6d55a5b1e0a1c0a3d597996268ed439ad
+Author: Mika Kuoppala mika.kuopp...@linux.intel.com
+Date: Wed Nov 19 15:10:05 2014 +0200
+
+sna: gen8 BLT broken when address has bit 4 set
+
+With bit 4 set in address, the gen8 blitter fails and blits errorneously
+into the cacheline preceeding the destination and similarly when reading
from
+the source, corrupting memory.
+
+v2: Update the destination base offset pattern as revealed
+by igt/tests/gem_userptr_blits/destination-bo-align
+
+v3: Check base address as well
+
+Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=79053
+Cc: Chris Wilson ch...@chris-wilson.co.uk
+Tested-by: xunx.f...@intel.com [v2]
+Signed-off-by: Mika Kuoppala mika.kuopp...@intel.com
+
+diff --git a/src/sna/kgem.h b/src/sna/kgem.h
+index 6adae3b..3275b4f 100644
+--- a/src/sna/kgem.h
b/src/sna/kgem.h
+@@ -551,6 +551,13 @@ static inline bool kgem_bo_blt_pitch_is_ok(struct kgem
*kgem,
+ struct kgem_bo *bo)
+ {
+ int pitch = bo-pitch;
++
++ if (kgem-gen = 0100 pitch (1 4)) { /* bdw is broken */
++ DBG((%s: can not blt to handle=%d, pitch=%d\n,
++ __FUNCTION__, bo-handle, pitch));
++ return false;
++ }
++
+ if (kgem-gen = 040 bo-tiling)
+ pitch /= 4;
+ if (pitch MAXSHORT) {
+@@ -573,6 +580,12 @@ static inline bool kgem_bo_can_blt(struct kgem *kgem,
+ return false;
+ }
+
++ if (kgem-gen = 0100 bo-proxy bo-delta (1 4)) {
++ DBG((%s: can not blt to handle=%d, delta=%d\n,
++ __FUNCTION__, bo-handle, bo-delta));
++ return false;
++ }
++
+ return kgem_bo_blt_pitch_is_ok(kgem, bo);
+ }
+
commit 9e8190b2386a3054c6396b6df9ae9e010e3e57e4
Author: Timo Aaltonen tjaal...@debian.org
Date: Thu Nov 6 23:38:09 2014 +0200
fix changelog again, disable-outputs-when-slaved.patch was added in 1.2...
diff --git a/debian/changelog b/debian/changelog
index 2020080..74b824f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,6 @@
xserver-xorg-video-intel (2:2.99.910-0ubuntu1.3) trusty-proposed;
urgency=medium
[ Maarten Lankhorst ]
- * Prevent crash when using SNA with fglrx.
-- disable-outputs-when-slaved.patch
* Backport support for rotation with SNA. (LP: #1386620)
[ Timo Aaltonen ]
--
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: https://lists.debian.org/e1xzmju-hi...@moszumanska.debian.org
xserver-xorg-video-intel: Changes to 'ubuntu-trusty'
debian/changelog |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 4b43323dd32fb13709195b08d58a3874f1b9a377 Author: Maarten Lankhorst maarten.lankho...@ubuntu.com Date: Tue Nov 4 10:15:10 2014 +0100 release to trusty diff --git a/debian/changelog b/debian/changelog index 2525049..2b24a56 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,10 @@ -xserver-xorg-video-intel (2:2.99.910-0ubuntu1.3) UNRELEASED; urgency=medium +xserver-xorg-video-intel (2:2.99.910-0ubuntu1.3) trusty-proposed; urgency=medium * Prevent crash when using SNA with fglrx. - disable-outputs-when-slaved.patch * Backport support for rotation with SNA. (LP: #1386620) - -- Maarten Lankhorst maarten.lankho...@ubuntu.com Mon, 03 Nov 2014 12:36:52 +0100 + -- Maarten Lankhorst maarten.lankho...@ubuntu.com Tue, 04 Nov 2014 10:14:54 +0100 xserver-xorg-video-intel (2:2.99.910-0ubuntu1.2) trusty-proposed; urgency=medium -- To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org Archive: https://lists.debian.org/e1xmilc-0004wh...@moszumanska.debian.org
xserver-xorg-video-intel: Changes to 'ubuntu-trusty'
debian/changelog|7 ++ debian/patches/series |1 debian/patches/sna-use-vmask-in-3dstate-ps.diff | 65 3 files changed, 72 insertions(+), 1 deletion(-) New commits: commit 6271640cb6c3d503d6295928ddecad20f3610c76 Author: Timo Aaltonen tjaal...@debian.org Date: Thu Nov 6 14:28:47 2014 +0200 add bdw hang fix to -0u1.3 diff --git a/debian/changelog b/debian/changelog index 2b24a56..2020080 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,15 @@ xserver-xorg-video-intel (2:2.99.910-0ubuntu1.3) trusty-proposed; urgency=medium + [ Maarten Lankhorst ] * Prevent crash when using SNA with fglrx. - disable-outputs-when-slaved.patch * Backport support for rotation with SNA. (LP: #1386620) - -- Maarten Lankhorst maarten.lankho...@ubuntu.com Tue, 04 Nov 2014 10:14:54 +0100 + [ Timo Aaltonen ] + * sna-use-vmask-in-3dstate-ps.diff: Fix GPU hang on BDW with xvideo. +(LP: #1390016) + + -- Timo Aaltonen tjaal...@debian.org Thu, 06 Nov 2014 14:27:38 +0200 xserver-xorg-video-intel (2:2.99.910-0ubuntu1.2) trusty-proposed; urgency=medium diff --git a/debian/patches/series b/debian/patches/series index 63ea0ee..fd5e9b5 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -21,3 +21,4 @@ fix-no-backlight.diff 08-rewrite-rotation-universal-planes.diff 09-reduce-reflections-onto-rotations.diff 10-handle-rotated-slaves.diff +sna-use-vmask-in-3dstate-ps.diff diff --git a/debian/patches/sna-use-vmask-in-3dstate-ps.diff b/debian/patches/sna-use-vmask-in-3dstate-ps.diff new file mode 100644 index 000..8210142 --- /dev/null +++ b/debian/patches/sna-use-vmask-in-3dstate-ps.diff @@ -0,0 +1,65 @@ +From rodrigo.v...@intel.com Wed Nov 5 23:49:06 2014 +Return-Path: rodrigo.v...@intel.com +X-Original-To: tjaal...@mail.canonical.com +Delivered-To: tjaal...@mail.canonical.com +Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) + by grenadilla.canonical.com (Postfix) with ESMTP id 91BB3147201C + for tjaal...@mail.canonical.com; Wed, 5 Nov 2014 23:49:06 + (UTC) +Received: from cluster-e.mailcontrol.com (cluster-e.mailcontrol.com [85.115.58.190]) + by fiordland.canonical.com (Postfix) with ESMTPS id 3EBB9A186DD + for timo.aalto...@cleanmail.canonical.com; Wed, 5 Nov 2014 23:49:06 + (UTC) +Received: from arctowski.canonical.com (arctowski.canonical.com [91.189.94.158]) + by rly63e.srv.mailcontrol.com (MailControl) with ESMTP id sA5Nn4m8028317 + for timo.aalto...@cleanmail.canonical.com; Wed, 5 Nov 2014 23:49:04 GMT +Received: from fiordland.canonical.com ([91.189.94.145]) + by arctowski.canonical.com with esmtp (Exim 4.71) + (envelope-from rodrigo.v...@intel.com) + id 1XmAJz-0004aX-Vs + for timo.aalto...@cleanmail.canonical.com; Wed, 05 Nov 2014 23:49:04 + +Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) + by fiordland.canonical.com (Postfix) with ESMTP id 746D0A186D8 + for tjaal...@ubuntu.com; Wed, 5 Nov 2014 23:49:02 + (UTC) +Received: from orsmga001.jf.intel.com ([10.7.209.18]) + by orsmga102.jf.intel.com with ESMTP; 05 Nov 2014 15:46:35 -0800 +X-ExtLoop1: 1 +X-IronPort-AV: E=Sophos;i=5.07,322,141327; + d=scan'208;a=603103293 +Received: from rdvivi-hillsboro.jf.intel.com ([10.7.196.162]) + by orsmga001.jf.intel.com with ESMTP; 05 Nov 2014 15:48:14 -0800 +From: Rodrigo Vivi rodrigo.v...@intel.com +To: intel-...@lists.freedesktop.org +Cc: Rodrigo Vivi rodrigo.v...@intel.com, Timo Aaltonen tjaal...@ubuntu.com, +Gary Wang gary.c.w...@intel.com +Subject: [PATCH] sna: Use VMask in 3DSTATE_PS +Date: Wed, 5 Nov 2014 15:48:14 -0800 +Message-Id: 1415231294-12435-1-git-send-email-rodrigo.v...@intel.com +X-Mailer: git-send-email 1.9.3 +X-Mailcontrol-Inbound: WBq!ucXEz80wFmxD6S7f3nyjenN!phNbIQWiyBG44+lo3FL0yiLKb3yjenN!phNbh+9WRKrdgbE= +X-Spam-Score: 0.9 +X-Scanned-By: MailControl 35930.357 (www.mailcontrol.com) on 10.69.0.173 + +Using dispatch mask cause hangs waiting PS Done on some cases like bug #83207, +with larger screen or when scaling it. + +Also mesa uses VMask instead of Dmask for 3DSTATE_PS because in some cases +they were getting incorrect derivatives for subspans. + +Reference: https://bugs.freedesktop.org/show_bug.cgi?id=83207 +Cc: Timo Aaltonen tjaal...@ubuntu.com +Cc: Gary Wang gary.c.w...@intel.com +Signed-off-by: Rodrigo Vivi rodrigo.v...@intel.com +--- + src/sna/gen8_render.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/src/sna/gen8_render.c b/src/sna/gen8_render.c +@@ -900,7 +900,7 @@ gen8_emit_wm(struct sna *sna, int kernel + OUT_BATCH(GEN8_3DSTATE_PS | (12 - 2)); + OUT_BATCH64(kernels[0] ?: kernels[1] ?: kernels[2]); + OUT_BATCH(1 PS_SAMPLER_COUNT_SHIFT | +-//PS_VECTOR_MASK_ENABLE | ++PS_VECTOR_MASK_ENABLE | +
xserver-xorg-video-intel: Changes to 'ubuntu-trusty'
debian/changelog | 21 + 1 file changed, 13 insertions(+), 8 deletions(-) New commits: commit 0d367aa997a756a06573519b711fbead30a5690c Author: Maarten Lankhorst maarten.lankho...@ubuntu.com Date: Tue Nov 4 09:59:16 2014 +0100 fixup changelog diff --git a/debian/changelog b/debian/changelog index b520a4d..2525049 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,17 +1,22 @@ -xserver-xorg-video-intel (2:2.99.910-0ubuntu1.2) trusty-proposed; urgency=medium - - [ Timo Aaltonen ] - * fix-no-backlight.diff: Don't let backlight switch off when cycling -through display modes. (LP: #1373776) +xserver-xorg-video-intel (2:2.99.910-0ubuntu1.3) UNRELEASED; urgency=medium - [ Maarten Lankhorst ] - * Fix black screen with SNA. (LP: #1365695) * Prevent crash when using SNA with fglrx. - disable-outputs-when-slaved.patch * Backport support for rotation with SNA. (LP: #1386620) -- Maarten Lankhorst maarten.lankho...@ubuntu.com Mon, 03 Nov 2014 12:36:52 +0100 +xserver-xorg-video-intel (2:2.99.910-0ubuntu1.2) trusty-proposed; urgency=medium + + [ Maarten Lankhorst ] + * Fix black screen with SNA. (LP: #1365695) + + [ Timo Aaltonen ] + * fix-no-backlight.diff: Don't let backlight switch off when cycling +through display modes. (LP: #1373776) + + -- Maarten Lankhorst maarten.lankho...@ubuntu.com Mon, 20 Oct 2014 09:54:57 +0200 + xserver-xorg-video-intel (2:2.99.910-0ubuntu1.1) trusty; urgency=medium * Backport fixes from upstream driver for fglrx and broadwell. (LP: #1359105) commit 7e7b89542e64dafaa23b5275bed64e8e3174f705 Author: Maarten Lankhorst maarten.lankho...@ubuntu.com Date: Mon Nov 3 12:37:06 2014 +0100 release to trusty-proposed diff --git a/debian/changelog b/debian/changelog index 8530d3d..b520a4d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -xserver-xorg-video-intel (2:2.99.910-0ubuntu1.2) UNRELEASED; urgency=medium +xserver-xorg-video-intel (2:2.99.910-0ubuntu1.2) trusty-proposed; urgency=medium [ Timo Aaltonen ] * fix-no-backlight.diff: Don't let backlight switch off when cycling @@ -10,7 +10,7 @@ xserver-xorg-video-intel (2:2.99.910-0ubuntu1.2) UNRELEASED; urgency=medium - disable-outputs-when-slaved.patch * Backport support for rotation with SNA. (LP: #1386620) - -- Maarten Lankhorst maarten.lankho...@ubuntu.com Mon, 22 Sep 2014 11:26:22 +0200 + -- Maarten Lankhorst maarten.lankho...@ubuntu.com Mon, 03 Nov 2014 12:36:52 +0100 xserver-xorg-video-intel (2:2.99.910-0ubuntu1.1) trusty; urgency=medium -- To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org Archive: https://lists.debian.org/e1xlzxs-0006wb...@moszumanska.debian.org
xserver-xorg-video-intel: Changes to 'ubuntu-trusty'
debian/changelog | 11
debian/patches/01-support-native-rotations.diff | 269
debian/patches/02-extend-native-rotation-to-sprites.diff | 407 +++
debian/patches/03-reorganise-native-rotation.diff| 245
debian/patches/04-inherit-native-rotation.diff | 21
debian/patches/05-clear-transform-on-disable.diff| 33
debian/patches/06-set-color-key-once.diff| 79 +
debian/patches/07-show-sprites-on-all-outputs.diff | 730
debian/patches/08-rewrite-rotation-universal-planes.diff | 856 +++
debian/patches/09-reduce-reflections-onto-rotations.diff | 90 +
debian/patches/10-handle-rotated-slaves.diff | 410 +++
debian/patches/series| 11
12 files changed, 3158 insertions(+), 4 deletions(-)
New commits:
commit dc762db1e2d7b45b080889131fb362aead003e87
Author: Maarten Lankhorst maarten.lankho...@ubuntu.com
Date: Wed Oct 29 16:14:32 2014 +0100
add patch series for rotation support
diff --git a/debian/changelog b/debian/changelog
index 7fa7a26..dfa91b4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,9 @@
-xserver-xorg-video-intel (2:2.99.910-0ubuntu1.2) UNRELEASED; urgency=low
+xserver-xorg-video-intel (2:2.99.910-0ubuntu1.2) UNRELEASED; urgency=medium
* Fix black screen with SNA. (LP: #1365695)
+ * Prevent crash when using SNA with fglrx.
+- disable-outputs-when-slaved.patch
+ * Backport support for rotation with SNA. (LP: #1386620)
-- Maarten Lankhorst maarten.lankho...@ubuntu.com Mon, 22 Sep 2014
11:26:22 +0200
diff --git a/debian/patches/01-support-native-rotations.diff
b/debian/patches/01-support-native-rotations.diff
new file mode 100644
index 000..99b5144
--- /dev/null
+++ b/debian/patches/01-support-native-rotations.diff
@@ -0,0 +1,269 @@
+commit 607737cc47788e2a8896fddfece907a3cfb24f7f
+Author: Chris Wilson ch...@chris-wilson.co.uk
+Date: Wed Feb 12 11:33:45 2014 +
+
+sna: Support native primary plane rotations
+
+Use the display hardware for simple rotations, when exported through the
+rotation property on the CRTC.
+
+As the kernel support is not yet merged upstream, the feature is hidden
+behind --enable-rotation.
+
+Signed-off-by: Chris Wilson ch...@chris-wilson.co.uk
+
+diff --git a/configure.ac b/configure.ac
+index ea7473e..4f73ba4 100644
+--- a/configure.ac
b/configure.ac
+@@ -578,6 +578,17 @@ if test x$CREATE2 = xyes; then
+ xp_msg=$xp_msg create2
+ fi
+
++AC_ARG_ENABLE(rotation,
++AS_HELP_STRING([--enable-rotation],
++ [Enable use of native rotations (experimental)
[default=no]]),
++[ROTATION=$enableval],
++[ROTATION=no])
++AM_CONDITIONAL(USE_ROTATION, test x$ROTATION = xyes)
++if test x$ROTATION = xyes; then
++ AC_DEFINE(USE_ROTATION,1,[Assume rotation support])
++ xp_msg=$xp_msg rotation
++fi
++
+ AC_ARG_ENABLE(userptr,
+ AS_HELP_STRING([--enable-userptr],
+[Enable use of userptr (experimental)
[default=no]]),
+diff --git a/src/sna/gen5_render.c b/src/sna/gen5_render.c
+index a89d31a..c5ccaac 100644
+--- a/src/sna/gen5_render.c
b/src/sna/gen5_render.c
+@@ -1537,6 +1537,25 @@ gen5_composite_picture(struct sna *sna,
+ return sna_render_picture_extract(sna, picture, channel,
+ x, y, w, h, dst_x, dst_y);
+
++ DBG((%s: pixmap, repeat=%d, filter=%d, transform?=%d [affine? %d],
format=%08x\n,
++ __FUNCTION__,
++ channel-repeat, channel-filter,
++ channel-transform != NULL, channel-is_affine,
++ channel-pict_format));
++ if (channel-transform) {
++ DBG((%s: transform=[%f %f %f, %f %f %f, %f %f %f]\n,
++ __FUNCTION__,
++ channel-transform-matrix[0][0] / 65536.,
++ channel-transform-matrix[0][1] / 65536.,
++ channel-transform-matrix[0][2] / 65536.,
++ channel-transform-matrix[1][0] / 65536.,
++ channel-transform-matrix[1][1] / 65536.,
++ channel-transform-matrix[1][2] / 65536.,
++ channel-transform-matrix[2][0] / 65536.,
++ channel-transform-matrix[2][1] / 65536.,
++ channel-transform-matrix[2][2] / 65536.));
++ }
++
+ return sna_render_pixmap_bo(sna, channel, pixmap,
+ x, y, w, h, dst_x, dst_y);
+ }
+diff --git a/src/sna/sna_display.c b/src/sna/sna_display.c
+index a6e6f68..9b05f74 100644
+--- a/src/sna/sna_display.c
b/src/sna/sna_display.c
+@@ -105,6 +105,10 @@ struct sna_crtc {
+ uint8_t id;
+ uint8_t pipe;
+ uint8_t plane;
++
++ uint32_t rotation_id;
++ uint32_t supported_rotations;
++ uint32_t
xserver-xorg-video-intel: Changes to 'ubuntu-trusty'
debian/changelog |5
debian/patches/fix-no-backlight.diff | 38 +++
debian/patches/series|1
3 files changed, 44 insertions(+)
New commits:
commit 9d237d1aa2a2d7561ce4ceaf49e06296b1d6bfd0
Author: Timo Aaltonen tjaal...@debian.org
Date: Mon Oct 20 10:29:28 2014 +0300
fix-no-backlight.diff: Don't let backlight switch off when cycling through
display modes. (LP: #1373776)
diff --git a/debian/changelog b/debian/changelog
index 7fa7a26..1440041 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,12 @@
xserver-xorg-video-intel (2:2.99.910-0ubuntu1.2) UNRELEASED; urgency=low
+ [ Maarten Lankhorst ]
* Fix black screen with SNA. (LP: #1365695)
+ [ Timo Aaltonen ]
+ * fix-no-backlight.diff: Don't let backlight switch off when cycling
+through display modes. (LP: #1373776)
+
-- Maarten Lankhorst maarten.lankho...@ubuntu.com Mon, 22 Sep 2014
11:26:22 +0200
xserver-xorg-video-intel (2:2.99.910-0ubuntu1.1) trusty; urgency=medium
diff --git a/debian/patches/fix-no-backlight.diff
b/debian/patches/fix-no-backlight.diff
new file mode 100644
index 000..0a73239
--- /dev/null
+++ b/debian/patches/fix-no-backlight.diff
@@ -0,0 +1,38 @@
+Index: xserver-xorg-video-intel-2.99.910/src/sna/sna_display.c
+===
+--- xserver-xorg-video-intel-2.99.910.orig/src/sna/sna_display.c
2014-09-26 16:19:42.420356000 +0800
xserver-xorg-video-intel-2.99.910/src/sna/sna_display.c2014-09-26
16:20:00.001464561 +0800
+@@ -2386,8 +2386,12 @@
+
sna_output-backlight_active_level);
+ } else {
+ /* Only save the current backlight value if we're going from on
to off. */
+- if (oldmode == DPMSModeOn)
+- sna_output-backlight_active_level =
sna_output_backlight_get(output);
++ if (oldmode == DPMSModeOn) {
++ int brightness = sna_output_backlight_get(output);
++ if (brightness 0) {
++ sna_output-backlight_active_level = brightness;
++ }
++ }
+ sna_output_backlight_set(output, 0);
+ }
+ }
+diff --git a/src/uxa/intel_display.c b/src/uxa/intel_display.c
+index 39d8507..51727a5 100644
+--- a/src/uxa/intel_display.c
b/src/uxa/intel_display.c
+@@ -1095,8 +1095,12 @@ intel_output_dpms_backlight(xf86OutputPtr output, int
oldmode, int mode)
+
intel_output-backlight_active_level);
+ } else {
+ /* Only save the current backlight value if we're going from on
to off. */
+- if (oldmode == DPMSModeOn)
+- intel_output-backlight_active_level =
intel_output_backlight_get(output);
++ if (oldmode == DPMSModeOn) {
++ int brightness = intel_output_backlight_get(output);
++ if (brightness 0) {
++ intel_output-backlight_active_level = brightness;
++ }
++ }
+ intel_output_backlight_set(output, 0);
+ }
+ }
diff --git a/debian/patches/series b/debian/patches/series
index f6330ab..1ddb42c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -9,3 +9,4 @@ add-names-brw.diff
sna-freescreen.diff
disable-outputs-when-slaved.patch
+fix-no-backlight.diff
--
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: https://lists.debian.org/e1xg7pk-0001ug...@moszumanska.debian.org
xserver-xorg-video-intel: Changes to 'ubuntu-trusty'
debian/changelog |6
debian/patches/disable-outputs-when-slaved.patch | 184 +++
debian/patches/series|1
3 files changed, 191 insertions(+)
New commits:
commit 99a92e981fd85eac7677dfb9bcb7d6cae1d91687
Author: Maarten Lankhorst maarten.lankho...@canonical.com
Date: Mon Sep 22 11:26:53 2014 +0200
Fix black screen with SNA. (LP: #1365695)
diff --git a/debian/changelog b/debian/changelog
index 4375206..7fa7a26 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-video-intel (2:2.99.910-0ubuntu1.2) UNRELEASED; urgency=low
+
+ * Fix black screen with SNA. (LP: #1365695)
+
+ -- Maarten Lankhorst maarten.lankho...@ubuntu.com Mon, 22 Sep 2014
11:26:22 +0200
+
xserver-xorg-video-intel (2:2.99.910-0ubuntu1.1) trusty; urgency=medium
* Backport fixes from upstream driver for fglrx and broadwell. (LP: #1359105)
diff --git a/debian/patches/disable-outputs-when-slaved.patch
b/debian/patches/disable-outputs-when-slaved.patch
new file mode 100644
index 000..e2bfe33
--- /dev/null
+++ b/debian/patches/disable-outputs-when-slaved.patch
@@ -0,0 +1,184 @@
+commit d6830190bc9956f485db6c3420f7a4a79793a693
+Author: Chris Wilson ch...@chris-wilson.co.uk
+Date: Wed Jul 23 10:53:40 2014 +0100
+
+sna: Disable all outputs when initializing as a slaved output provider
+
+When we are constructed as a slaved device, we need to disable all
+outputs or else they are not correctly hooked into the master device
+upon startup.
+
+Signed-off-by: Chris Wilson ch...@chris-wilson.co.uk
+
+--- a/src/intel_module.c
b/src/intel_module.c
+@@ -531,7 +531,7 @@
+ scrn-driverVersion = INTEL_VERSION;
+ scrn-driverName = (char *)INTEL_DRIVER_NAME;
+ scrn-name = (char *)INTEL_NAME;
+- scrn-driverPrivate = (void *)(match_data | 1);
++ scrn-driverPrivate = (void *)(match_data | (flags
XF86_ALLOCATE_GPU_SCREEN) | 2);
+ scrn-Probe = NULL;
+
+ if (xf86IsEntitySharable(entity_num))
+--- a/src/sna/sna.h
b/src/sna/sna.h
+@@ -233,16 +233,17 @@
+ ScrnInfoPtr scrn;
+
+ unsigned flags;
+-#define SNA_NO_WAIT 0x1
+-#define SNA_NO_FLIP 0x2
++#define SNA_IS_SLAVED 0x1
++#define SNA_IS_HOSTED 0x2
+ #define SNA_NO_VSYNC 0x4
+ #define SNA_TRIPLE_BUFFER 0x8
+ #define SNA_TEAR_FREE 0x10
+ #define SNA_FORCE_SHADOW 0x20
+ #define SNA_FLUSH_GTT 0x40
+-#define SNA_IS_HOSTED 0x80
++#define SNA_NO_WAIT 0x80
+ #define SNA_PERFORMANCE 0x100
+ #define SNA_POWERSAVE 0x200
++#define SNA_NO_FLIP 0x400
+ #define SNA_REPROBE 0x8000
+
+ unsigned cpu_features;
+--- a/src/sna/sna_display.c
b/src/sna/sna_display.c
+@@ -3418,6 +3418,9 @@
+
+ assert((sna-flags SNA_IS_HOSTED) == 0);
+
++ if (sna-flags SNA_IS_SLAVED)
++ goto skip;
++
+ if (xf86ReturnOptValBool(sna-Options, OPTION_REPROBE, FALSE)) {
+ DBG((%s: user requests reprobing\n, __FUNCTION__));
+ return false;
+@@ -3438,6 +3441,7 @@
+ }
+ }
+
++skip:
+ /* Copy the existing modes on each CRTCs */
+ for (i = 0; i config-num_crtc; i++) {
+ xf86CrtcPtr crtc = config-crtc[i];
+@@ -3484,6 +3488,8 @@
+
+ crtc_id = (uintptr_t)output-crtc;
+ output-crtc = NULL;
++ if (sna-flags SNA_IS_SLAVED)
++ continue;
+
+ if (crtc_id == 0)
+ continue;
+@@ -3543,7 +3549,7 @@
+ }
+
+ width = height = 0;
+- for (i = 0; i config-num_crtc; i++) {
++ for (i = 0; i sna-mode.num_real_crtc; i++) {
+ xf86CrtcPtr crtc = config-crtc[i];
+ int w, h;
+
+--- a/src/sna/sna_driver.c
b/src/sna/sna_driver.c
+@@ -441,7 +441,7 @@
+ * As a result, we want to set up that server initialization once rather
+ * that doing it per generation.
+ */
+-static Bool sna_pre_init(ScrnInfoPtr scrn, int flags)
++static Bool sna_pre_init(ScrnInfoPtr scrn, int probe)
+ {
+ struct sna *sna;
+ char buf[1024];
+@@ -451,7 +451,7 @@
+ int fd;
+
+ DBG((%s flags=%x, numEntities=%d\n,
+- __FUNCTION__, flags, scrn-numEntities));
++ __FUNCTION__, probe, scrn-numEntities));
+
+ if (scrn-numEntities != 1)
+ return FALSE;
+@@ -467,17 +467,19 @@
+ )
+ return FALSE;
+
+- if (flags PROBE_DETECT)
++ if (probe PROBE_DETECT)
+ return TRUE;
+
+ sna_selftest();
+
+- if (((uintptr_t)scrn-driverPrivate) 1) {
++ probe = 0;
++ if (((uintptr_t)scrn-driverPrivate) 3) {
+ if (posix_memalign((void **)sna, 4096, sizeof(*sna)))
+ return FALSE;
+
+ memset(sna, 0, sizeof(*sna)); /* should be
xserver-xorg-video-intel: Changes to 'ubuntu-trusty'
debian/changelog |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 99037ca3b4bcd433e5e5396e89887ad11ec33bc7 Author: Maarten Lankhorst maarten.lankho...@canonical.com Date: Wed Aug 20 10:48:19 2014 +0200 release to trusty diff --git a/debian/changelog b/debian/changelog index f0adb9c..4375206 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -xserver-xorg-video-intel (2:2.99.910-0ubuntu1.1) UNRELEASED; urgency=medium +xserver-xorg-video-intel (2:2.99.910-0ubuntu1.1) trusty; urgency=medium * Backport fixes from upstream driver for fglrx and broadwell. (LP: #1359105) * Add more pci-ids for broadwell. @@ -12,7 +12,7 @@ xserver-xorg-video-intel (2:2.99.910-0ubuntu1.1) UNRELEASED; urgency=medium * Fix a crash in FreeScreen with sna when used with fglrx. - sna-freescreen.diff - -- Maarten Lankhorst maarten.lankho...@ubuntu.com Wed, 20 Aug 2014 10:11:21 +0200 + -- Maarten Lankhorst maarten.lankho...@ubuntu.com Wed, 20 Aug 2014 10:48:06 +0200 xserver-xorg-video-intel (2:2.99.910-0ubuntu1) trusty; urgency=medium -- To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org Archive: https://lists.debian.org/e1xprt0-oz...@moszumanska.debian.org
xserver-xorg-video-intel: Changes to 'ubuntu-trusty'
New branch 'ubuntu-trusty' available with the following commits: -- To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org Archive: https://lists.debian.org/e1xk0y7-000358...@moszumanska.debian.org
