xserver-xorg-video-intel: Changes to 'ubuntu-xenial'

[Timo Aaltonen]

New branch 'ubuntu-xenial' available with the following commits:
commit 5fc488c3458c99f59a319821059aafedbfc9302f
Author: Timo Aaltonen 
Date:   Thu Nov 10 13:05:05 2016 +0200

Backport sna render backend for gen9. (LP: #1640755)

commit c9ab51a12ba17135ea92fe4bb989e8dbff2d2557
Author: Timo Aaltonen 
Date:   Fri Aug 12 09:35:01 2016 +0300

update kbl pciids

commit 836746cf8eeddb9d4a46c7c86eb220517d1326d2
Author: Timo Aaltonen 
Date:   Fri Aug 12 09:21:34 2016 +0300

preserve-mouse-cursor-after-vt-switch.patch: Fix lost mouse cursor after 
unlocking (LP: #1568604)

xserver-xorg-video-intel: Changes to 'ubuntu'

[Timo Aaltonen]

 debian/changelog |   16 
 debian/patches/fix-fd-leak-when-intel-scrn-create-fails.diff |  117 
 debian/patches/series|4 
 debian/patches/sna-let-modesetting-handle-gen9+.diff |   40 -
 debian/xorg.conf |5 
 debian/xserver-xorg-video-intel.docs |1 
 src/compat-api.h |4 
 src/i915_pciids.h|   10 
 src/sna/gen2_render.c|4 
 src/sna/gen3_render.c|4 
 src/sna/gen4_render.c|4 
 src/sna/gen5_render.c|4 
 src/sna/gen6_render.c|4 
 src/sna/gen7_render.c|4 
 src/sna/gen8_render.c|4 
 src/sna/gen9_render.c|4 
 src/sna/sna.h|   10 
 src/sna/sna_display.c|  313 +--
 src/sna/sna_dri2.c   |   15 
 src/sna/sna_driver.c |4 
 src/sna/sna_video.h  |2 
 src/sna/sna_video_sprite.c   |  100 +--
 src/uxa/intel_driver.c   |2 
 23 files changed, 286 insertions(+), 389 deletions(-)

New commits:
commit 604c3e4f1306c08fe4edd62c6b368f1c671c2e57
Author: Timo Aaltonen 
Date:   Thu Jul 7 11:25:53 2016 +0300

upload to yakkety

diff --git a/debian/changelog b/debian/changelog
index ac3f17b..95c1b42 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-video-intel (2:2.99.917+git20160706-1ubuntu1) yakkety; 
urgency=medium
+
+  * Merge from Debian.
+
+ -- Timo Aaltonen   Wed, 06 Jul 2016 22:40:09 +0300
+
 xserver-xorg-video-intel (2:2.99.917+git20160706-1) unstable; urgency=medium
 
   * New upstream snapshot.

commit cef42650ff3d0f2bd4907836e83075a1775b2cfb
Author: Timo Aaltonen 
Date:   Wed Jul 6 22:34:55 2016 +0300

release to sid

diff --git a/debian/changelog b/debian/changelog
index 13eb9f8..1260292 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xserver-xorg-video-intel (2:2.99.917+git20160706-1) UNRELEASED; urgency=medium
+xserver-xorg-video-intel (2:2.99.917+git20160706-1) unstable; urgency=medium
 
   * New upstream snapshot.
   * fix-fd-leak-when-intel-scrn-create-fails.diff, sna-let-modesetting-
@@ -6,7 +6,7 @@ xserver-xorg-video-intel (2:2.99.917+git20160706-1) UNRELEASED; 
urgency=medium
 fully handled in the xserver.
   * .docs: Include a minimal xorg.conf.
 
- -- Timo Aaltonen   Wed, 06 Jul 2016 19:04:32 +0300
+ -- Timo Aaltonen   Wed, 06 Jul 2016 22:34:40 +0300
 
 xserver-xorg-video-intel (2:2.99.917+git20160522-1) unstable; urgency=medium
 

commit 5d84f39cb2de835afab47c2573ff366e7b92de25
Author: Timo Aaltonen 
Date:   Wed Jul 6 19:26:35 2016 +0300

.docs: Include a minimal xorg.conf.

diff --git a/debian/changelog b/debian/changelog
index f0abf89..13eb9f8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ xserver-xorg-video-intel (2:2.99.917+git20160706-1) UNRELEASED; 
urgency=medium
   * fix-fd-leak-when-intel-scrn-create-fails.diff, sna-let-modesetting-
 handle-gen9+.diff: Dropped as the fallback to modesetting will be
 fully handled in the xserver.
+  * .docs: Include a minimal xorg.conf.
 
  -- Timo Aaltonen   Wed, 06 Jul 2016 19:04:32 +0300
 
diff --git a/debian/xorg.conf b/debian/xorg.conf
new file mode 100644
index 000..eaf43d9
--- /dev/null
+++ b/debian/xorg.conf
@@ -0,0 +1,5 @@
+Section "Device"
+   Identifier "Intel"
+   Driver "intel"
+#  Option "AccelMethod" "uxa"
+EndSection
diff --git a/debian/xserver-xorg-video-intel.docs 
b/debian/xserver-xorg-video-intel.docs
index 50bd824..ff716ae 100644
--- a/debian/xserver-xorg-video-intel.docs
+++ b/debian/xserver-xorg-video-intel.docs
@@ -1,2 +1,3 @@
 NEWS
 README
+debian/xorg.conf

commit 4d64e30f7a6a908862646b79fb2020da77d956fd
Author: Timo Aaltonen 
Date:   Wed Jul 6 19:17:01 2016 +0300

fix-fd-leak-when-intel-scrn-create-fails.diff, sna-let-modesetting- 
handle-gen9+.diff: Dropped as the fallback to modesetting will be fully handled 
in the xserver.

diff --git a/debian/changelog b/debian/changelog
index 43c3763..f0abf89 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,9 @@
 xserver-xorg-video-intel (2:2.99.917+git20160706-1) UNRELEASED; urgency=medium
 
   * New upstream 

xserver-xorg-video-intel: Changes to 'ubuntu'

[Timo Aaltonen]

 Makefile.am  |4 
 configure.ac |3 
 debian/changelog |   26 
 debian/control   |2 
 debian/patches/fix-fd-leak-when-intel-scrn-create-fails.diff |  117 
 debian/patches/install-dri3info.diff |   13 
 debian/patches/series|4 
 debian/xserver-xorg-video-intel.install  |1 
 src/i915_pciids.h|6 
 src/sna/Makefile.am  |2 
 src/sna/blt.c|  693 +
 src/sna/compiler.h   |9 
 src/sna/gen6_common.h|   11 
 src/sna/gen7_render.c|   34 
 src/sna/gen8_render.c|   40 
 src/sna/gen8_render.h|1 
 src/sna/gen9_render.c| 4101 +++
 src/sna/gen9_render.h| 1130 +++
 src/sna/kgem.c   |   24 
 src/sna/kgem.h   |   24 
 src/sna/sna.h|   11 
 src/sna/sna_accel.c  |6 
 src/sna/sna_blt.c|   19 
 src/sna/sna_display.c|  305 
 src/sna/sna_display_fake.c   |4 
 src/sna/sna_dri2.c   |  183 
 src/sna/sna_dri3.c   |1 
 src/sna/sna_present.c|  250 
 src/sna/sna_render.c |   79 
 src/sna/sna_render.h |   58 
 src/sna/sna_video_sprite.c   |   65 
 src/sna/xassert.h|   21 
 src/uxa/i830_reg.h   |6 
 src/uxa/intel.h  |1 
 src/uxa/intel_batchbuffer.c  |   11 
 src/uxa/intel_batchbuffer.h  |   19 
 src/uxa/intel_present.c  |7 
 src/uxa/intel_uxa.c  |   35 
 test/Makefile.am |6 
 test/dri2-race.c |  294 
 test/present-speed.c |   54 
 test/present-test.c  |  255 
 test/xvidmode.c  |   54 
 tools/cursor.c   |   16 
 44 files changed, 7557 insertions(+), 448 deletions(-)

New commits:
commit 3f1246d49811b5acbf9a2416b51f92e1e007e536
Author: Timo Aaltonen 
Date:   Tue May 24 14:01:48 2016 +0300

upload to yakkety

diff --git a/debian/changelog b/debian/changelog
index 01374bd..27b768f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
-xserver-xorg-video-intel (2:2.99.917+git20160522-1ubuntu1) UNRELEASED; 
urgency=medium
+xserver-xorg-video-intel (2:2.99.917+git20160522-1ubuntu1) yakkety; 
urgency=medium
 
+  * Merge from Debian.
   * install-dri3info.diff: Install dri3info with the driver, add 
libxcomposite-dev
 to build-depends.
 

commit e6632f328765559f2cd7a05209c47eb5ba2b225c
Author: Timo Aaltonen 
Date:   Tue May 24 13:59:53 2016 +0300

add libxcomposite-dev to build-deps for dri3info

diff --git a/debian/changelog b/debian/changelog
index a8b9eba..01374bd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xserver-xorg-video-intel (2:2.99.917+git20160522-1ubuntu1) UNRELEASED; 
urgency=medium
+
+  * install-dri3info.diff: Install dri3info with the driver, add 
libxcomposite-dev
+to build-depends.
+
+ -- Timo Aaltonen   Tue, 05 Apr 2016 13:11:57 +0300
+
 xserver-xorg-video-intel (2:2.99.917+git20160522-1) unstable; urgency=medium
 
   * New upstream snapshot. (Closes: #823116)
@@ -6,12 +13,6 @@ xserver-xorg-video-intel (2:2.99.917+git20160522-1) unstable; 
urgency=medium
 
  -- Timo Aaltonen   Tue, 24 May 2016 11:40:02 +0300
 
-xserver-xorg-video-intel (2:2.99.917+git20160325-1ubuntu2) UNRELEASED; 
urgency=medium
-
-  * install-dri3info.diff: Install dri3info with the driver.
-
- -- Timo Aaltonen   Tue, 05 Apr 2016 13:11:57 +0300
-
 xserver-xorg-video-intel (2:2.99.917+git20160325-1ubuntu1) xenial; 
urgency=medium
 
   * 

xserver-xorg-video-intel: Changes to 'ubuntu'

[Timo Aaltonen]

 debian/changelog   |   41 +++
 debian/control |5 
 debian/patches/series  |8 
 debian/patches/sna-let-modesetting-handle-gen9+.diff   |   40 +++
 debian/rules   |5 
 debian/xserver-xorg-video-intel.install|4 
 debian/xserver-xorg-video-intel.install.kfreebsd-amd64 |4 
 debian/xserver-xorg-video-intel.install.kfreebsd-i386  |4 
 src/sna/kgem.h |1 
 src/sna/sna_display.c  |   22 +
 src/sna/sna_dri2.c |  212 ++---
 11 files changed, 256 insertions(+), 90 deletions(-)

New commits:
commit f11e4a0a3fd8192b234872f067e06e545e4218ac
Author: Timo Aaltonen 
Date:   Sat Mar 12 12:04:46 2016 +0200

update changelog

diff --git a/debian/changelog b/debian/changelog
index ccf6de6..895ff6e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-video-intel (2:2.99.917+git20160307-2ubuntu1) UNRELEASED; 
urgency=medium
+
+  * Merge from Debian.
+
+ -- Timo Aaltonen   Sat, 12 Mar 2016 12:04:17 +0200
+
 xserver-xorg-video-intel (2:2.99.917+git20160307-2) unstable; urgency=medium
 
   * Disable the patch to use modesetting on skylake for now, since it reveals

commit a9e817500aafb7829bf154d7754de9b8d0b8e452
Author: Timo Aaltonen 
Date:   Thu Mar 10 22:55:33 2016 +0200

disable patch, upload to unstable

diff --git a/debian/changelog b/debian/changelog
index 0f715a8..f620743 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xserver-xorg-video-intel (2:2.99.917+git20160307-2) unstable; urgency=medium
+
+  * Disable the patch to use modesetting on skylake for now, since it reveals
+modeset/server bugs. (Closes: #817784)
+
+ -- Timo Aaltonen   Thu, 10 Mar 2016 22:16:19 +0200
+
 xserver-xorg-video-intel (2:2.99.917+git20160307-1) unstable; urgency=medium
 
   [ Timo Aaltonen ]
diff --git a/debian/patches/series b/debian/patches/series
index aa08141..7658835 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1 @@
-sna-let-modesetting-handle-gen9+.diff
+#sna-let-modesetting-handle-gen9+.diff

commit e415f62c90247e917ab91cde9f6138993031abcd
Author: Timo Aaltonen 
Date:   Wed Mar 9 21:26:39 2016 +0200

upload to unstable

diff --git a/debian/changelog b/debian/changelog
index de35387..0f715a8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xserver-xorg-video-intel (2:2.99.917+git20160307-1) UNRELEASED; urgency=medium
+xserver-xorg-video-intel (2:2.99.917+git20160307-1) unstable; urgency=medium
 
   [ Timo Aaltonen ]
   * New upstream snapshot.
@@ -11,7 +11,7 @@ xserver-xorg-video-intel (2:2.99.917+git20160307-1) 
UNRELEASED; urgency=medium
   * Move the shared libraries into multiarch libdir.
   * rules: Enable parallel builds.
 
- -- Timo Aaltonen   Mon, 07 Mar 2016 15:20:56 +0200
+ -- Timo Aaltonen   Wed, 09 Mar 2016 21:26:17 +0200
 
 xserver-xorg-video-intel (2:2.99.917+git20160218-1) unstable; urgency=medium
 

commit 86ccd6b3b1759c62cb0299a1177ce4f785a928bc
Author: Timo Aaltonen 
Date:   Tue Mar 8 15:27:00 2016 +0200

release to unstable

diff --git a/debian/changelog b/debian/changelog
index de35387..0fc87e2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xserver-xorg-video-intel (2:2.99.917+git20160307-1) UNRELEASED; urgency=medium
+xserver-xorg-video-intel (2:2.99.917+git20160307-1) unstable; urgency=medium
 
   [ Timo Aaltonen ]
   * New upstream snapshot.
@@ -11,7 +11,7 @@ xserver-xorg-video-intel (2:2.99.917+git20160307-1) 
UNRELEASED; urgency=medium
   * Move the shared libraries into multiarch libdir.
   * rules: Enable parallel builds.
 
- -- Timo Aaltonen   Mon, 07 Mar 2016 15:20:56 +0200
+ -- Timo Aaltonen   Tue, 08 Mar 2016 15:26:40 +0200
 
 xserver-xorg-video-intel (2:2.99.917+git20160218-1) unstable; urgency=medium
 

commit 41b55d35b89467827fa00498726a69cf62de2d09
Author: Timo Aaltonen 
Date:   Tue Mar 8 15:26:32 2016 +0200

rules: Enable parallel builds.

diff --git a/debian/changelog b/debian/changelog
index 238588b..de35387 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,7 @@ xserver-xorg-video-intel (2:2.99.917+git20160307-1) UNRELEASED; 
urgency=medium
 
   [ Matthias Klose ]
   * Move the shared libraries into multiarch libdir.
+  * rules: Enable parallel builds.
 
  -- Timo Aaltonen   Mon, 07 Mar 2016 15:20:56 +0200
 
diff --git a/debian/rules b/debian/rules
index 8e907f5..3020c64 100755
--- a/debian/rules
+++ b/debian/rules
@@ -51,7 +51,7 @@ override_dh_installchangelogs:
dh_installchangelogs 

xserver-xorg-video-intel: Changes to 'ubuntu'

[Timo Aaltonen]

 debian/changelog   |   12 
 src/sna/gen3_render.c  |   91 +++--
 src/sna/kgem.c |   72 +++-
 src/sna/kgem.h |3 
 src/sna/sna_display.c  |   89 -
 src/sna/sna_dri2.c |1 
 src/sna/sna_driver.c   |8 
 src/sna/sna_video_sprite.c |3 
 src/uxa/intel_display.c|8 
 test/.gitignore|1 
 test/Makefile.am   |3 
 test/dri2-race.c   |  724 ++---
 test/dri2-test.c   |   44 ++
 test/present-race.c|  484 ++
 14 files changed, 1230 insertions(+), 313 deletions(-)

New commits:
commit 73938658eaefdc6906705a122331d8be23cf0d98
Author: Timo Aaltonen 
Date:   Fri Feb 19 00:18:49 2016 +0200

release to xenial

diff --git a/debian/changelog b/debian/changelog
index 79c9b70..04348bb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-video-intel (2:2.99.917+git20160218-1ubuntu1) xenial; 
urgency=medium
+
+  * Merge from Debian.
+
+ -- Timo Aaltonen   Fri, 19 Feb 2016 00:18:14 +0200
+
 xserver-xorg-video-intel (2:2.99.917+git20160218-1) unstable; urgency=medium
 
   * New upstream snapshot.

commit 10c054b5a66b894cbb92f857feabb861456cd3a6
Author: Timo Aaltonen 
Date:   Fri Feb 19 00:08:51 2016 +0200

release to unstable

diff --git a/debian/changelog b/debian/changelog
index 9d5b6bd..7f3362b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-video-intel (2:2.99.917+git20160218-1) unstable; urgency=medium
+
+  * New upstream snapshot.
+
+ -- Timo Aaltonen   Fri, 19 Feb 2016 00:06:43 +0200
+
 xserver-xorg-video-intel (2:2.99.917+git20160127-1) unstable; urgency=medium
 
   * New upstream snapshot.

commit 05320318fb940247d8749da8330215d19f41d84e
Author: Chris Wilson 
Date:   Thu Feb 18 13:54:11 2016 +

sna: Prefer to avoid direct rendering with FBC

If FBC is enabled, avoid the overhead of tracking rendering into the
frontbuffer by rendering into a backbuffer and flipping. Again, we have
no actual flag to indicate when FBC is enabled, so take a guess from the
module parameter.

Signed-off-by: Chris Wilson 

diff --git a/src/sna/sna_display.c b/src/sna/sna_display.c
index f2fca7c..a1e1ffb 100644
--- a/src/sna/sna_display.c
+++ b/src/sna/sna_display.c
@@ -7105,6 +7105,22 @@ sna_mode_wants_tear_free(struct sna *sna)
FILE *file;
int i;
 
+   file = fopen("/sys/module/i915/parameters/enable_fbc", "r");
+   if (file) {
+   int fbc_enabled = 0;
+   int value;
+
+   if (fscanf(file, "%d", ) == 1)
+   fbc_enabled = value > 0;
+   fclose(file);
+
+   DBG(("%s: module parameter 'enable_fbc' enabled? %d\n",
+__FUNCTION__, fbc_enabled));
+
+   if (fbc_enabled)
+   return true;
+   }
+
for (i = 0; i < sna->mode.num_real_output; i++) {
struct sna_output *output = to_sna_output(config->output[i]);
int id = find_property(sna, output, "Panel Self-Refresh");

commit b99e8b022c4aaf586ae49e0eb597f0c34bc0e165
Author: Chris Wilson 
Date:   Thu Feb 18 13:53:07 2016 +

sna: Use dirtyfb for fallback direct rendering

The preferred solution when direct rendering is too costly is to render
into the backbuffer and flip. However, if the user insists, we need to
tell the kernel when to flush the scanout due to direct rendering.

Signed-off-by: Chris Wilson 

diff --git a/src/sna/kgem.c b/src/sna/kgem.c
index aceedd4..abb9e02 100644
--- a/src/sna/kgem.c
+++ b/src/sna/kgem.c
@@ -86,6 +86,7 @@ search_snoop_cache(struct kgem *kgem, unsigned int num_pages, 
unsigned flags);
 #define DBG_NO_WC_MMAP 0
 #define DBG_NO_BLT_Y 0
 #define DBG_NO_SCANOUT_Y 0
+#define DBG_NO_DIRTYFB 0
 #define DBG_NO_DETILING 0
 #define DBG_DUMP 0
 #define DBG_NO_MALLOC_CACHE 0
@@ -1499,6 +1500,47 @@ static bool test_can_scanout_y(struct kgem *kgem)
return ret;
 }
 
+static bool test_has_dirtyfb(struct kgem *kgem)
+{
+   struct drm_mode_fb_cmd create;
+   bool ret = false;
+
+   if (DBG_NO_DIRTYFB)
+   return false;
+
+   VG_CLEAR(create);
+   create.width = 32;
+   create.height = 32;
+   create.pitch = 4*32;
+   create.bpp = 32;
+   create.depth = 32;
+   create.handle = gem_create(kgem->fd, 1);
+   if (create.handle == 0)
+   return false;
+
+   if (drmIoctl(kgem->fd, DRM_IOCTL_MODE_ADDFB, ) == 0) {
+   struct drm_mode_fb_dirty_cmd dirty;
+
+   memset(, 0, sizeof(dirty));
+   dirty.fb_id = create.fb_id;
+   ret = drmIoctl(kgem->fd,
+

xserver-xorg-video-intel: Changes to 'ubuntu'

[Timo Aaltonen]

 configure.ac |2 
 debian/changelog |   17 
 debian/control   |9 ++
 debian/rules |2 
 src/i915_pciids.h|   13 ++-
 src/sna/kgem.c   |   13 +++
 src/sna/sna_damage.h |5 -
 src/sna/sna_display.c|   28 ++
 src/sna/sna_dri2.c   |   53 +---
 src/sna/sna_video.h  |   22 +
 src/sna/sna_video_overlay.c  |   10 --
 src/sna/sna_video_sprite.c   |   10 --
 src/sna/sna_video_textured.c |7 -
 tools/virtual.c  |  179 +--
 14 files changed, 323 insertions(+), 47 deletions(-)

New commits:
commit 6307ca157ec85bf210fab0166b39df102ed23729
Author: Timo Aaltonen 
Date:   Tue Feb 2 18:54:48 2016 +0200

release to xenial

diff --git a/debian/changelog b/debian/changelog
index ee00ac0..937398f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-video-intel (2:2.99.917+git20160127-1ubuntu1) xenial; 
urgency=medium
+
+  * Merge from debian.
+
+ -- Timo Aaltonen   Tue, 02 Feb 2016 18:39:09 +0200
+
 xserver-xorg-video-intel (2:2.99.917+git20160127-1) unstable; urgency=medium
 
   * New upstream snapshot.

commit dc19632a8e08f8e45181cbe864548c3742c833bd
Author: Timo Aaltonen 
Date:   Wed Jan 27 14:56:57 2016 +0200

release to unstable

diff --git a/debian/changelog b/debian/changelog
index 5f82f22..9d5b6bd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xserver-xorg-video-intel (2:2.99.917+git20160127-1~exp1) UNRELEASED; 
urgency=medium
+xserver-xorg-video-intel (2:2.99.917+git20160127-1) unstable; urgency=medium
 
   * New upstream snapshot.
   * control: Document build-depends for dri3info and tests, benchmarks.
@@ -7,7 +7,7 @@ xserver-xorg-video-intel (2:2.99.917+git20160127-1~exp1) 
UNRELEASED; urgency=med
   * rules: Use upstream-unstable branch to build a snapshot tarball.
   * control: Add libxss-dev to build-depends for intel-virtual-output.
 
- -- Timo Aaltonen   Wed, 20 Jan 2016 15:27:15 +0200
+ -- Timo Aaltonen   Wed, 27 Jan 2016 14:56:38 +0200
 
 xserver-xorg-video-intel (2:2.99.917+git20151217-1~exp1) experimental; 
urgency=medium
 

commit 1b2fee324bc00047fdb376ee3eb5b34357b7ac05
Author: Timo Aaltonen 
Date:   Wed Jan 27 14:56:32 2016 +0200

control: Add libxss-dev to build-depends for intel-virtual-output.

diff --git a/debian/changelog b/debian/changelog
index 609f7d0..5f82f22 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ xserver-xorg-video-intel (2:2.99.917+git20160127-1~exp1) 
UNRELEASED; urgency=med
   * control: Update description to mention that this driver is
 deprecated in favor of -modesetting.
   * rules: Use upstream-unstable branch to build a snapshot tarball.
+  * control: Add libxss-dev to build-depends for intel-virtual-output.
 
  -- Timo Aaltonen   Wed, 20 Jan 2016 15:27:15 +0200
 
diff --git a/debian/control b/debian/control
index 79d83a2..5506f73 100644
--- a/debian/control
+++ b/debian/control
@@ -46,6 +46,7 @@ Build-Depends:
  libxtst-dev,
  libxrender-dev,
  libpixman-1-dev,
+ libxss-dev,
 # dri3info:
 # libxcomposite-dev,
 # tests, benchmarks:

commit 3757ba1c7835e7107576584aa29b1a8cafce7868
Author: Timo Aaltonen 
Date:   Wed Jan 27 14:28:31 2016 +0200

rules: Use upstream-unstable branch to build a snapshot tarball.

diff --git a/debian/changelog b/debian/changelog
index c4d566a..609f7d0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ xserver-xorg-video-intel (2:2.99.917+git20160127-1~exp1) 
UNRELEASED; urgency=med
   * control: Document build-depends for dri3info and tests, benchmarks.
   * control: Update description to mention that this driver is
 deprecated in favor of -modesetting.
+  * rules: Use upstream-unstable branch to build a snapshot tarball.
 
  -- Timo Aaltonen   Wed, 20 Jan 2016 15:27:15 +0200
 
diff --git a/debian/rules b/debian/rules
index 318c14d..9b5efd9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -52,7 +52,7 @@ override_dh_installchangelogs:
 
 # Snapshots should only target experimental:
 generate-snapshot: UPSTREAM_VERSION = $(shell echo $(SOURCE_VERSION) | sed 
's/^[0-9]*://;s/-.*$$//')
-generate-snapshot: UPSTREAM_BRANCH ?= upstream-experimental
+generate-snapshot: UPSTREAM_BRANCH ?= upstream-unstable
 generate-snapshot: ORIG = 
../$(SOURCE_NAME)_$(UPSTREAM_VERSION).orig.tar.gz
 generate-snapshot:
if [ -f $(ORIG) ]; then \

commit 985c196d7af84e1fd1615eb397efc2513d9c5831
Author: Timo Aaltonen 
Date:   Wed Jan 27 14:22:54 2016 +0200

control: Update description to mention that this driver is deprecated in 
favor of -modesetting.

diff --git a/debian/changelog b/debian/changelog
index 8920b82..c4d566a 100644
--- 

xserver-xorg-video-intel: Changes to 'ubuntu'

[Timo Aaltonen]

 debian/changelog |   13 
 debian/patches/revert-dpms-fix.patch |   28 -
 man/intel.man|   26 +
 src/i915_pciids.h|   36 +
 src/intel_module.c   |6 
 src/intel_options.c  |2 
 src/intel_options.h  |2 
 src/sna/gen3_render.c|   38 --
 src/sna/gen4_render.c|   33 -
 src/sna/gen5_render.c|   35 -
 src/sna/gen6_render.c|   35 -
 src/sna/gen7_render.c|   38 --
 src/sna/gen8_render.c|   36 -
 src/sna/kgem.c   |  173 +
 src/sna/kgem.h   |2 
 src/sna/sna.h|1 
 src/sna/sna_accel.c  |   10 
 src/sna/sna_display.c|  631 ++-
 src/sna/sna_dri2.c   |   29 +
 src/sna/sna_driver.c |5 
 src/sna/sna_video_textured.c |6 
 src/uxa/intel_driver.c   |2 
 22 files changed, 751 insertions(+), 436 deletions(-)

New commits:
commit 1e788671761ec32a00e0930d86ae00db955000fe
Author: Timo Aaltonen 
Date:   Thu Dec 17 15:43:23 2015 +0200

release to xenial

diff --git a/debian/changelog b/debian/changelog
index 165bd83..2349f6c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
-xserver-xorg-video-intel (2:2.99.917+git20151217-1~exp1ubuntu1) UNRELEASED; 
urgency=medium
+xserver-xorg-video-intel (2:2.99.917+git20151217-1~exp1ubuntu1) xenial; 
urgency=medium
 
   * Merge from debian.
   * Refresh revert-dpms-fix.patch.
 
- -- Timo Aaltonen   Thu, 17 Dec 2015 15:37:31 +0200
+ -- Timo Aaltonen   Thu, 17 Dec 2015 15:43:05 +0200
 
 xserver-xorg-video-intel (2:2.99.917+git20151217-1~exp1) experimental; 
urgency=medium
 

commit 917c09efcd79c80612b5660be037e3fba05f6fb3
Author: Timo Aaltonen 
Date:   Thu Dec 17 15:43:02 2015 +0200

refresh patch

diff --git a/debian/changelog b/debian/changelog
index eb0a803..165bd83 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xserver-xorg-video-intel (2:2.99.917+git20151217-1~exp1ubuntu1) UNRELEASED; 
urgency=medium
+
+  * Merge from debian.
+  * Refresh revert-dpms-fix.patch.
+
+ -- Timo Aaltonen   Thu, 17 Dec 2015 15:37:31 +0200
+
 xserver-xorg-video-intel (2:2.99.917+git20151217-1~exp1) experimental; 
urgency=medium
 
   * New upstream snapshot.
diff --git a/debian/patches/revert-dpms-fix.patch 
b/debian/patches/revert-dpms-fix.patch
index 283c1f3..d642ba2 100644
--- a/debian/patches/revert-dpms-fix.patch
+++ b/debian/patches/revert-dpms-fix.patch
@@ -9,11 +9,9 @@ This reverts commit 7d9a74622e5a936e4860fcef8358619bf59adae8.
  src/sna/sna_display.c | 41 ++---
  1 file changed, 14 insertions(+), 27 deletions(-)
 
-Index: xserver-xorg-video-intel-2.99.917+git20150808/src/sna/sna_display.c
-===
 xserver-xorg-video-intel-2.99.917+git20150808.orig/src/sna/sna_display.c
-+++ xserver-xorg-video-intel-2.99.917+git20150808/src/sna/sna_display.c
-@@ -222,7 +222,7 @@ struct sna_output {
+--- a/src/sna/sna_display.c
 b/src/sna/sna_display.c
+@@ -262,7 +262,7 @@ struct sna_output {
int panel_vdisplay;
  
uint32_t dpms_id;
@@ -22,7 +20,7 @@ Index: 
xserver-xorg-video-intel-2.99.917+git20150808/src/sna/sna_display.c
struct backlight backlight;
int backlight_active_level;
  
-@@ -260,7 +260,6 @@ enum { /* XXX copied from hw/xfree86/mod
+@@ -300,7 +300,6 @@ enum { /* XXX copied from hw/xfree86/mod
OPTION_DEFAULT_MODES,
  };
  
@@ -30,16 +28,16 @@ Index: 
xserver-xorg-video-intel-2.99.917+git20150808/src/sna/sna_display.c
  static void sna_crtc_disable_cursor(struct sna *sna, struct sna_crtc *crtc);
  
  static bool is_zaphod(ScrnInfoPtr scrn)
-@@ -969,7 +968,7 @@ sna_crtc_force_outputs_on(xf86CrtcPtr cr
+@@ -1099,7 +1098,7 @@ sna_crtc_force_outputs_on(xf86CrtcPtr cr
if (output->crtc != crtc)
continue;
  
 -  __sna_output_dpms(output, DPMSModeOn, false);
 +  output->funcs->dpms(output, DPMSModeOn);
-   to_sna_output(output)->last_detect = now;
+   if (to_sna_output(output)->last_detect)
+   to_sna_output(output)->last_detect = now;
}
- 
-@@ -999,7 +998,7 @@ sna_crtc_force_outputs_off(xf86CrtcPtr c
+@@ -1131,7 +1130,7 @@ sna_crtc_force_outputs_off(xf86CrtcPtr c
if (output->crtc != crtc)
continue;
  
@@ -48,7 +46,7 @@ Index: 
xserver-xorg-video-intel-2.99.917+git20150808/src/sna/sna_display.c
}
  }
  
-@@ -1135,7 +1134,7 @@ sna_crtc_apply(xf86CrtcPtr crtc)
+@@ -1356,7 +1355,7 @@ sna_crtc_apply(xf86CrtcPtr crtc)
 * and we lose 

xserver-xorg-video-intel: Changes to 'ubuntu-vivid'

[Robert Hooker]

 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 
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   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 000..23db417
--- /dev/null
+++ b/debian/patches/sna-reject-cpu-blits-that-require-format-conversions.patch
@@ -0,0 +1,24 @@
+From cc9d7f603037d0d7eff346dd350f4d8b3f31 Mon Sep 17 00:00:00 2001
+From: Chris Wilson 
+Date: Tue, 6 Jan 2015 13:29:49 +
+Subject: sna: Reject CPU blits that require format conversions
+
+Signed-off-by: Chris Wilson 
+
+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:

xserver-xorg-video-intel: Changes to 'ubuntu'

[Timo Aaltonen]

 debian/changelog |   29 
 debian/patches/randr.patch   |  296 
 debian/patches/series|2 
 debian/patches/sna-check-for-system-memory-contents.diff |   35 
 man/intel.man|   13 
 src/intel_list.h |7 
 src/intel_options.c  |1 
 src/intel_options.h  |1 
 src/sna/gen6_render.c|3 
 src/sna/gen7_render.c|3 
 src/sna/gen8_render.c|3 
 src/sna/kgem.c   |  143 +-
 src/sna/sna.h|2 
 src/sna/sna_accel.c  |5 
 src/sna/sna_display.c|  248 ++-
 src/sna/sna_dri2.c   |  941 +++
 src/sna/sna_driver.c |   15 
 src/sna/sna_render.c |6 
 src/uxa/intel_hwmc.c |2 
 19 files changed, 810 insertions(+), 945 deletions(-)

New commits:
commit 6e0c0daceeae09219a17af379306481a0a010e70
Author: Timo Aaltonen 
Date:   Wed Oct 28 07:53:28 2015 +0200

release to xenial

diff --git a/debian/changelog b/debian/changelog
index ff3ed32..f3741ce 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
-xserver-xorg-video-intel (2:2.99.917+git20151019-1~exp1ubuntu1) UNRELEASED; 
urgency=medium
+xserver-xorg-video-intel (2:2.99.917+git20151019-1~exp1ubuntu1) xenial; 
urgency=medium
 
   * Merge from Debian experimental.
   * Drop sna-check-for-system-memory-contents.diff, randr.patch. Upstream.
 
- -- Timo Aaltonen   Wed, 28 Oct 2015 07:37:35 +0200
+ -- Timo Aaltonen   Wed, 28 Oct 2015 07:50:57 +0200
 
 xserver-xorg-video-intel (2:2.99.917+git20151019-1~exp1) experimental; 
urgency=medium
 

commit 725dda55c9cae4937cfd6c04a9107f20ed3b8295
Author: Timo Aaltonen 
Date:   Wed Oct 28 07:39:35 2015 +0200

Drop sna-check-for-system-memory-contents.diff, randr.patch. Upstream.

diff --git a/debian/changelog b/debian/changelog
index 23e3810..ff3ed32 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xserver-xorg-video-intel (2:2.99.917+git20151019-1~exp1ubuntu1) UNRELEASED; 
urgency=medium
+
+  * Merge from Debian experimental.
+  * Drop sna-check-for-system-memory-contents.diff, randr.patch. Upstream.
+
+ -- Timo Aaltonen   Wed, 28 Oct 2015 07:37:35 +0200
+
 xserver-xorg-video-intel (2:2.99.917+git20151019-1~exp1) experimental; 
urgency=medium
 
   * New upstream snapshot.
diff --git a/debian/patches/randr.patch b/debian/patches/randr.patch
deleted file mode 100644
index 9e963b8..000
--- a/debian/patches/randr.patch
+++ /dev/null
@@ -1,296 +0,0 @@
-commit bf63eba5f1900ab5314e3d37dff55cfca800d400
-Author: Chris Wilson 
-Date:   Wed Sep 9 11:18:15 2015 +0100
-
-Combined RandR changes:
-f5aabb7bddc6fc5dc910a983d1291c9864f65f06
-f384af433cbb39ad74e02b10d3700e71c8668506
-d50d336605e9be7280529b0eb565402d7646c913
-2c08d72393e4c8ddf5926571b087459aaa225cb1
-650da13c7257019728cfca361dfcbe34a6c526ef
-717b6208d0d7bdcdacaf30b871216e6084c7205c
-23986f0a31dbdec2e2086ca898bee43842ab73d4
-15215651a992b7aa06314b9118ad9028b51c7e3e
-31d42ed5637a1b2223d48d0db4d7c512b27aee07
-679ee12079a7d2682d41506b81973c7c7d4fa1d8
-096ddef22d6c57198a424eef00845dc7302b0cfe
-
-diff --git a/src/sna/sna.h b/src/sna/sna.h
-index 6c4d179..7592f7b 100644
 a/src/sna/sna.h
-+++ b/src/sna/sna.h
-@@ -442,7 +442,7 @@ bool sna_mode_pre_init(ScrnInfoPtr scrn, struct sna *sna);
- bool sna_mode_fake_init(struct sna *sna, int num_fake);
- bool sna_mode_wants_tear_free(struct sna *sna);
- void sna_mode_adjust_frame(struct sna *sna, int x, int y);
--extern void sna_mode_discover(struct sna *sna);
-+extern void sna_mode_discover(struct sna *sna, bool tell);
- extern void sna_mode_check(struct sna *sna);
- extern bool sna_mode_disable(struct sna *sna);
- extern void sna_mode_enable(struct sna *sna);
-diff --git a/src/sna/sna_display.c b/src/sna/sna_display.c
-index 34d19bb..f562660 100644
 a/src/sna/sna_display.c
-+++ b/src/sna/sna_display.c
-@@ -90,6 +90,8 @@ void *alloca(size_t);
- #include 
- #endif
- 
-+#define COLDPLUG_DELAY_MS 2000
-+
- /* Minor discrepancy between 32-bit/64-bit ABI in old kernels */
- union compat_mode_get_connector{
-   struct drm_mode_get_connector conn;
-@@ -951,6 +953,8 @@ static void
- sna_crtc_force_outputs_on(xf86CrtcPtr crtc)
- {
-   xf86CrtcConfigPtr config = XF86_CRTC_CONFIG_PTR(crtc->scrn);
-+  /* All attached outputs 

xserver-xorg-video-intel: Changes to 'ubuntu'

[Robert Ancell]

 debian/changelog |8 
 debian/patches/randr.patch   |  296 +++
 debian/patches/revert-dpms-fix.patch |2 
 debian/patches/series|1 
 4 files changed, 306 insertions(+), 1 deletion(-)

New commits:
commit a18a59406278b8448717c8a708170b1fc5131f75
Author: Robert Ancell 
Date:   Wed Oct 14 15:06:48 2015 +0100

* debian/patches/randr.patch:
  - Combine upstream RandR changes to fix hotplug events not working
(LP: #1505695)

diff --git a/debian/changelog b/debian/changelog
index 004324a..75dd66c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+xserver-xorg-video-intel (2:2.99.917+git20150808-0ubuntu4) wily; urgency=medium
+
+  * debian/patches/randr.patch:
+- Combine upstream RandR changes to fix hotplug events not working
+  (LP: #1505695)
+
+ -- Robert Ancell   Wed, 14 Oct 2015 14:59:19 
+0100
+
 xserver-xorg-video-intel (2:2.99.917+git20150808-0ubuntu3) wily; urgency=medium
 
   * debian/patches/revert-dpms-fix.patch:
diff --git a/debian/patches/randr.patch b/debian/patches/randr.patch
new file mode 100644
index 000..9e963b8
--- /dev/null
+++ b/debian/patches/randr.patch
@@ -0,0 +1,296 @@
+commit bf63eba5f1900ab5314e3d37dff55cfca800d400
+Author: Chris Wilson 
+Date:   Wed Sep 9 11:18:15 2015 +0100
+
+Combined RandR changes:
+f5aabb7bddc6fc5dc910a983d1291c9864f65f06
+f384af433cbb39ad74e02b10d3700e71c8668506
+d50d336605e9be7280529b0eb565402d7646c913
+2c08d72393e4c8ddf5926571b087459aaa225cb1
+650da13c7257019728cfca361dfcbe34a6c526ef
+717b6208d0d7bdcdacaf30b871216e6084c7205c
+23986f0a31dbdec2e2086ca898bee43842ab73d4
+15215651a992b7aa06314b9118ad9028b51c7e3e
+31d42ed5637a1b2223d48d0db4d7c512b27aee07
+679ee12079a7d2682d41506b81973c7c7d4fa1d8
+096ddef22d6c57198a424eef00845dc7302b0cfe
+
+diff --git a/src/sna/sna.h b/src/sna/sna.h
+index 6c4d179..7592f7b 100644
+--- a/src/sna/sna.h
 b/src/sna/sna.h
+@@ -442,7 +442,7 @@ bool sna_mode_pre_init(ScrnInfoPtr scrn, struct sna *sna);
+ bool sna_mode_fake_init(struct sna *sna, int num_fake);
+ bool sna_mode_wants_tear_free(struct sna *sna);
+ void sna_mode_adjust_frame(struct sna *sna, int x, int y);
+-extern void sna_mode_discover(struct sna *sna);
++extern void sna_mode_discover(struct sna *sna, bool tell);
+ extern void sna_mode_check(struct sna *sna);
+ extern bool sna_mode_disable(struct sna *sna);
+ extern void sna_mode_enable(struct sna *sna);
+diff --git a/src/sna/sna_display.c b/src/sna/sna_display.c
+index 34d19bb..f562660 100644
+--- a/src/sna/sna_display.c
 b/src/sna/sna_display.c
+@@ -90,6 +90,8 @@ void *alloca(size_t);
+ #include 
+ #endif
+ 
++#define COLDPLUG_DELAY_MS 2000
++
+ /* Minor discrepancy between 32-bit/64-bit ABI in old kernels */
+ union compat_mode_get_connector{
+   struct drm_mode_get_connector conn;
+@@ -951,6 +953,8 @@ static void
+ sna_crtc_force_outputs_on(xf86CrtcPtr crtc)
+ {
+   xf86CrtcConfigPtr config = XF86_CRTC_CONFIG_PTR(crtc->scrn);
++  /* All attached outputs are valid, so update our timestamps */
++  unsigned now = GetTimeInMillis();
+   int i;
+ 
+   assert(to_sna_crtc(crtc));
+@@ -970,6 +974,7 @@ sna_crtc_force_outputs_on(xf86CrtcPtr crtc)
+   continue;
+ 
+   __sna_output_dpms(output, DPMSModeOn, false);
++  to_sna_output(output)->last_detect = now;
+   }
+ 
+ #if XF86_CRTC_VERSION >= 3
+@@ -1211,9 +1216,10 @@ sna_crtc_apply(xf86CrtcPtr crtc)
+output_count, output_count ? output_ids[0] : 0));
+ 
+   ret = drmIoctl(sna->kgem.fd, DRM_IOCTL_MODE_SETCRTC, ) == 0;
+-
+-  sna_crtc->mode_serial++;
+-  sna_crtc_force_outputs_on(crtc);
++  if (ret) {
++  sna_crtc->mode_serial++;
++  sna_crtc_force_outputs_on(crtc);
++  }
+ unblock:
+   sigio_unblock(sigio);
+   return ret;
+@@ -2633,7 +2639,7 @@ error:
+   sna_crtc->cursor_transform = saved_cursor_transform;
+   sna_crtc->hwcursor = saved_hwcursor;
+   sna_crtc->bo = saved_bo;
+-  sna_mode_discover(sna);
++  sna_mode_discover(sna, true);
+   return FALSE;
+ }
+ 
+@@ -4787,17 +4793,53 @@ static bool disable_unused_crtc(struct sna *sna)
+   return update;
+ }
+ 
+-void sna_mode_discover(struct sna *sna)
++static bool
++output_check_status(struct sna *sna, struct sna_output *output)
++{
++  union compat_mode_get_connector compat_conn;
++  struct drm_mode_modeinfo dummy;
++  xf86OutputStatus status;
++
++  VG_CLEAR(compat_conn);
++
++  compat_conn.conn.connector_id = output->id;
++  compat_conn.conn.count_modes = 1; /* skip detect */
++  compat_conn.conn.modes_ptr = (uintptr_t)
++  compat_conn.conn.count_encoders = 0;
++  compat_conn.conn.count_props = 0;
++
++  (void)drmIoctl(sna->kgem.fd,
++ 

xserver-xorg-video-intel: Changes to 'ubuntu'

[Robert Ancell]

 debian/changelog |7 +++
 debian/control   |2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

New commits:
commit 13b7426fde0f4e363670f7c2263dc722ce939c51
Author: Robert Ancell 
Date:   Tue Oct 6 14:23:33 2015 +1300

Rebuild for libxcb-util.

diff --git a/debian/changelog b/debian/changelog
index 921859e..516562e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xserver-xorg-video-intel (2:2.99.917+git20150808-0ubuntu2) wily; urgency=medium
+
+  * Rebuild for libxcb-util.
+  * libxcb-util0-dev -> libxcb-util-dev.
+
+ -- Matthias Klose   Tue, 01 Sep 2015 13:12:05 +0200
+
 xserver-xorg-video-intel (2:2.99.917+git20150808-0ubuntu1) wily; urgency=medium
 
   [ Robert Hooker ]
diff --git a/debian/control b/debian/control
index c2c4998..9f447df 100644
--- a/debian/control
+++ b/debian/control
@@ -32,7 +32,7 @@ Build-Depends:
  libxext-dev,
  libxfixes-dev,
  libx11-xcb-dev,
- libxcb-util0-dev,
+ libxcb-util-dev,
  libxcb-dri2-0-dev,
 # end xvmc
  libudev-dev [linux-any],

xserver-xorg-video-intel: Changes to 'ubuntu'

[Robert Ancell]

 debian/changelog |8 ++
 debian/patches/revert-dpms-fix.patch |  128 +++
 debian/patches/series|1 
 3 files changed, 137 insertions(+)

New commits:
commit 08bc4d781bbc696e0477a8e3500bd77dea05
Author: Robert Ancell 
Date:   Tue Oct 6 14:25:21 2015 +1300

* debian/patches/revert-dpms-fix.patch:
  - Revert a DPMS change that causes the screen to turn off when returning
from a greeter (LP: #1501941)

diff --git a/debian/changelog b/debian/changelog
index 516562e..0572eca 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+xserver-xorg-video-intel (2:2.99.917+git20150808-0ubuntu2+dpmsfix) wily; 
urgency=medium
+
+  * debian/patches/revert-dpms-fix.patch:
+- Revert a DPMS change that causes the screen to turn off when returning
+  from a greeter (LP: #1501941)
+
+ -- Robert Ancell   Tue, 06 Oct 2015 14:25:00 
+1300
+
 xserver-xorg-video-intel (2:2.99.917+git20150808-0ubuntu2) wily; urgency=medium
 
   * Rebuild for libxcb-util.
diff --git a/debian/patches/revert-dpms-fix.patch 
b/debian/patches/revert-dpms-fix.patch
new file mode 100644
index 000..b08933b
--- /dev/null
+++ b/debian/patches/revert-dpms-fix.patch
@@ -0,0 +1,128 @@
+From 9a8b44dd6fc63f2562a17395c54f5f439cad9008 Mon Sep 17 00:00:00 2001
+From: Robert Ancell 
+Date: Fri, 2 Oct 2015 14:22:42 +1300
+Subject: [PATCH xf86-video-intel 2/2] Revert "sna: Be robust in handling DPMS
+ failures"
+
+This reverts commit 7d9a74622e5a936e4860fcef8358619bf59adae8.
+---
+ src/sna/sna_display.c | 41 ++---
+ 1 file changed, 14 insertions(+), 27 deletions(-)
+
+Index: xserver-xorg-video-intel-2.99.917+git20150808/src/sna/sna_display.c
+===
+--- xserver-xorg-video-intel-2.99.917+git20150808.orig/src/sna/sna_display.c
 xserver-xorg-video-intel-2.99.917+git20150808/src/sna/sna_display.c
+@@ -222,7 +222,7 @@ struct sna_output {
+   int panel_vdisplay;
+ 
+   uint32_t dpms_id;
+-  uint8_t dpms_mode;
++  int dpms_mode;
+   struct backlight backlight;
+   int backlight_active_level;
+ 
+@@ -260,7 +260,6 @@ enum { /* XXX copied from hw/xfree86/mod
+   OPTION_DEFAULT_MODES,
+ };
+ 
+-static void __sna_output_dpms(xf86OutputPtr output, int dpms, int fixup);
+ static void sna_crtc_disable_cursor(struct sna *sna, struct sna_crtc *crtc);
+ 
+ static bool is_zaphod(ScrnInfoPtr scrn)
+@@ -969,7 +968,7 @@ sna_crtc_force_outputs_on(xf86CrtcPtr cr
+   if (output->crtc != crtc)
+   continue;
+ 
+-  __sna_output_dpms(output, DPMSModeOn, false);
++  output->funcs->dpms(output, DPMSModeOn);
+   }
+ 
+ #if XF86_CRTC_VERSION >= 3
+@@ -999,7 +998,7 @@ sna_crtc_force_outputs_off(xf86CrtcPtr c
+   if (output->crtc != crtc)
+   continue;
+ 
+-  __sna_output_dpms(output, DPMSModeOff, false);
++  output->funcs->dpms(output, DPMSModeOff);
+   }
+ }
+ 
+@@ -1135,7 +1134,7 @@ sna_crtc_apply(xf86CrtcPtr crtc)
+* and we lose track of the user settings.
+*/
+   if (output->crtc == NULL)
+-  __sna_output_dpms(output, DPMSModeOff, false);
++  output->funcs->dpms(output, DPMSModeOff);
+ 
+   if (output->crtc != crtc)
+   continue;
+@@ -3650,7 +3649,7 @@ sna_output_destroy(xf86OutputPtr output)
+ }
+ 
+ static void
+-__sna_output_dpms(xf86OutputPtr output, int dpms, int fixup)
++sna_output_dpms(xf86OutputPtr output, int dpms)
+ {
+   struct sna *sna = to_sna(output->scrn);
+   struct sna_output *sna_output = output->driver_private;
+@@ -3677,9 +3676,8 @@ __sna_output_dpms(xf86OutputPtr output,
+   if (sna_output->backlight.iface && dpms != DPMSModeOn) {
+   if (old_dpms == DPMSModeOn) {
+   sna_output->backlight_active_level = 
sna_output_backlight_get(output);
+-  DBG(("%s(%s:%d): saving current backlight %d\n",
+-   __FUNCTION__, output->name, sna_output->id,
+-   sna_output->backlight_active_level));
++  DBG(("%s: saving current backlight %d\n",
++   __FUNCTION__, sna_output->backlight_active_level));
+   }
+   sna_output->dpms_mode = dpms;
+   sna_output_backlight_off(sna_output);
+@@ -3689,31 +3687,18 @@ __sna_output_dpms(xf86OutputPtr output,
+   drmModeConnectorSetProperty(sna->kgem.fd,
+   sna_output->id,
+   sna_output->dpms_id,
+-  dpms)) {
+-  DBG(("%s(%s:%d): failed to set DPMS to %d (fixup? %d)\n",
+- 

xserver-xorg-video-intel: Changes to 'ubuntu'

[Robert Ancell]

Rebased ref, commits from common ancestor:
commit 187dc4ac97cdf70dbf5e9050c871e149f673a4e0
Author: Robert Ancell 
Date:   Tue Oct 6 14:25:21 2015 +1300

* debian/patches/revert-dpms-fix.patch:
  - Revert a DPMS change that causes the screen to turn off when returning
from a greeter (LP: #1501941)

diff --git a/debian/changelog b/debian/changelog
index 516562e..004324a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+xserver-xorg-video-intel (2:2.99.917+git20150808-0ubuntu3) wily; urgency=medium
+
+  * debian/patches/revert-dpms-fix.patch:
+- Revert a DPMS change that causes the screen to turn off when returning
+  from a greeter (LP: #1501941)
+
+ -- Robert Ancell   Tue, 06 Oct 2015 14:25:00 
+1300
+
 xserver-xorg-video-intel (2:2.99.917+git20150808-0ubuntu2) wily; urgency=medium
 
   * Rebuild for libxcb-util.
diff --git a/debian/patches/revert-dpms-fix.patch 
b/debian/patches/revert-dpms-fix.patch
new file mode 100644
index 000..b08933b
--- /dev/null
+++ b/debian/patches/revert-dpms-fix.patch
@@ -0,0 +1,128 @@
+From 9a8b44dd6fc63f2562a17395c54f5f439cad9008 Mon Sep 17 00:00:00 2001
+From: Robert Ancell 
+Date: Fri, 2 Oct 2015 14:22:42 +1300
+Subject: [PATCH xf86-video-intel 2/2] Revert "sna: Be robust in handling DPMS
+ failures"
+
+This reverts commit 7d9a74622e5a936e4860fcef8358619bf59adae8.
+---
+ src/sna/sna_display.c | 41 ++---
+ 1 file changed, 14 insertions(+), 27 deletions(-)
+
+Index: xserver-xorg-video-intel-2.99.917+git20150808/src/sna/sna_display.c
+===
+--- xserver-xorg-video-intel-2.99.917+git20150808.orig/src/sna/sna_display.c
 xserver-xorg-video-intel-2.99.917+git20150808/src/sna/sna_display.c
+@@ -222,7 +222,7 @@ struct sna_output {
+   int panel_vdisplay;
+ 
+   uint32_t dpms_id;
+-  uint8_t dpms_mode;
++  int dpms_mode;
+   struct backlight backlight;
+   int backlight_active_level;
+ 
+@@ -260,7 +260,6 @@ enum { /* XXX copied from hw/xfree86/mod
+   OPTION_DEFAULT_MODES,
+ };
+ 
+-static void __sna_output_dpms(xf86OutputPtr output, int dpms, int fixup);
+ static void sna_crtc_disable_cursor(struct sna *sna, struct sna_crtc *crtc);
+ 
+ static bool is_zaphod(ScrnInfoPtr scrn)
+@@ -969,7 +968,7 @@ sna_crtc_force_outputs_on(xf86CrtcPtr cr
+   if (output->crtc != crtc)
+   continue;
+ 
+-  __sna_output_dpms(output, DPMSModeOn, false);
++  output->funcs->dpms(output, DPMSModeOn);
+   }
+ 
+ #if XF86_CRTC_VERSION >= 3
+@@ -999,7 +998,7 @@ sna_crtc_force_outputs_off(xf86CrtcPtr c
+   if (output->crtc != crtc)
+   continue;
+ 
+-  __sna_output_dpms(output, DPMSModeOff, false);
++  output->funcs->dpms(output, DPMSModeOff);
+   }
+ }
+ 
+@@ -1135,7 +1134,7 @@ sna_crtc_apply(xf86CrtcPtr crtc)
+* and we lose track of the user settings.
+*/
+   if (output->crtc == NULL)
+-  __sna_output_dpms(output, DPMSModeOff, false);
++  output->funcs->dpms(output, DPMSModeOff);
+ 
+   if (output->crtc != crtc)
+   continue;
+@@ -3650,7 +3649,7 @@ sna_output_destroy(xf86OutputPtr output)
+ }
+ 
+ static void
+-__sna_output_dpms(xf86OutputPtr output, int dpms, int fixup)
++sna_output_dpms(xf86OutputPtr output, int dpms)
+ {
+   struct sna *sna = to_sna(output->scrn);
+   struct sna_output *sna_output = output->driver_private;
+@@ -3677,9 +3676,8 @@ __sna_output_dpms(xf86OutputPtr output,
+   if (sna_output->backlight.iface && dpms != DPMSModeOn) {
+   if (old_dpms == DPMSModeOn) {
+   sna_output->backlight_active_level = 
sna_output_backlight_get(output);
+-  DBG(("%s(%s:%d): saving current backlight %d\n",
+-   __FUNCTION__, output->name, sna_output->id,
+-   sna_output->backlight_active_level));
++  DBG(("%s: saving current backlight %d\n",
++   __FUNCTION__, sna_output->backlight_active_level));
+   }
+   sna_output->dpms_mode = dpms;
+   sna_output_backlight_off(sna_output);
+@@ -3689,31 +3687,18 @@ __sna_output_dpms(xf86OutputPtr output,
+   drmModeConnectorSetProperty(sna->kgem.fd,
+   sna_output->id,
+   sna_output->dpms_id,
+-  dpms)) {
+-  DBG(("%s(%s:%d): failed to set DPMS to %d (fixup? %d)\n",
+-   __FUNCTION__, output->name, sna_output->id, dpms, fixup));
+-  if (fixup) {
+-  sna_crtc_disable(output->crtc, false);
+-  

xserver-xorg-video-intel: Changes to 'ubuntu'

[Timo Aaltonen]

 debian/changelog |   27 ++-
 debian/patches/series|2 
 debian/patches/sna-check-for-system-memory-contents.diff |   35 +++
 3 files changed, 61 insertions(+), 3 deletions(-)

New commits:
commit 2c74f66eebee681ffe0d1e4d085a74760b449991
Author: Timo Aaltonen tjaal...@debian.org
Date:   Thu Aug 20 14:16:36 2015 +0300

release to wily

diff --git a/debian/changelog b/debian/changelog
index e65da47..921859e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xserver-xorg-video-intel (2:2.99.917+git20150808-0ubuntu1) UNRELEASED; 
urgency=medium
+xserver-xorg-video-intel (2:2.99.917+git20150808-0ubuntu1) wily; urgency=medium
 
   [ Robert Hooker ]
   * Merge from debian-experimental
@@ -13,7 +13,7 @@ xserver-xorg-video-intel (2:2.99.917+git20150808-0ubuntu1) 
UNRELEASED; urgency=m
   * sna-check-for-system-memory-contents.diff: Fix corruption on
 lightdm, while logging in and blank background on unity.
 
- -- Robert Hooker sarv...@ubuntu.com  Wed, 19 Aug 2015 00:42:34 -0400
+ -- Timo Aaltonen tjaal...@debian.org  Thu, 20 Aug 2015 14:14:34 +0300
 
 xserver-xorg-video-intel (2:2.99.917+git20150808-1~exp1) UNRELEASED; 
urgency=medium
 

commit bd507c837a9cf766dc5493d3739e296aa1f37edf
Author: Timo Aaltonen tjaal...@debian.org
Date:   Thu Aug 20 14:14:31 2015 +0300

don't forget to add the patch

diff --git a/debian/patches/sna-check-for-system-memory-contents.diff 
b/debian/patches/sna-check-for-system-memory-contents.diff
new file mode 100644
index 000..7fbdf1e
--- /dev/null
+++ b/debian/patches/sna-check-for-system-memory-contents.diff
@@ -0,0 +1,35 @@
+commit 78f7451886f0a33df717c57fc1a079ee7e6f221e
+Author: Chris Wilson ch...@chris-wilson.co.uk
+Date:   Thu Aug 20 10:43:05 2015 +0100
+
+sna: Check for system memory contents when looking for empty sources
+
+Fixes a regression from
+commit 3f128867d957e30690218404337b00bb327e647b
+Author: Chris Wilson ch...@chris-wilson.co.uk
+Date:   Fri Aug 7 15:19:17 2015 +0100
+
+sna: Skip a no-op copy
+
+that forgot that we can flush damage but still have valid contents to
+copy from.
+
+Reported-by: Timo Aaltonen tjaal...@ubuntu.com
+Signed-off-by: Chris Wilson ch...@chris-wilson.co.uk
+
+diff --git a/src/sna/sna_accel.c b/src/sna/sna_accel.c
+index c624d9e..937d6a8 100644
+--- a/src/sna/sna_accel.c
 b/src/sna/sna_accel.c
+@@ -6446,8 +6446,9 @@ sna_copy_boxes(DrawablePtr src, DrawablePtr dst, GCPtr 
gc,
+   assert(region_num_rects(region));
+ 
+   if (src_priv 
+-  src_priv-gpu_damage == NULL 
+-  src_priv-cpu_damage == NULL) {
++  src_priv-gpu_bo == NULL 
++  src_priv-cpu_bo == NULL 
++  src_priv-ptr == NULL) {
+   /* Rare but still happens, nothing to copy */
+   DBG((%s: src pixmap=%ld is empty\n,
+__FUNCTION__, src_pixmap-drawable.serialNumber));

commit 91a8056d9e59027908b70855310db88f037371f3
Author: Timo Aaltonen tjaal...@debian.org
Date:   Thu Aug 20 14:12:51 2015 +0300

add changelog for 2:2.99.917-1ubuntu1 back

diff --git a/debian/changelog b/debian/changelog
index 04a4172..e65da47 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -52,6 +52,24 @@ xserver-xorg-video-intel (2:2.99.917-2) unstable; 
urgency=medium
 
  -- Vincent Cheng vch...@debian.org  Thu, 16 Jul 2015 01:00:41 -0700
 
+xserver-xorg-video-intel (2:2.99.917-1ubuntu1) wily; urgency=medium
+
+  * Merge with Debian, remaining Ubuntu changes:
+  * debian/rules:
+- Fix valgrind-enabling check (DEB_HOST_ARCH_OS instead of DEB_HOST_ARCH)
+- Use SNA by default.
+ * debian/patches/fix-sna-external-slave-rotation.patch:
+- Fix rotating external display with optimus results in corruption.
+  * debian/patches/fix-sna-fstat-include.patch:
+  * debian/patches/fix-uxa-fstat-include.patch:
+- Fix missing include for fstat
+  * debian/patches/fix-yuv-to-rgb-shared-on-intel-gen8.patch:
+- Fix faulty yuv2rgb translation on Intel Generation 8 Graphics.
+  * debian/patches/sna-force-frontbuffer-to-cpu-for-randr-fallback.diff:
+- Fix rotation on SKL.
+
+ -- Robert Ancell robert.anc...@canonical.com  Tue, 14 Jul 2015 15:21:57 
+1200
+
 xserver-xorg-video-intel (2:2.99.917-1) unstable; urgency=medium
 
   * Upload to unstable. (Closes: #748753)

commit 76fc9825aa416165349f5d588317f694e9955272
Author: Timo Aaltonen tjaal...@debian.org
Date:   Thu Aug 20 14:04:15 2015 +0300

sna-check-for-system-memory-contents.diff: Fix corruption on lightdm, while 
logging in and blank background on unity.

diff --git a/debian/changelog b/debian/changelog
index 0e7222c..04a4172 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
 xserver-xorg-video-intel (2:2.99.917+git20150808-0ubuntu1) UNRELEASED; 
urgency=medium
 
+  [ Robert Hooker ]
   * Merge from debian-experimental
 - 

xserver-xorg-video-intel: Changes to 'ubuntu'

[Robert Hooker]

 Makefile.am |2 
 NEWS|   14 
 benchmarks/.gitignore   |2 
 benchmarks/Makefile.am  |   14 
 benchmarks/dri2-swap.c  |  588 ++
 benchmarks/dri3-swap.c  |  595 ++
 configure.ac|  110 
 debian/README.source|6 
 debian/changelog|   81 
 debian/control  |8 
 debian/patches/fix-sna-external-slave-rotation.patch|   70 
 debian/patches/fix-sna-fstat-include.patch  |   55 
 debian/patches/fix-uxa-fstat-include.patch  |   25 
 debian/patches/fix-yuv-to-rgb-shared-on-intel-gen8.patch|   52 
 debian/patches/series   |6 
 debian/patches/sna-force-frontbuffer-to-cpu-for-randr-fallback.diff |   62 
 debian/source/format|1 
 libobj/alloca.c |4 
 man/intel.man   |   14 
 src/backlight.c |   70 
 src/backlight.h |2 
 src/compat-api.h|   27 
 src/i915_pciids.h   |   81 
 src/intel_device.c  |   53 
 src/intel_driver.h  |1 
 src/intel_list.h|   31 
 src/intel_module.c  |   73 
 src/intel_options.c |   88 
 src/intel_options.h |4 
 src/legacy/i810/i810_common.h   |4 
 src/legacy/i810/i810_hwmc.c |2 
 src/legacy/i810/i810_memory.c   |6 
 src/legacy/i810/i810_reg.h  |2 
 src/legacy/i810/xvmc/I810XvMC.c |6 
 src/render_program/exa_wm.g4i   |2 
 src/render_program/exa_wm_yuv_rgb.g8a   |4 
 src/render_program/exa_wm_yuv_rgb.g8b   |2 
 src/sna/blt.c   |  840 ++--
 src/sna/brw/brw_eu_emit.c   |2 
 src/sna/compiler.h  |   16 
 src/sna/fb/fb.h |4 
 src/sna/fb/fbpict.h |4 
 src/sna/gen2_render.c   |6 
 src/sna/gen3_render.c   |   85 
 src/sna/gen4_render.c   |   27 
 src/sna/gen5_render.c   |   20 
 src/sna/gen6_common.h   |  127 
 src/sna/gen6_render.c   |   95 
 src/sna/gen7_render.c   |  111 
 src/sna/gen8_render.c   |  144 
 src/sna/kgem.c  | 1268 
--
 src/sna/kgem.h  |   60 
 src/sna/kgem_debug_gen4.c   |2 
 src/sna/kgem_debug_gen5.c   |2 
 src/sna/kgem_debug_gen6.c   |2 
 src/sna/sna.h   |  126 
 src/sna/sna_accel.c |  697 ++-
 src/sna/sna_blt.c   |  206 -
 src/sna/sna_composite.c |  104 
 src/sna/sna_display.c   | 2022 
+++---
 src/sna/sna_display_fake.c  |3 
 src/sna/sna_dri2.c  | 1459 
---
 src/sna/sna_dri3.c  |   13 
 src/sna/sna_driver.c|  318 -
 src/sna/sna_glyphs.c   

xserver-xorg-video-intel: Changes to 'ubuntu'

[Robert Ancell]

 debian/changelog|   30 
--
 debian/control  |5 -
 debian/patches/fix-sna-external-slave-rotation.patch|   17 
+++--
 debian/patches/fix-sna-fstat-include.patch  |   20 
+++---
 debian/patches/fix-uxa-fstat-include.patch  |   10 +--
 debian/patches/fix-yuv-to-rgb-shared-on-intel-gen8.patch|1 
 debian/patches/sna-force-frontbuffer-to-cpu-for-randr-fallback.diff |   13 ++--
 7 files changed, 58 insertions(+), 38 deletions(-)

New commits:
commit c5b7e6f95f8a9b49a49b87c83922f01610a58445
Author: Robert Ancell robert.anc...@canonical.com
Date:   Thu Aug 6 10:03:53 2015 +1200

* Merge with Debian, remaining Ubuntu changes:
* debian/rules:
  - Fix valgrind-enabling check (DEB_HOST_ARCH_OS instead of DEB_HOST_ARCH)
  - Use SNA by default.
* debian/patches/fix-sna-external-slave-rotation.patch:
  - Fix rotating external display with optimus results in corruption.
* debian/patches/fix-sna-fstat-include.patch:
* debian/patches/fix-uxa-fstat-include.patch:
  - Fix missing include for fstat
* debian/patches/fix-yuv-to-rgb-shared-on-intel-gen8.patch:
  - Fix faulty yuv2rgb translation on Intel Generation 8 Graphics.
* debian/patches/sna-force-frontbuffer-to-cpu-for-randr-fallback.diff:
  - Fix rotation on SKL.

diff --git a/debian/changelog b/debian/changelog
index 08502ec..9130413 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,27 @@
+xserver-xorg-video-intel (2:2.99.917-1ubuntu1) wily; urgency=medium
+
+  * Merge with Debian, remaining Ubuntu changes:
+  * debian/rules:
+- Fix valgrind-enabling check (DEB_HOST_ARCH_OS instead of DEB_HOST_ARCH)
+- Use SNA by default.  
+  * debian/patches/fix-sna-external-slave-rotation.patch:
+- Fix rotating external display with optimus results in corruption.
+  * debian/patches/fix-sna-fstat-include.patch:
+  * debian/patches/fix-uxa-fstat-include.patch:
+- Fix missing include for fstat
+  * debian/patches/fix-yuv-to-rgb-shared-on-intel-gen8.patch:
+- Fix faulty yuv2rgb translation on Intel Generation 8 Graphics.
+  * debian/patches/sna-force-frontbuffer-to-cpu-for-randr-fallback.diff:
+- Fix rotation on SKL.
+
+ -- Robert Ancell robert.anc...@canonical.com  Tue, 14 Jul 2015 15:21:57 
+1200
+
+xserver-xorg-video-intel (2:2.99.917-1) unstable; urgency=medium
+
+  * Upload to unstable. (Closes: #748753)
+
+ -- Vincent Cheng vch...@debian.org  Thu, 07 May 2015 00:46:06 -0700
+
 xserver-xorg-video-intel (2:2.99.917-1~exp1ubuntu3) wily; urgency=medium
 
   * debian/patches/xmir.patch:
@@ -38,12 +62,6 @@ xserver-xorg-video-intel (2:2.99.917-1~exp1ubuntu1) vivid; 
urgency=medium
 
  -- Timo Aaltonen tjaal...@debian.org  Tue, 13 Jan 2015 12:39:09 +0200
 
-xserver-xorg-video-intel (2:2.99.917-1~exp2) UNRELEASED; urgency=medium
-
-  * rules: Fix valgrind-enabling check.
-
- -- Timo Aaltonen tjaal...@debian.org  Tue, 13 Jan 2015 12:34:17 +0200
-
 xserver-xorg-video-intel (2:2.99.917-1~exp1) experimental; urgency=medium
 
   * New upstream prerelease 2.99.917.
diff --git a/debian/control b/debian/control
index ab5fffe..ddc71e9 100644
--- a/debian/control
+++ b/debian/control
@@ -12,8 +12,7 @@ Build-Depends:
  debhelper (= 8),
  dh-autoreconf,
  pkg-config,
-# Depend on latest server to ensure XMir support
- xserver-xorg-dev (= 2:1.14.2.901-2ubuntu4~),
+ xserver-xorg-dev (= 2:1.11.99.901),
  x11proto-core-dev,
  x11proto-fonts-dev,
  x11proto-xinerama-dev,
@@ -37,7 +36,7 @@ Build-Depends:
  libxcb-dri2-0-dev,
 # end xvmc
  libudev-dev [linux-any],
- quilt (= 0.46-7~),
+ quilt,
  xutils-dev (= 1:7.5+4),
  valgrind [amd64 armel armhf i386 mips mipsel powerpc s390x],
 # intel-virtual-output:
diff --git a/debian/patches/fix-sna-external-slave-rotation.patch 
b/debian/patches/fix-sna-external-slave-rotation.patch
index 80b79f3..5251194 100644
--- a/debian/patches/fix-sna-external-slave-rotation.patch
+++ b/debian/patches/fix-sna-external-slave-rotation.patch
@@ -1,6 +1,7 @@
 commit 1cffbd9a8e96642bdbabf4e40829a5f1473b5bf9
 Author: Chris Wilson ch...@chris-wilson.co.uk
 Date:   Tue Jan 13 10:50:36 2015 +
+Bug-Ubuntu: https://launchpad.net/bugs/1410238
 
 sna: Combine slave CRTC offsets with rotation
 
@@ -11,11 +12,11 @@ Date:   Tue Jan 13 10:50:36 2015 +
 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
+Index: xserver-xorg-video-intel-2.99.917/src/sna/sna_display.c
+===
+--- 

xserver-xorg-video-intel: Changes to 'ubuntu-utopic'

[Timo Aaltonen]

 debian/changelog |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 18802b35e282ea382432c368dce3befd6f4f318b
Author: Timo Aaltonen tjaal...@debian.org
Date:   Fri Jun 26 14:23:21 2015 +0300

release to utopic

diff --git a/debian/changelog b/debian/changelog
index 8ba312b..17dafbc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xserver-xorg-video-intel (2:2.99.914-1~exp1ubuntu4.5) UNRELEASED; 
urgency=medium
+xserver-xorg-video-intel (2:2.99.914-1~exp1ubuntu4.5) utopic; urgency=medium
 
   [ Timo Aaltonen ]
   * sna-gen8-clear-instancing-enabled-bit-between-batches.diff: Fix
@@ -9,7 +9,7 @@ xserver-xorg-video-intel (2:2.99.914-1~exp1ubuntu4.5) 
UNRELEASED; urgency=medium
 rotating the screen (LP: #1376760) (LP: #1443345) backport from
 a88795c641 upstream.
 
- -- Timo Aaltonen tjaal...@debian.org  Mon, 11 May 2015 13:41:20 +0300
+ -- Timo Aaltonen tjaal...@debian.org  Fri, 26 Jun 2015 14:22:42 +0300
 
 xserver-xorg-video-intel (2:2.99.914-1~exp1ubuntu4.4) utopic; 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/e1zdwqg-0005gd...@moszumanska.debian.org

xserver-xorg-video-intel: Changes to 'ubuntu-vivid'

[Timo Aaltonen]

New branch 'ubuntu-vivid' 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/e1zdwre-0005u3...@moszumanska.debian.org

xserver-xorg-video-intel: Changes to 'ubuntu-vivid-lts'

[Timo Aaltonen]

New branch 'ubuntu-vivid-lts' available with the following commits:
commit eb70b91f31c94386068b6b56963ac60107582493
Author: Timo Aaltonen tjaal...@debian.org
Date:   Wed Jul 8 12:25:06 2015 +0300

Backport vivid package for lts-vivid stack.

commit c8360e93c7dd2d593fe19f29c18fe16c67621c4c
Merge: 940e71e b36a859
Author: Timo Aaltonen tjaal...@debian.org
Date:   Wed Jul 8 12:23:19 2015 +0300

Merge branch 'ubuntu-vivid' into lts-vivid

commit 940e71e65c55be9cef7bfcbee07cebde7f45fbbb
Author: Timo Aaltonen tjaal...@debian.org
Date:   Mon May 11 12:10:27 2015 +0300

Backport vivid package for lts-vivid stack.


-- 
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/e1zdwre-0005ui...@moszumanska.debian.org

xserver-xorg-video-intel: Changes to 'ubuntu'

[Timo Aaltonen]

 debian/changelog |7 ++
 debian/patches/fix-yuv-to-rgb-shared-on-intel-gen8.patch |   51 +++
 debian/patches/series|1 
 3 files changed, 59 insertions(+)

New commits:
commit b36a85972c55e44a7f3fb0c29c8910c11c406037
Author: Timo Aaltonen tjaal...@debian.org
Date:   Thu Jun 18 14:48:07 2015 +0300

import 2:2.99.917-1~exp1ubuntu2.2

diff --git a/debian/changelog b/debian/changelog
index 12eaca5..2b82360 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+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
+on Intel Generation 8 Graphics. (LP: #1449892)
+
+ -- Alessio Treglia quadris...@ubuntu.com  Fri, 29 May 2015 11:46:27 +0100
+
 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
diff --git a/debian/patches/fix-yuv-to-rgb-shared-on-intel-gen8.patch 
b/debian/patches/fix-yuv-to-rgb-shared-on-intel-gen8.patch
new file mode 100644
index 000..6aa4db1
--- /dev/null
+++ b/debian/patches/fix-yuv-to-rgb-shared-on-intel-gen8.patch
@@ -0,0 +1,51 @@
+From b6029105e404c9a7f7cdd230012cd5063c824ed4 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ville=20Syrj=C3=A4l=C3=A4?= ville.syrj...@linux.intel.com
+Date: Mon, 30 Mar 2015 16:51:29 +0300
+Subject: [PATCH] gen8: Fix the YUV-RGB shader
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Ville Syrjälä ville.syrj...@linux.intel.com
+---
+ src/render_program/exa_wm_yuv_rgb.g8a | 4 ++--
+ src/render_program/exa_wm_yuv_rgb.g8b | 2 +-
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/src/render_program/exa_wm_yuv_rgb.g8a 
b/src/render_program/exa_wm_yuv_rgb.g8a
+index 7def093..34973ba 100644
+--- a/src/render_program/exa_wm_yuv_rgb.g8a
 b/src/render_program/exa_wm_yuv_rgb.g8a
+@@ -76,7 +76,7 @@ add (16)Cbn1F  Cb8,8,1F  -0.501961F  { 
compr align1 };
+ /* 
+  * R = Y + Cr * 1.596
+  */
+-mov (8)acc01F   Yn8,8,1F  { compr align1 };
++mov (8)acc01F   Yn_018,8,1F   { compr align1 };
+ mac.sat(8) src_sample_r_011FCrn_018,8,1F  1.596F  { compr 
align1 };
+  
+ mov (8)acc01F   Yn_238,8,1F   { compr align1 };
+@@ -84,7 +84,7 @@ mac.sat(8) src_sample_r_231F   Crn_238,8,1F  1.596F  
{ compr align1 };
+ /*
+  * G = Crn * -0.813 + Cbn * -0.392 + Y
+  */
+-mov (8)acc01F   Yn_238,8,1F   { compr align1 };
++mov (8)acc01F   Yn_018,8,1F   { compr align1 };
+ mac (8)acc01F   Crn_018,8,1F  -0.813F { compr 
align1 };
+ mac.sat(8) src_sample_g_011FCbn_018,8,1F  -0.392F { 
compr align1 };
+ 
+diff --git a/src/render_program/exa_wm_yuv_rgb.g8b 
b/src/render_program/exa_wm_yuv_rgb.g8b
+index 4494953..2cd6fc4 100644
+--- a/src/render_program/exa_wm_yuv_rgb.g8b
 b/src/render_program/exa_wm_yuv_rgb.g8b
+@@ -6,7 +6,7 @@
+{ 0x80600048, 0x21c03ae8, 0x3e8d02c0, 0x3fcc49ba },
+{ 0x0061, 0x24003ae0, 0x008d0320, 0x },
+{ 0x80600048, 0x21e03ae8, 0x3e8d02e0, 0x3fcc49ba },
+-   { 0x0061, 0x24003ae0, 0x008d0320, 0x },
++   { 0x0061, 0x24003ae0, 0x008d0300, 0x },
+{ 0x00600048, 0x24003ae0, 0x3e8d02c0, 0xbf5020c5 },
+{ 0x80600048, 0x22003ae8, 0x3e8d0340, 0xbec8b439 },
+{ 0x0061, 0x24003ae0, 0x008d0320, 0x },
+-- 
+2.0.5
diff --git a/debian/patches/series b/debian/patches/series
index f458319..ceb8885 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,3 +4,4 @@ fix-sna-external-slave-rotation.patch
 xmir.patch
 
 sna-force-frontbuffer-to-cpu-for-randr-fallback.diff
+fix-yuv-to-rgb-shared-on-intel-gen8.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/e1z5z8s-00053n...@moszumanska.debian.org

xserver-xorg-video-intel: Changes to 'ubuntu'

[Timo Aaltonen]

 debian/changelog   |   10 
 debian/patches/fix-sna-fstat-include.patch |   55 
 debian/patches/fix-uxa-fstat-include.patch |   25 +
 debian/patches/series  |6 
 debian/patches/xmir.patch  |  391 -
 5 files changed, 92 insertions(+), 395 deletions(-)

New commits:
commit 21eab81f1c2ed0a533d8959a3bf2fd6a73f0dd05
Author: Timo Aaltonen tjaal...@debian.org
Date:   Thu Jun 18 15:46:13 2015 +0300

import 2:2.99.917-1~exp1ubuntu3

diff --git a/debian/changelog b/debian/changelog
index 2b82360..08502ec 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+xserver-xorg-video-intel (2:2.99.917-1~exp1ubuntu3) wily; urgency=medium
+
+  * debian/patches/xmir.patch:
+- Drop XMir patch, we don't need it with new glamor based XMir (LP: 
#1462994)
+  * debian/patches/fix-sna-fstat-include.patch:
+  * debian/patches/fix-uxa-fstat-include.patch:
+- Fix missing include for fstat
+
+ -- Robert Ancell robert.anc...@canonical.com  Tue, 09 Jun 2015 15:17:18 
+1200
+
 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/fix-sna-fstat-include.patch 
b/debian/patches/fix-sna-fstat-include.patch
new file mode 100644
index 000..11064d7
--- /dev/null
+++ b/debian/patches/fix-sna-fstat-include.patch
@@ -0,0 +1,55 @@
+commit 12af8a575d1518d40416f83195049157c3a062a5
+Author: Chris Wilson ch...@chris-wilson.co.uk
+Date:   Tue Feb 24 15:25:40 2015 +
+
+sna: udev integration depends on fstat and sys/stat.h
+
+src/sna/sna_driver.c: In function 'sna_handle_uevents':
+src/sna/sna_driver.c:759:2: error: implicit declaration of function 
'fstat' [-Werror=implicit-function-declaration]
+
+Also take the opportunity to include udev support in the configure
+summary.
+
+Signed-off-by: Chris Wilson ch...@chris-wilson.co.uk
+
+diff --git a/configure.ac b/configure.ac
+index 7476e2b..de3a4b3 100644
+--- a/configure.ac
 b/configure.ac
+@@ -197,11 +197,15 @@ AC_ARG_ENABLE(udev,
+ 
+ if test x$UDEV != xno; then
+   PKG_CHECK_MODULES(UDEV, [libudev], [udev=yes], [udev=no])
++  AC_CHECK_HEADERS([sys/stat.h], [], [udev=no])
+   if test x$UDEV = xyes -a x$udev != xyes; then
+   AC_MSG_ERROR([udev support requested but not found (libudev)])
+   fi
+   if test x$udev = xyes; then
+   AC_DEFINE(HAVE_UDEV,1,[Enable udev-based monitor hotplug 
detection])
++  udev_msg= yes
++  else
++  udev_msg= no
+   fi
+ fi
+ 
+@@ -911,6 +915,7 @@ echo   Support for Kernel Mode Setting? $KMS
+ echo   Support for legacy User Mode Setting (for i810)? $UMS
+ echo   Support for Direct Rendering Infrastructure:$dri_msg
+ echo   Support for Xv motion compensation (XvMC and libXvMC):$xvmc_msg
++echo   Support for display hotplug notifications (udev):$udev_msg
+ echo   Build additional tools and utilities?$tools_msg
+ if test -n $xp_msg; then
+ echo   Experimental support:$xp_msg
+diff --git a/src/sna/sna_driver.c b/src/sna/sna_driver.c
+index 8c0d0b5..bc20ef0 100644
+--- a/src/sna/sna_driver.c
 b/src/sna/sna_driver.c
+@@ -740,6 +740,8 @@ sna_wakeup_handler(WAKEUPHANDLER_ARGS_DECL)
+ }
+ 
+ #if HAVE_UDEV
++#include sys/stat.h
++
+ static void
+ sna_handle_uevents(int fd, void *closure)
+ {
diff --git a/debian/patches/fix-uxa-fstat-include.patch 
b/debian/patches/fix-uxa-fstat-include.patch
new file mode 100644
index 000..b99021d
--- /dev/null
+++ b/debian/patches/fix-uxa-fstat-include.patch
@@ -0,0 +1,25 @@
+commit 369ceec0e4910ba2c37736a59c55c0d6c26433bf
+Author: Chris Wilson ch...@chris-wilson.co.uk
+Date:   Tue Feb 24 15:25:40 2015 +
+
+uxa: udev integration depends on fstat and sys/stat.h
+
+src/uxa/intel_driver.c: In function 'I830HandleUEvents':
+src/uxa/intel_driver.c:738:14: error: storage size of 's' isn't known
+src/uxa/intel_driver.c:746:2: error: implicit declaration of function 
'fstat' [-Werror=implicit-function-declaration]
+
+Signed-off-by: Chris Wilson ch...@chris-wilson.co.uk
+
+diff --git a/src/uxa/intel_driver.c b/src/uxa/intel_driver.c
+index c554124..6e64b8c 100644
+--- a/src/uxa/intel_driver.c
 b/src/uxa/intel_driver.c
+@@ -728,6 +728,8 @@ intel_flush_callback(CallbackListPtr *list,
+ }
+ 
+ #if HAVE_UDEV
++#include sys/stat.h
++
+ static void
+ I830HandleUEvents(int fd, void *closure)
+ {
diff --git a/debian/patches/series b/debian/patches/series
index ceb8885..309cac2 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,7 +1,5 @@
 fix-sna-external-slave-rotation.patch
-
-# XMir series
-xmir.patch
-
 sna-force-frontbuffer-to-cpu-for-randr-fallback.diff
 fix-yuv-to-rgb-shared-on-intel-gen8.patch
+fix-sna-fstat-include.patch
+fix-uxa-fstat-include.patch
diff --git a/debian/patches/xmir.patch b/debian/patches/xmir.patch

xserver-xorg-video-intel: Changes to 'ubuntu'

[Timo Aaltonen]

 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 tjaal...@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 tjaal...@debian.org  Wed, 22 Apr 2015 15:20:45 +0300
+ -- Timo Aaltonen tjaal...@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 tjaal...@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 tjaal...@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 000..10404f5
--- /dev/null
+++ b/debian/source/local-options
@@ -0,0 +1 @@
+--extend-diff-ignore=src/render_program/exa_.*.g8a

commit a4b2ef82281e77c672bdd42413f778e557d2e14d
Author: Timo Aaltonen tjaal...@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 tjaal...@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 000..53d50fb
--- /dev/null
+++ b/debian/patches/sna-force-frontbuffer-to-cpu-for-randr-fallback.diff
@@ -0,0 +1,61 @@
+commit 15c307d70e00bc035bb61be5d8b6f727925e3d34
+Author: Chris Wilson ch...@chris-wilson.co.uk
+Date:   Tue Mar 10 08:48:48 2015 +
+
+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 ch...@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.)
++   

xserver-xorg-video-intel: Changes to 'ubuntu-utopic'

[Robert Hooker]

 debian/changelog   |6 +++
 debian/patches/series  |1 
 debian/patches/sna-clear-cursor-image-after-rotation.patch |   24 +
 3 files changed, 31 insertions(+)

New commits:
commit 241a672570698fb69504334103c36c567ae6c54c
Author: Robert Hooker sarv...@ubuntu.com
Date:   Thu May 28 17:57:04 2015 -0400

Add a patch to fix lp1376760, double cursor on rotation

diff --git a/debian/changelog b/debian/changelog
index 426edc8..8ba312b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,14 @@
 xserver-xorg-video-intel (2:2.99.914-1~exp1ubuntu4.5) UNRELEASED; 
urgency=medium
 
+  [ Timo Aaltonen ]
   * sna-gen8-clear-instancing-enabled-bit-between-batches.diff: Fix
 corruptions and missing letters on 2nd head. (LP: #1432194)
 
+  [ Robert Hooker ]
+  * sna-clear-cursor-image-after-rotation.patch: Fix a double cursor problem 
after
+rotating the screen (LP: #1376760) (LP: #1443345) backport from
+a88795c641 upstream.
+
  -- Timo Aaltonen tjaal...@debian.org  Mon, 11 May 2015 13:41:20 +0300
 
 xserver-xorg-video-intel (2:2.99.914-1~exp1ubuntu4.4) utopic; urgency=medium
diff --git a/debian/patches/series b/debian/patches/series
index 83950b0..557bed1 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -15,3 +15,4 @@ bdw-annotate-more-64bit-pointer-locations.diff
 bdw-clamp-urb-allocations-for-gt3.diff
 fix-sna-trapezoids.patch
 sna-gen8-clear-instancing-enabled-bit-between-batches.diff
+sna-clear-cursor-image-after-rotation.patch
diff --git a/debian/patches/sna-clear-cursor-image-after-rotation.patch 
b/debian/patches/sna-clear-cursor-image-after-rotation.patch
new file mode 100644
index 000..b71b118
--- /dev/null
+++ b/debian/patches/sna-clear-cursor-image-after-rotation.patch
@@ -0,0 +1,24 @@
+From a88795c64123e4084044451d8861838ea904abd9 Mon Sep 17 00:00:00 2001
+From: Chris Wilson ch...@chris-wilson.co.uk
+Date: Tue, 29 Jul 2014 21:11:09 +0100
+Subject: sna: Clear cursor image after rotation
+
+Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=81886
+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 8964e77..eed68d3 100644
+--- a/src/sna/sna_display.c
 b/src/sna/sna_display.c
+@@ -4294,7 +4294,7 @@ static struct sna_cursor *__sna_get_cursor(struct sna 
*sna, xf86CrtcPtr crtc)
+   image = sna-cursor.scratch;
+   cursor-last_width = cursor-last_height = size;
+   }
+-  if (width  cursor-last_width || height  cursor-last_height)
++  if (width  cursor-last_width || height  cursor-last_height || 
rotation != cursor-rotation)
+   memset(image, 0, 4*size*size);
+   if (rotation == RR_Rotate_0) {
+   if (argb == NULL) {
+-- 
+cgit v0.10.2
+


-- 
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/e1yy5na-0007on...@moszumanska.debian.org

xserver-xorg-video-intel: Changes to 'ubuntu-utopic'

[Timo Aaltonen]

Rebased ref, commits from common ancestor:
commit 7180b5be2159bd0ef7c8ef6ae7991f2a38263158
Author: Timo Aaltonen tjaal...@debian.org
Date:   Fri May 29 00:45:29 2015 +0300

Import changes from 2:2.99.914-1~exp1ubuntu4.4

diff --git a/debian/changelog b/debian/changelog
index 028286c..426edc8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,17 @@
-xserver-xorg-video-intel (2:2.99.914-1~exp1ubuntu4.4) UNRELEASED; 
urgency=medium
+xserver-xorg-video-intel (2:2.99.914-1~exp1ubuntu4.5) UNRELEASED; 
urgency=medium
 
   * sna-gen8-clear-instancing-enabled-bit-between-batches.diff: Fix
 corruptions and missing letters on 2nd head. (LP: #1432194)
 
  -- Timo Aaltonen tjaal...@debian.org  Mon, 11 May 2015 13:41:20 +0300
 
+xserver-xorg-video-intel (2:2.99.914-1~exp1ubuntu4.4) utopic; urgency=medium
+
+  * fix-sna-trapezoids.patch: Fix client-side shadows for GTK+ 3.14
+(LP: #1378188).
+
+ -- Marius Gedminas mar...@gedmin.as  Tue, 05 May 2015 11:25:15 +0100
+
 xserver-xorg-video-intel (2:2.99.914-1~exp1ubuntu4.3) utopic; urgency=medium
 
   * bdw-annotate-more-64bit-pointer-locations.diff
diff --git a/debian/patches/fix-sna-trapezoids.patch 
b/debian/patches/fix-sna-trapezoids.patch
new file mode 100644
index 000..6252e64
--- /dev/null
+++ b/debian/patches/fix-sna-trapezoids.patch
@@ -0,0 +1,122 @@
+From 48a33fc379b17eed195875222ad773c911d9dff1 Mon Sep 17 00:00:00 2001
+From: Chris Wilson ch...@chris-wilson.co.uk
+Date: Tue, 2 Sep 2014 19:08:36 +0100
+Subject: sna/trapezoids: Use the corrected trapezoid origin for aligned boxes
+
+The rule for the origin of the CompositeTrapezoids routine is the
+upper-left corner of the first trapezoid. Care must be taken in case the
+trapezoid edge is upside down to consider the upper vertex.
+
+Reported-by: Jasper St. Pierre jstpie...@mecheye.net
+Signed-off-by: Chris Wilson ch...@chris-wilson.co.uk
+
+diff --git a/src/sna/sna_trapezoids_boxes.c b/src/sna/sna_trapezoids_boxes.c
+index 2f7028f..a2045dc 100644
+--- a/src/sna/sna_trapezoids_boxes.c
 b/src/sna/sna_trapezoids_boxes.c
+@@ -120,13 +120,16 @@ composite_aligned_boxes(struct sna *sna,
+   BoxRec stack_boxes[64], *boxes;
+   pixman_region16_t region, clip;
+   struct sna_composite_op tmp;
++  int16_t dst_x, dst_y;
+   bool ret = true;
+   int dx, dy, n, num_boxes;
+ 
+   if (NO_ALIGNED_BOXES)
+   return false;
+ 
+-  DBG((%s\n, __FUNCTION__));
++  DBG((%s: pixmap=%ld, nboxes=%d, dx=(%d, %d)\n, __FUNCTION__,
++  get_drawable_pixmap(dst-pDrawable)-drawable.serialNumber,
++  ntrap, dst-pDrawable-x, dst-pDrawable-y));
+ 
+   boxes = stack_boxes;
+   if (ntrap  (int)ARRAY_SIZE(stack_boxes)) {
+@@ -168,19 +171,20 @@ composite_aligned_boxes(struct sna *sna,
+   if (num_boxes == 0)
+   goto free_boxes;
+ 
+-  DBG((%s: extents (%d, %d), (%d, %d) offset of (%d, %d)\n,
++  trapezoid_origin(traps[0].left, dst_x, dst_y);
++
++  DBG((%s: extents (%d, %d), (%d, %d) offset of (%d, %d), origin (%d, 
%d)\n,
+__FUNCTION__,
+region.extents.x1, region.extents.y1,
+region.extents.x2, region.extents.y2,
+region.extents.x1 - boxes[0].x1,
+-   region.extents.y1 - boxes[0].y1));
+-
+-  src_x += region.extents.x1 - boxes[0].x1;
+-  src_y += region.extents.y1 - boxes[0].y1;
++   region.extents.y1 - boxes[0].y1,
++   dst_x, dst_y));
+ 
+   if (!sna_compute_composite_region(clip,
+ src, NULL, dst,
+-src_x,  src_y,
++src_x + region.extents.x1 - dst_x - 
dx,
++src_y + region.extents.y1 - dst_y - 
dy,
+ 0, 0,
+ region.extents.x1 - dx, 
region.extents.y1 - dy,
+ region.extents.x2 - region.extents.x1,
+@@ -193,14 +197,24 @@ composite_aligned_boxes(struct sna *sna,
+   if (op == PictOpClear  sna-clear)
+   src = sna-clear;
+ 
++  DBG((%s: clipped extents (%d, %d), (%d, %d);  now offset by (%d, %d), 
orgin (%d, %d)\n,
++   __FUNCTION__,
++   clip.extents.x1, clip.extents.y1,
++   clip.extents.x2, clip.extents.y2,
++   clip.extents.x1 - boxes[0].x1,
++   clip.extents.y1 - boxes[0].y1,
++   dst_x, dst_y));
++
+   if (force_fallback ||
+   !sna-render.composite(sna, op, src, NULL, dst,
+- src_x,  src_y,
++ src_x + clip.extents.x1 - dst_x,
++ src_y + clip.extents.y1 - dst_y,
+  0, 0,
+  clip.extents.x1,  clip.extents.y1,
+  clip.extents.x2 - clip.extents.x1,
+  

xserver-xorg-video-intel: Changes to 'ubuntu-utopic'

[Robert Hooker]

 debian/changelog  |   15 +
 debian/patches/bdw-annotate-more-64bit-pointer-locations.diff |   20 -
 debian/patches/bdw-clamp-urb-allocations-for-gt3.diff |9 
 debian/patches/fix-sna-trapezoids.patch   |  122 ++
 debian/patches/series |1 
 5 files changed, 154 insertions(+), 13 deletions(-)

New commits:
commit a867797fedf60067a88f4ecfb6e44cc0a270802a
Author: Robert Hooker sarv...@ubuntu.com
Date:   Thu May 28 09:58:38 2015 -0400

Update to what's currently in Utopic.

diff --git a/debian/changelog b/debian/changelog
index 680ee24..dd711c9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,18 @@
+xserver-xorg-video-intel (2:2.99.914-1~exp1ubuntu4.4) utopic; urgency=medium
+
+  * fix-sna-trapezoids.patch: Fix client-side shadows for GTK+ 3.14
+(LP: #1378188).
+
+ -- Marius Gedminas mar...@gedmin.as  Tue, 05 May 2015 11:25:15 +0100
+
+xserver-xorg-video-intel (2:2.99.914-1~exp1ubuntu4.3) utopic; 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, 22 Apr 2015 19:57:12 +0300
+
 xserver-xorg-video-intel (2:2.99.914-1~exp1ubuntu4.2) utopic-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
index 3ba449b..d42090d 100644
--- a/debian/patches/bdw-annotate-more-64bit-pointer-locations.diff
+++ b/debian/patches/bdw-annotate-more-64bit-pointer-locations.diff
@@ -8,7 +8,7 @@ Date:   Wed Oct 22 19:30:21 2014 +0100
 
 --- a/src/sna/gen8_render.c
 +++ b/src/sna/gen8_render.c
-@@ -474,7 +474,7 @@ gen8_emit_vs_invariant(struct sna *sna)
+@@ -523,7 +523,7 @@ gen8_emit_vs_invariant(struct sna *sna)
OUT_BATCH(GEN8_3DSTATE_VS | (9 - 2));
OUT_BATCH64(0); /* no VS kernel */
OUT_BATCH(0);
@@ -17,7 +17,7 @@ Date:   Wed Oct 22 19:30:21 2014 +0100
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
+@@ -549,12 +549,10 @@ static void
  gen8_emit_hs_invariant(struct sna *sna)
  {
OUT_BATCH(GEN8_3DSTATE_HS | (9 - 2));
@@ -32,7 +32,7 @@ Date:   Wed Oct 22 19:30:21 2014 +0100
OUT_BATCH(0);
OUT_BATCH(0); /* pass-through */
  
-@@ -541,11 +539,9 @@ static void
+@@ -590,11 +588,9 @@ static void
  gen8_emit_ds_invariant(struct sna *sna)
  {
OUT_BATCH(GEN8_3DSTATE_DS | (9 - 2));
@@ -46,7 +46,7 @@ Date:   Wed Oct 22 19:30:21 2014 +0100
OUT_BATCH(0);
OUT_BATCH(0);
OUT_BATCH(0);
-@@ -573,15 +569,13 @@ static void
+@@ -622,15 +618,13 @@ static void
  gen8_emit_gs_invariant(struct sna *sna)
  {
OUT_BATCH(GEN8_3DSTATE_GS | (10 - 2));
@@ -65,7 +65,7 @@ Date:   Wed Oct 22 19:30:21 2014 +0100
  
  #if SIM
OUT_BATCH(GEN8_3DSTATE_CONSTANT_GS | (11 - 2));
-@@ -690,13 +684,15 @@ gen8_emit_wm_invariant(struct sna *sna)
+@@ -744,13 +738,15 @@ gen8_emit_wm_invariant(struct sna *sna)
OUT_BATCH(WM_PERSPECTIVE_PIXEL_BARYCENTRIC);
  
  #if SIM
@@ -84,7 +84,7 @@ Date:   Wed Oct 22 19:30:21 2014 +0100
OUT_BATCH(0);
  #endif
  
-@@ -834,6 +830,7 @@ gen8_emit_cc(struct sna *sna, uint32_t b
+@@ -891,6 +887,7 @@ gen8_emit_cc(struct sna *sna, uint32_t b
} else
OUT_BATCH(PS_BLEND_HAS_WRITEABLE_RT);
  
@@ -92,7 +92,7 @@ Date:   Wed Oct 22 19:30:21 2014 +0100
OUT_BATCH(GEN8_3DSTATE_BLEND_STATE_POINTERS | (2 - 2));
OUT_BATCH((render-cc_blend + blend * GEN8_BLEND_STATE_PADDED_SIZE) | 
1);
  
-@@ -896,6 +893,9 @@ gen8_emit_wm(struct sna *sna, int kernel
+@@ -953,6 +950,9 @@ gen8_emit_wm(struct sna *sna, int kernel
 wm_kernels[kernel].name,
 wm_kernels[kernel].num_surfaces,
 kernels[0], kernels[1], kernels[2]));
@@ -102,7 +102,7 @@ Date:   Wed Oct 22 19:30:21 2014 +0100
  
OUT_BATCH(GEN8_3DSTATE_PS | (12 - 2));
OUT_BATCH64(kernels[0] ?: kernels[1] ?: kernels[2]);
-@@ -1185,8 +1185,8 @@ static bool gen8_magic_ca_pass(struct sn
+@@ -1242,8 +1242,8 @@ static bool gen8_magic_ca_pass(struct sn
  true, true,
  op-is_affine));
  
@@ -113,7 +113,7 @@ Date:   Wed Oct 22 19:30:21 2014 +0100
OUT_BATCH(sna-render.vertex_index - sna-render.vertex_start);
OUT_BATCH(sna-render.vertex_start);
OUT_BATCH(1);   /* single instance */
-@@ -1371,7 +1371,7 @@ static void gen8_emit_primitive(struct s
+@@ -1435,7 +1435,7 @@ static void gen8_emit_primitive(struct s
}
  
OUT_BATCH(GEN8_3DPRIMITIVE | (7 - 2));
@@ -122,7 +122,7 @@ Date:   Wed Oct 22 19:30:21 2014 +0100
sna-render.vertex_offset = sna-kgem.nbatch;
OUT_BATCH(0);   /* 

xserver-xorg-video-intel: Changes to 'ubuntu-utopic'

[Timo Aaltonen]

 debian/patches/bdw-annotate-more-64bit-pointer-locations.diff |  132 ++
 debian/patches/bdw-clamp-urb-allocations-for-gt3.diff |   38 ++
 debian/patches/series |2 
 3 files changed, 172 insertions(+)

New commits:
commit 583a3fbd9a9e51a63be5d778ca1f626e7a9eca82
Author: Timo Aaltonen tjaal...@debian.org
Date:   Fri Apr 17 07:59:16 2015 +0300

wip

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, 64));
+   OUT_BATCH(GEN8_3DSTATE_BLEND_STATE_POINTERS | (2 - 2));
+   OUT_BATCH((render-cc_blend + blend * GEN8_BLEND_STATE_PADDED_SIZE) | 
1);
+ 
+@@ -896,6 +893,9 @@ gen8_emit_wm(struct sna *sna, int kernel
+wm_kernels[kernel].name,
+wm_kernels[kernel].num_surfaces,
+kernels[0], kernels[1], kernels[2]));
++  assert(is_aligned(kernels[0], 64));
++  assert(is_aligned(kernels[1], 64));
++  assert(is_aligned(kernels[2], 64));
+ 
+   OUT_BATCH(GEN8_3DSTATE_PS | (12 - 2));
+   OUT_BATCH64(kernels[0] ?: kernels[1] ?: kernels[2]);
+@@ -1185,8 +1185,8 @@ static bool gen8_magic_ca_pass(struct sn
+ true, true,
+ op-is_affine));
+ 
+-  OUT_BATCH(GEN8_3DPRIMITIVE | (7- 2));
+-  OUT_BATCH(RECTLIST); /* ignored, see VF_TOPOLOGY */
++  OUT_BATCH(GEN8_3DPRIMITIVE | (7 - 2));
++  OUT_BATCH(0); /* ignored, see VF_TOPOLOGY */
+   OUT_BATCH(sna-render.vertex_index - sna-render.vertex_start);
+   OUT_BATCH(sna-render.vertex_start);
+   OUT_BATCH(1);   /* single instance */
+@@ -1371,7 +1371,7 @@ static void gen8_emit_primitive(struct s
+   }
+ 
+   OUT_BATCH(GEN8_3DPRIMITIVE | (7 - 2));
+-  OUT_BATCH(RECTLIST); /* ignored, see VF_TOPOLOGY */
++  OUT_BATCH(0); /* ignored, see VF_TOPOLOGY */
+   sna-render.vertex_offset = sna-kgem.nbatch;
+   OUT_BATCH(0);   /* vertex count, to be filled in later */
+   OUT_BATCH(sna-render.vertex_index);
+@@ 

xserver-xorg-video-intel: Changes to 'ubuntu-trusty'

[Timo Aaltonen]

 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'

[Timo Aaltonen]

 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'

[Maarten Bernardus Lankhorst]

 debian/changelog |7 +
 debian/patches/fix-sna-external-slave-rotation.patch |   69 +++
 debian/patches/series|2 
 3 files changed, 78 insertions(+)

New commits:
commit 36fa1a6f15b2f2675a375c5a2d1a2f22f061d7f5
Author: Maarten Lankhorst maarten.lankho...@ubuntu.com
Date:   Tue Jan 13 15:16:15 2015 +0100

release to vivid

diff --git a/debian/changelog b/debian/changelog
index 1a095f7..a41fdf9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
-xserver-xorg-video-intel (2:2.99.917-1~exp1ubuntu2) UNRELEASED; urgency=medium
+xserver-xorg-video-intel (2:2.99.917-1~exp1ubuntu2) vivid; urgency=medium
 
   * Fix rotating external display with optimus results in corruption.
 - fix-sna-external-slave-rotation.patch (LP: #1410238)
 
- -- Maarten Lankhorst maarten.lankho...@ubuntu.com  Tue, 13 Jan 2015 
13:57:51 +0100
+ -- Maarten Lankhorst maarten.lankho...@ubuntu.com  Tue, 13 Jan 2015 
15:16:03 +0100
 
 xserver-xorg-video-intel (2:2.99.917-1~exp1ubuntu1) vivid; urgency=medium
 

commit 502cb697638ff25f12e413efc47296c7250cd187
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 ff83a1b..1a095f7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xserver-xorg-video-intel (2:2.99.917-1~exp1ubuntu2) UNRELEASED; urgency=medium
+
+  * Fix rotating external display with optimus results in corruption.
+- fix-sna-external-slave-rotation.patch (LP: #1410238)
+
+ -- Maarten Lankhorst maarten.lankho...@ubuntu.com  Tue, 13 Jan 2015 
13:57:51 +0100
+
 xserver-xorg-video-intel (2:2.99.917-1~exp1ubuntu1) vivid; urgency=medium
 
   * Merge from Debian experimental.
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 

xserver-xorg-video-intel: Changes to 'ubuntu-utopic'

[Maarten Bernardus Lankhorst]

 debian/changelog |4 +
 debian/patches/fix-sna-external-slave-rotation.patch |   69 +++
 debian/patches/series|1 
 3 files changed, 74 insertions(+)

New commits:
commit c827f7f67632de3958fd22a517197b80acc5dd3f
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)

Conflicts:
debian/patches/series

diff --git a/debian/changelog b/debian/changelog
index f82989f..d16c845 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,15 @@
 xserver-xorg-video-intel (2:2.99.914-1~exp1ubuntu4.2) UNRELEASED; 
urgency=medium
 
+  [ Timo Aaltonen ]
   * Added patches:
 - disable-dri3.diff: Disable DRI3. (LP: #1401784)
 - sna-fix-gen8-blt.diff,
   sna-add-more-checks-and-asserts-for-blt.diff,
   sna-tweak-alignment-constraints-on-gen8.diff:
   Fix GEN8 BLT with 4bit address. (LP: #1401788)
+  [ Maarten Lankhorst ]
+  * 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 10:53:54 +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 02ff016..30cfcba 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -10,3 +10,4 @@ disable-dri3.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-000589...@moszumanska.debian.org

xserver-xorg-video-intel: Changes to 'ubuntu-trusty'

[Maarten Bernardus Lankhorst]

 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'

[Maarten Bernardus Lankhorst]

 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-utopic'

[Timo Aaltonen]

 debian/changelog |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 4e40c17891273398053532126ddaee6733659825
Author: Timo Aaltonen tjaal...@debian.org
Date:   Tue Jan 13 14:26:39 2015 +0200

unrelease

diff --git a/debian/changelog b/debian/changelog
index ba34487..804a8d1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xserver-xorg-video-intel (2:2.99.914-1~exp1ubuntu4.2) utopic-proposed; 
urgency=medium
+xserver-xorg-video-intel (2:2.99.914-1~exp1ubuntu4.2) UNRELEASED; 
urgency=medium
 
   * Added patches:
 - disable-dri3.diff: Disable DRI3. (LP: #1401784)


-- 
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/e1yb0zs-0001an...@moszumanska.debian.org

xserver-xorg-video-intel: Changes to 'ubuntu'

[Timo Aaltonen]

 NEWS   |   50 
 configure.ac   |2 
 debian/changelog   |   22 
 debian/control |3 
 debian/patches/dri3-flush-broken.patch |   82 -
 debian/patches/series  |2 
 debian/patches/xmir.patch  |   44 
 debian/upstream.changelog  | 2231 +
 src/sna/Makefile.am|1 
 src/sna/brw/brw_eu_emit.c  |7 
 src/sna/debug.h|   44 
 src/sna/fb/fb.h|   10 
 src/sna/kgem.c |4 
 src/sna/kgem.h |   10 
 src/sna/sna.h  |   16 
 src/sna/sna_accel.c|   27 
 src/sna/sna_display.c  |  243 ++-
 src/sna/sna_dri2.c |   64 
 src/sna/sna_dri3.c |   36 
 src/sna/sna_driver.c   |   11 
 src/sna/sna_render.c   |6 
 src/sna/sna_trapezoids.c   |9 
 src/sna/xassert.h  |   10 
 src/uxa/intel.h|1 
 src/uxa/intel_display.c|5 
 src/uxa/intel_dri.c|4 
 src/uxa/intel_driver.c |5 
 tools/virtual.c|9 
 28 files changed, 2695 insertions(+), 263 deletions(-)

New commits:
commit 6f2c773eba8aec8e2e9896f1edd335bfee5ccb60
Author: Timo Aaltonen tjaal...@debian.org
Date:   Tue Jan 13 14:17:49 2015 +0200

release to vivid

diff --git a/debian/changelog b/debian/changelog
index ea1e430..ff83a1b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+xserver-xorg-video-intel (2:2.99.917-1~exp1ubuntu1) vivid; urgency=medium
+
+  * Merge from Debian experimental.
+  * Drop dri3-flush-broken.patch, upstream
+  * Refresh xmir patch.
+
+ -- Timo Aaltonen tjaal...@debian.org  Tue, 13 Jan 2015 12:39:09 +0200
+
 xserver-xorg-video-intel (2:2.99.917-1~exp2) UNRELEASED; urgency=medium
 
   * rules: Fix valgrind-enabling check.
diff --git a/debian/patches/dri3-flush-broken.patch 
b/debian/patches/dri3-flush-broken.patch
deleted file mode 100644
index 7abae5c..000
--- a/debian/patches/dri3-flush-broken.patch
+++ /dev/null
@@ -1,82 +0,0 @@
 a/src/sna/sna_accel.c
-+++ b/src/sna/sna_accel.c
-@@ -1408,6 +1408,9 @@
- 
-   __sna_pixmap_free_cpu(sna, priv);
- 
-+  if (priv-flush)
-+  sna_accel_watch_flush(sna, -1);
-+
-   if (priv-header) {
-   assert(pixmap-drawable.pScreen == sna-scrn-pScreen);
-   assert(!priv-shm);
 a/src/sna/sna_dri3.c
-+++ b/src/sna/sna_dri3.c
-@@ -39,6 +39,8 @@
- #include misyncshm.h
- #include misyncstr.h
- 
-+#define MESA_HAS_NO_FENCES 1
-+
- static DevPrivateKeyRec sna_sync_fence_private_key;
- struct sna_sync_fence {
-   SyncFenceSetTriggeredFunc set_triggered;
-@@ -49,6 +51,22 @@
-   return dixLookupPrivate(fence-devPrivates, 
sna_sync_fence_private_key);
- }
- 
-+static inline void mark_dri3_pixmap(struct sna *sna, struct sna_pixmap *priv, 
struct kgem_bo *bo)
-+{
-+  if (!MESA_HAS_NO_FENCES)
-+  return;
-+
-+  bo-flush = true;
-+  if (bo-exec)
-+  sna-kgem.flush = 1;
-+  if (bo == priv-gpu_bo)
-+  priv-flush |= 3;
-+  else
-+  priv-shm = true;
-+
-+  sna_accel_watch_flush(sna, 1);
-+}
-+
- static void sna_sync_flush(struct sna *sna, struct sna_pixmap *priv)
- {
-   struct kgem_bo *bo = NULL;
-@@ -94,11 +112,13 @@
-   DBG((%s: associated pixmap=%ld\n, __FUNCTION__, 
get_drawable_pixmap(draw)-drawable.serialNumber));
-   sna_sync_flush(sna, sna_pixmap(get_drawable_pixmap(draw)));
-   } else { /* SyncFence are currently per-screen, sigh */
--  struct sna_pixmap *priv;
-+  if (!MESA_HAS_NO_FENCES) {
-+  struct sna_pixmap *priv;
- 
--  DBG((%s: flushing all DRI3 pixmaps\n, __FUNCTION__));
--  list_for_each_entry(priv, sna-dri3.pixmaps, cow_list)
--  sna_sync_flush(sna, priv);
-+  DBG((%s: flushing all DRI3 pixmaps\n, __FUNCTION__));
-+  list_for_each_entry(priv, sna-dri3.pixmaps, cow_list)
-+  sna_sync_flush(sna, priv);
-+  }
- 
-   sna_accel_flush(sna);
-   }
-@@ -278,6 +298,8 @@
-   }
-   list_add(priv-cow_list, sna-dri3.pixmaps);
- 
-+  mark_dri3_pixmap(sna, priv, bo);
-+
-   return pixmap;
- 
- free_pixmap:
-@@ -337,6 +359,8 @@
-   priv-pinned |= PIN_DRI3;
-   list_move(priv-cow_list, sna-dri3.pixmaps);
- 
-+  mark_dri3_pixmap(sna, priv, bo);
-+
-   *stride = (priv-pinned  PIN_DRI3) ? priv-gpu_bo-pitch : 
priv-cpu_bo-pitch;
-   *size = kgem_bo_size((priv-pinned  PIN_DRI3) ? priv-gpu_bo : 
priv-cpu_bo);
-   DBG((%s: exporting %s 

xserver-xorg-video-intel: Changes to 'ubuntu-utopic'

[Timo Aaltonen]

 debian/changelog|5 
 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, 240 insertions(+), 1 deletion(-)

New commits:
commit 1b9d692cb8ff8eba2e43755a04552808ae9b3b69
Author: Timo Aaltonen tjaal...@debian.org
Date:   Tue Jan 13 14:55:18 2015 +0200

add two more patches

diff --git a/debian/changelog b/debian/changelog
index 804a8d1..f82989f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,7 +2,10 @@ xserver-xorg-video-intel (2:2.99.914-1~exp1ubuntu4.2) 
UNRELEASED; urgency=medium
 
   * Added patches:
 - disable-dri3.diff: Disable DRI3. (LP: #1401784)
-- sna-fix-gen8-blt.diff: Fix GEN8 BLT with 4bit address. (LP: #1401788)
+- sna-fix-gen8-blt.diff,
+  sna-add-more-checks-and-asserts-for-blt.diff,
+  sna-tweak-alignment-constraints-on-gen8.diff:
+  Fix GEN8 BLT with 4bit address. (LP: #1401788)
 
  -- Timo Aaltonen tjaal...@debian.org  Fri, 12 Dec 2014 10:53:54 +0200
 
diff --git a/debian/patches/series b/debian/patches/series
index e8f787e..02ff016 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -8,3 +8,5 @@ fix-uxa-fglrx-stealing.diff
 sna-use-vmask-in-3dstate-ps.diff
 disable-dri3.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 ch...@chris-wilson.co.uk
+
+--- a/src/sna/sna_accel.c
 b/src/sna/sna_accel.c
+@@ -4642,6 +4642,9 @@ sna_put_xybitmap_blt(DrawablePtr drawabl
+   }
+   }
+ 
++  if (!kgem_bo_can_blt(sna-kgem, bo))
++  return false;
++
+   assert_pixmap_contains_box(pixmap, RegionExtents(region));
+   if (damage)
+   sna_damage_add(damage, region);
+@@ -4654,6 +4657,7 @@ sna_put_xybitmap_blt(DrawablePtr drawabl
+   y += dy + drawable-y;
+ 
+   kgem_set_mode(sna-kgem, KGEM_BLT, bo);
++  assert(kgem_bo_can_blt(sna-kgem, bo));
+ 
+   /* Region is pre-clipped and translated into pixmap space */
+   box = RegionRects(region);
+@@ -4802,6 +4806,9 @@ sna_put_xypixmap_blt(DrawablePtr drawabl
+   }
+   }
+ 
++  if (!kgem_bo_can_blt(sna-kgem, bo))
++  return false;
++
+   assert_pixmap_contains_box(pixmap, RegionExtents(region));
+   if (damage)
+   sna_damage_add(damage, region);
+@@ -4814,6 +4821,7 @@ sna_put_xypixmap_blt(DrawablePtr drawabl
+   y += dy + drawable-y;
+ 
+   kgem_set_mode(sna-kgem, KGEM_BLT, bo);
++  assert(kgem_bo_can_blt(sna-kgem, bo));
+ 
+   skip = h * BitmapBytePad(w + left);
+   for (i = 1  (gc-depth-1); i; i = 1, bits += skip) {
+@@ -7570,6 +7578,7 @@ sna_copy_bitmap_blt(DrawablePtr _bitmap,
+   br13 |= copy_ROP[gc-alu]  16;
+ 
+   kgem_set_mode(sna-kgem, KGEM_BLT, arg-bo);
++  assert(kgem_bo_can_blt(sna-kgem, arg-bo));
+   do {
+   int bx1 = (box-x1 + sx)  ~7;
+   int bx2 = (box-x2 + sx + 7)  ~7;
+@@ -7789,6 +7798,7 @@ sna_copy_plane_blt(DrawablePtr source, D
+   br13 |= copy_ROP[gc-alu]  16;
+ 
+   kgem_set_mode(sna-kgem, KGEM_BLT, arg-bo);
++  assert(kgem_bo_can_blt(sna-kgem, arg-bo));
+   do {
+   int bx1 = (box-x1 + sx)  ~7;
+   int bx2 = (box-x2 + sx + 7)  ~7;
+@@ -8074,6 +8084,10 @@ sna_copy_plane(DrawablePtr src, Drawable
+   goto fallback;
+   }
+   }
++
++  if (!kgem_bo_can_blt(sna-kgem, arg.bo))
++  return false;
++  
+   RegionUninit(region);
+   return sna_do_copy(src, dst, gc,
+  src_x, src_y,
+@@ -11472,9 +11486,14 @@ sna_poly_fill_rect_tiled_8x8_blt(Drawabl
+   if (tile_bo-tiling)
+   return false;
+ 
++  if (!kgem_bo_can_blt(sna-kgem, bo) ||
++!kgem_bo_can_blt(sna-kgem, tile_bo))
++return false;
++
+   assert(tile_bo-pitch == 8 * drawable-bitsPerPixel  3);
+ 
+   kgem_set_mode(sna-kgem, KGEM_BLT, bo);
++  assert(kgem_bo_can_blt(sna-kgem, bo));
+   if 

xserver-xorg-video-intel: Changes to 'ubuntu-trusty'

[Timo Aaltonen]

 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'

[Maarten Bernardus Lankhorst]

 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-utopic'

[Maarten Bernardus Lankhorst]

 debian/changelog |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit b5ec5aebd5152bfb4c77a054123e60f149617e3f
Author: Maarten Lankhorst maarten.lankho...@ubuntu.com
Date:   Tue Jan 13 17:17:04 2015 +0100

release to utopic

diff --git a/debian/changelog b/debian/changelog
index d16c845..680ee24 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xserver-xorg-video-intel (2:2.99.914-1~exp1ubuntu4.2) UNRELEASED; 
urgency=medium
+xserver-xorg-video-intel (2:2.99.914-1~exp1ubuntu4.2) utopic-proposed; 
urgency=medium
 
   [ Timo Aaltonen ]
   * Added patches:
@@ -11,7 +11,7 @@ xserver-xorg-video-intel (2:2.99.914-1~exp1ubuntu4.2) 
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 10:53:54 +0200
+ -- Maarten Lankhorst maarten.lankho...@ubuntu.com  Tue, 13 Jan 2015 
17:16:49 +0100
 
 xserver-xorg-video-intel (2:2.99.914-1~exp1ubuntu4.1) utopic-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/e1yb4c6-0006ab...@moszumanska.debian.org

xserver-xorg-video-intel: Changes to 'ubuntu'

[Timo Aaltonen]

 NEWS|   45 
 configure.ac|  113 +-
 debian/changelog|   27 
 debian/copyright|  360 +-
 debian/patches/fix-uxa-fglrx-stealing.diff  |  646 ---
 debian/patches/series   |4 
 debian/patches/sna-freescreen.diff  |   19 
 debian/patches/sna-use-vmask-in-3dstate-ps.diff |   65 -
 debian/source/format|1 
 debian/upstream.changelog   | 1088 +++
 debian/xserver-xorg-video-intel.maintscript |1 
 man/intel.man   |   11 
 src/backlight.c |   75 +
 src/backlight.h |4 
 src/compat-api.h|   32 
 src/fd.c|   24 
 src/fd.h|1 
 src/i915_pciids.h   |   17 
 src/intel_device.c  |  152 ++
 src/intel_driver.h  |   25 
 src/intel_module.c  |   61 -
 src/legacy/i810/i810_driver.c   |4 
 src/render_program/Makefile.am  |   11 
 src/render_program/exa_wm_src_affine.g8a|1 
 src/render_program/exa_wm_src_sample_argb.g8a   |1 
 src/render_program/exa_wm_src_sample_planar.g8a |1 
 src/render_program/exa_wm_write.g8a |1 
 src/render_program/exa_wm_yuv_rgb.g8a   |  105 +
 src/render_program/exa_wm_yuv_rgb.g8b   |   21 
 src/sna/Makefile.am |1 
 src/sna/brw/brw_eu.c|4 
 src/sna/brw/brw_eu.h|2 
 src/sna/brw/brw_test_gen4.c |   12 
 src/sna/brw/brw_test_gen5.c |   14 
 src/sna/brw/brw_test_gen6.c |6 
 src/sna/brw/brw_test_gen7.c |2 
 src/sna/brw/brw_wm.c|4 
 src/sna/fb/fbpict.c |   12 
 src/sna/gen2_render.c   |4 
 src/sna/gen3_render.c   |4 
 src/sna/gen4_render.c   |6 
 src/sna/gen4_vertex.c   |8 
 src/sna/gen5_render.c   |8 
 src/sna/gen6_render.c   |  139 +-
 src/sna/gen7_render.c   |   22 
 src/sna/gen8_eu.c   |   32 
 src/sna/gen8_render.c   |   88 -
 src/sna/gen8_render.h   |   30 
 src/sna/kgem.c  | 1047 ---
 src/sna/kgem.h  |   75 +
 src/sna/sna.h   |   31 
 src/sna/sna_accel.c |  773 --
 src/sna/sna_blt.c   |  149 +-
 src/sna/sna_composite.c |   35 
 src/sna/sna_cpuid.h |4 
 src/sna/sna_damage.h|   56 -
 src/sna/sna_display.c   | 1262 --
 src/sna/sna_display_fake.c  |7 
 src/sna/sna_dri2.c  |  487 
 src/sna/sna_dri3.c  |2 
 src/sna/sna_driver.c|  155 +-
 src/sna/sna_glyphs.c|   36 
 src/sna/sna_io.c|   67 -
 src/sna/sna_present.c   |   29 
 src/sna/sna_render.c|  116 +-
 src/sna/sna_render.h|8 
 src/sna/sna_render_inline.h |   29 
 src/sna/sna_transform.c |8 
 src/sna/sna_trapezoids.c|   21 
 src/sna/sna_trapezoids.h|   74 +
 src/sna/sna_trapezoids_boxes.c  |   45 
 src/sna/sna_trapezoids_imprecise.c  |  783 ++
 src/sna/sna_trapezoids_mono.c   |  209 +++
 src/sna/sna_trapezoids_precise.c|  879 ++-
 src/sna/sna_video.c |   41 
 src/sna/sna_video.h |1 
 src/sna/sna_video_hwmc.c|2 
 src/sna/sna_video_overlay.c |   50 
 src/sna/sna_video_sprite.c  |   51 
 src/sna/sna_video_textured.c|   56 -
 src/sna/xassert.h   |   42 
 src/uxa/Makefile.am |   14 
 src/uxa/i830_3d.c   |1 
 src/uxa/i830_render.c   |   83 -
 src/uxa/i915_3d.c   |1 

xserver-xorg-video-intel: Changes to 'ubuntu-utopic'

[Timo Aaltonen]

 debian/changelog |8 +
 debian/patches/disable-dri3.diff |   30 
 debian/patches/series|2 +
 debian/patches/sna-fix-gen8-blt.diff |   51 +++
 4 files changed, 91 insertions(+)

New commits:
commit 7ed9494b2649bd24e93e7adc91040bd7f2fe2737
Author: Timo Aaltonen tjaal...@debian.org
Date:   Fri Dec 12 11:14:33 2014 +0200

release to utopic

diff --git a/debian/changelog b/debian/changelog
index 804a8d1..ba34487 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xserver-xorg-video-intel (2:2.99.914-1~exp1ubuntu4.2) UNRELEASED; 
urgency=medium
+xserver-xorg-video-intel (2:2.99.914-1~exp1ubuntu4.2) utopic-proposed; 
urgency=medium
 
   * Added patches:
 - disable-dri3.diff: Disable DRI3. (LP: #1401784)

commit f1c06d9451a765980f8a8b65c8acbca5fdf67fcd
Author: Timo Aaltonen tjaal...@debian.org
Date:   Fri Dec 12 11:02:16 2014 +0200

added patches

diff --git a/debian/changelog b/debian/changelog
index e89c63b..804a8d1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+xserver-xorg-video-intel (2:2.99.914-1~exp1ubuntu4.2) UNRELEASED; 
urgency=medium
+
+  * Added patches:
+- disable-dri3.diff: Disable DRI3. (LP: #1401784)
+- sna-fix-gen8-blt.diff: Fix GEN8 BLT with 4bit address. (LP: #1401788)
+
+ -- Timo Aaltonen tjaal...@debian.org  Fri, 12 Dec 2014 10:53:54 +0200
+
 xserver-xorg-video-intel (2:2.99.914-1~exp1ubuntu4.1) utopic-proposed; 
urgency=medium
 
   * sna-use-vmask-in-3dstate-ps.diff: Fix GPU hang on BDW with xvideo.
diff --git a/debian/patches/disable-dri3.diff b/debian/patches/disable-dri3.diff
new file mode 100644
index 000..ed0ff3f
--- /dev/null
+++ b/debian/patches/disable-dri3.diff
@@ -0,0 +1,30 @@
+commit b6eeb7a1f7efa591504070b606be655e27e6e9c2
+Author: Chris Wilson ch...@chris-wilson.co.uk
+Date:   Wed Nov 5 13:03:41 2014 +
+
+Disable DRI3 by default
+
+The external libraries, both in git, and especially shipping already
+enabled in distributions, are buggy and lead to server crashes and
+lockups. Caveat emptor.
+
+Signed-off-by: Chris Wilson ch...@chris-wilson.co.uk
+
+diff --git a/configure.ac b/configure.ac
+index 328b4e9..cbfc472 100644
+--- a/configure.ac
 b/configure.ac
+@@ -339,10 +339,10 @@ AC_ARG_ENABLE(dri2,
+ [DRI2=$enableval],
+ [DRI2=yes])
+ AC_ARG_ENABLE(dri3,
+-AS_HELP_STRING([--disable-dri3],
+-   [Disable DRI3 support [[default=yes]]]),
++AS_HELP_STRING([--enable-dri3],
++   [Enable DRI3 support [[default=no]]]),
+ [DRI3=$enableval],
+-[DRI3=yes])
++[DRI3=no])
+ 
+ AC_ARG_ENABLE(xvmc, AS_HELP_STRING([--disable-xvmc],
+   [Disable XvMC support [[default=yes]]]),
diff --git a/debian/patches/series b/debian/patches/series
index 7ca1bfe..e8f787e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,3 +6,5 @@ xmir.patch
 sna-freescreen.diff
 fix-uxa-fglrx-stealing.diff
 sna-use-vmask-in-3dstate-ps.diff
+disable-dri3.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  

xserver-xorg-video-intel: Changes to 'ubuntu-trusty'

[Timo Aaltonen]

 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'

[Maarten Bernardus Lankhorst]

 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-utopic'

[Timo Aaltonen]

New branch 'ubuntu-utopic' available with the following commits:
commit 548906e51ab912fbaeb50fc46d1c1b6bd5f03870
Author: Timo Aaltonen tjaal...@debian.org
Date:   Thu Nov 6 13:58:01 2014 +0200

upload to utopic-proposed


-- 
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/e1xmlln-0003kc...@moszumanska.debian.org

xserver-xorg-video-intel: Changes to 'ubuntu'

[Timo Aaltonen]

 debian/changelog|   13 
 debian/patches/series   |1 
 debian/patches/sna-use-vmask-in-3dstate-ps.diff |   65 
 3 files changed, 79 insertions(+)

New commits:
commit 7b7dc43de826fd4d18b87d3783bf4393ddd082d4
Author: Timo Aaltonen tjaal...@debian.org
Date:   Thu Nov 6 13:44:35 2014 +0200

Actually add the previous patch to series this time.

diff --git a/debian/changelog b/debian/changelog
index 347c13d..149e5eb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-video-intel (2:2.99.914-1~exp1ubuntu6) vivid; urgency=medium
+
+  * Actually add the previous patch to series this time.
+
+ -- Timo Aaltonen tjaal...@debian.org  Thu, 06 Nov 2014 13:41:47 +0200
+
 xserver-xorg-video-intel (2:2.99.914-1~exp1ubuntu5) vivid; urgency=medium
 
   * sna-use-vmask-in-3dstate-ps.diff: Fix GPU hang on BDW with xvideo.
diff --git a/debian/patches/series b/debian/patches/series
index 744dbdc..7ca1bfe 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,3 +5,4 @@ dri3-flush-broken.patch
 xmir.patch
 sna-freescreen.diff
 fix-uxa-fglrx-stealing.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 |
+ wm_kernels[kernel].num_surfaces  
PS_BINDING_TABLE_ENTRY_COUNT_SHIFT);
+   OUT_BATCH64(0); /* scratch address */
+   OUT_BATCH(PS_MAX_THREADS |

commit 7d786e18e6ba5ebdcde2344c09f219acb14a03e2
Author: Timo Aaltonen tjaal...@debian.org
Date:   Thu Nov 6 13:40:43 2014 +0200

xserver-xorg-video-intel: Changes to 'ubuntu-trusty'

[Timo Aaltonen]

 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'

[Maarten Bernardus Lankhorst]

 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'

[Maarten Bernardus Lankhorst]

 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'

[Timo Aaltonen]

 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'

[Maarten Bernardus Lankhorst]

 debian/changelog   |7 
 debian/patches/fix-uxa-fglrx-stealing.diff |  646 +
 debian/patches/series  |1 
 3 files changed, 654 insertions(+)

New commits:
commit 5bc2799b0a69dde7bb7dbcddd9e021f9243de30b
Author: Maarten Lankhorst maarten.lankho...@canonical.com
Date:   Thu Oct 9 09:39:41 2014 +0200

release to utopic

diff --git a/debian/changelog b/debian/changelog
index 084e18f..3450e89 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
-xserver-xorg-video-intel (2:2.99.914-1~exp1ubuntu4) UNRELEASED; urgency=medium
+xserver-xorg-video-intel (2:2.99.914-1~exp1ubuntu4) utopic; urgency=medium
 
   * Fix a crash when fglrx steals the screen in DGPU or IGPU mode.
 - fix-uxa-fglrx-stealing.diff
 
- -- Maarten Lankhorst maarten.lankho...@ubuntu.com  Wed, 08 Oct 2014 
15:46:38 +0200
+ -- Maarten Lankhorst maarten.lankho...@ubuntu.com  Thu, 09 Oct 2014 
09:39:17 +0200
 
 xserver-xorg-video-intel (2:2.99.914-1~exp1ubuntu3) utopic; urgency=medium
 

commit 6d4c2abfe9783cfec19e9282d6420a541527a24d
Author: Maarten Lankhorst maarten.lankho...@canonical.com
Date:   Wed Oct 8 15:48:20 2014 +0200

Fix a crash when fglrx steals the screen in DGPU or IGPU mode.

add fix-uxa-fglrx-stealing.diff

diff --git a/debian/changelog b/debian/changelog
index dc2fe67..084e18f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xserver-xorg-video-intel (2:2.99.914-1~exp1ubuntu4) UNRELEASED; urgency=medium
+
+  * Fix a crash when fglrx steals the screen in DGPU or IGPU mode.
+- fix-uxa-fglrx-stealing.diff
+
+ -- Maarten Lankhorst maarten.lankho...@ubuntu.com  Wed, 08 Oct 2014 
15:46:38 +0200
+
 xserver-xorg-video-intel (2:2.99.914-1~exp1ubuntu3) utopic; urgency=medium
 
   * Add patch to enable SNA with fglrx. (LP: #1359105)
diff --git a/debian/patches/fix-uxa-fglrx-stealing.diff 
b/debian/patches/fix-uxa-fglrx-stealing.diff
new file mode 100644
index 000..f67a1e4
--- /dev/null
+++ b/debian/patches/fix-uxa-fglrx-stealing.diff
@@ -0,0 +1,646 @@
+commit c139e2fb95f2db0b39aadcd58cc63b316a278951
+Author: Chris Wilson ch...@chris-wilson.co.uk
+Date:   Wed Oct 8 13:59:55 2014 +0100
+
+intel: Store pointer to struct intel_device
+
+Beware the barbarians at the gate, who invade and steal your ScrnInfoPtr
+and its Entity from underneath you. In some configurations, we lose
+access to the struct intel_device stored on the Entity after
+initialisation, causing havoc. Workaround this by storing the
+intel_device that we open in our driverPrivate.
+
+Signed-off-by: Chris Wilson ch...@chris-wilson.co.uk
+
+--- a/src/intel_device.c
 b/src/intel_device.c
+@@ -65,9 +65,11 @@
+ #include fd.h
+ 
+ struct intel_device {
++  int idx;
+   char *master_node;
+   char *render_node;
+   int fd;
++  int device_id;
+   int open_count;
+   int master_count;
+ };
+@@ -97,7 +99,7 @@
+   if (dev == NULL)
+   return 0;
+ 
+-  return __intel_get_device_id(dev-fd);
++  return dev-device_id;
+ }
+ 
+ static inline struct intel_device *intel_device(ScrnInfoPtr scrn)
+@@ -108,11 +110,6 @@
+   return xf86GetEntityPrivate(scrn-entityList[0], intel_device_key)-ptr;
+ }
+ 
+-static inline void intel_set_device(ScrnInfoPtr scrn, struct intel_device 
*dev)
+-{
+-  xf86GetEntityPrivate(scrn-entityList[0], intel_device_key)-ptr = dev;
+-}
+-
+ static int is_i915_device(int fd)
+ {
+   drm_version_t version;
+@@ -511,6 +508,12 @@
+   if (geteuid()  is_master(fd))
+   master_count++;
+ 
++  if (pci)
++  dev-device_id = pci-device_id;
++  else
++  dev-device_id = __intel_get_device_id(fd);
++
++  dev-idx = entity_num;
+   dev-fd = fd;
+   dev-open_count = master_count;
+   dev-master_count = master_count;
+@@ -541,13 +544,15 @@
+   return dev-fd;
+ }
+ 
+-int intel_get_device(ScrnInfoPtr scrn)
++struct intel_device *intel_get_device(ScrnInfoPtr scrn, int *fd)
+ {
+   struct intel_device *dev;
+   int ret;
+ 
+   dev = intel_device(scrn);
+-  assert(dev  dev-fd != -1);
++  if (dev == NULL)
++  return NULL;
++  assert(dev-fd != -1);
+ 
+   if (dev-open_count++ == 0) {
+   drmSetVersion sv;
+@@ -575,16 +580,16 @@
+  [drm] failed to set drm interface version: 
%s [%d].\n,
+  strerror(errno), errno);
+   dev-open_count--;
+-  return -1;
++  return NULL;
+   }
+   }
+ 
+-  return dev-fd;
++  *fd = dev-fd;
++  return dev;
+ }
+ 
+-const char *intel_get_client_name(ScrnInfoPtr scrn)
++const char *intel_get_client_name(struct intel_device *dev)
+ {
+-  struct intel_device *dev = intel_device(scrn);
+   assert(dev  dev-render_node);
+   return dev-render_node;
+ }
+@@ 

xserver-xorg-video-intel: Changes to 'ubuntu'

[Maarten Bernardus Lankhorst]

 debian/changelog |6 ++
 1 file changed, 6 insertions(+)

New commits:
commit d441084d5b6108c31ccd8723c45b2513c5ba9fbd
Author: Maarten Lankhorst maarten.lankho...@canonical.com
Date:   Wed Sep 10 16:56:05 2014 +0200

Rebuild for xorg 1.16 abi.

diff --git a/debian/changelog b/debian/changelog
index 4c0df5c..bdadd00 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-video-intel (2:2.99.914-1~exp1ubuntu2) utopic; urgency=medium
+
+  * Rebuild for xorg 1.16 abi.
+
+ -- Maarten Lankhorst maarten.lankho...@ubuntu.com  Wed, 10 Sep 2014 
16:55:48 +0200
+
 xserver-xorg-video-intel (2:2.99.914-1~exp1ubuntu1) utopic; urgency=medium
 
   * Merge from released experimental.


-- 
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/e1xvzhe-00069j...@moszumanska.debian.org

xserver-xorg-video-intel: Changes to 'ubuntu-trusty'

[Maarten Bernardus Lankhorst]

 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'

[Maarten Bernardus Lankhorst]

 debian/changelog   |6 ++
 debian/patches/series  |1 +
 debian/patches/sna-freescreen.diff |   19 +++
 3 files changed, 26 insertions(+)

New commits:
commit 1d46b5e060c9b3cf232267514c8a2b30141cab4b
Author: Maarten Lankhorst maarten.lankho...@canonical.com
Date:   Mon Sep 22 15:29:40 2014 +0200

Add patch to enable SNA with fglrx. (LP: #1359105)

diff --git a/debian/changelog b/debian/changelog
index bdadd00..dc2fe67 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-video-intel (2:2.99.914-1~exp1ubuntu3) utopic; urgency=medium
+
+  * Add patch to enable SNA with fglrx. (LP: #1359105)
+
+ -- Maarten Lankhorst maarten.lankho...@ubuntu.com  Mon, 22 Sep 2014 
15:29:05 +0200
+
 xserver-xorg-video-intel (2:2.99.914-1~exp1ubuntu2) utopic; urgency=medium
 
   * Rebuild for xorg 1.16 abi.
diff --git a/debian/patches/series b/debian/patches/series
index 8582ca8..1786fa5 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,4 @@ dri3-flush-broken.patch
 # XMir series
 
 xmir.patch
+sna-freescreen.diff
diff --git a/debian/patches/sna-freescreen.diff 
b/debian/patches/sna-freescreen.diff
new file mode 100644
index 000..d9a2603
--- /dev/null
+++ b/debian/patches/sna-freescreen.diff
@@ -0,0 +1,19 @@
+commit f5469681b620d9d6ccaf53e92ed31f931cb03b0d
+Author: Chris Wilson ch...@chris-wilson.co.uk
+Date:   Mon Aug 18 14:37:44 2014 +0100
+
+sna: Be defensive during FreeScreen()
+
+Signed-off-by: Chris Wilson ch...@chris-wilson.co.uk
+
+--- a/src/sna/sna_driver.c
 b/src/sna/sna_driver.c
+@@ -1190,7 +1190,7 @@
+   struct sna *sna = to_sna(scrn);
+ 
+   DBG((%s\n, __FUNCTION__));
+-  if ((uintptr_t)sna  1)
++  if (sna == NULL || (uintptr_t)sna  3) /* beware thieves */
+   return;
+ 
+   scrn-driverPrivate = (void *)((uintptr_t)sna-info | (sna-flags  
SNA_IS_SLAVED) | 2);


-- 
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/e1xw3kw-0007ff...@moszumanska.debian.org

xserver-xorg-video-intel: Changes to 'ubuntu-trusty'

[Maarten Bernardus Lankhorst]

 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'

[Maarten Bernardus Lankhorst]

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

xserver-xorg-video-intel: Changes to 'ubuntu'

[Christopher Halse Rogers]

 debian/patches/xmir.patch |  151 +-
 1 file changed, 59 insertions(+), 92 deletions(-)

New commits:
commit 600a5b158e147fe5e1f4ebf4721081eadf7906cb
Author: Christopher James Halse Rogers r...@ubuntu.com
Date:   Fri Jul 18 18:28:25 2014 +1000

Refresh XMir patch harder.

And by “refresh”, I of course mean “take the patch form 
~ickle/xf86-video-intel”
that is usefully kept rebased on master

diff --git a/debian/patches/xmir.patch b/debian/patches/xmir.patch
index 5cd4c97..f9ecb5a 100644
--- a/debian/patches/xmir.patch
+++ b/debian/patches/xmir.patch
@@ -1,14 +1,14 @@
-commit 67c072065118115112d06e77c43b6ac225dbcf56
+commit 80db93ed6b05fade9e0c7a581cc2b503f66d2416
 Author: Chris Wilson ch...@chris-wilson.co.uk
 Date:   Wed Jul 24 01:44:30 2013 +0100
 
-sna: Preliminary patch for XMir
-
-For the intrepid explorer, who is desperate to encounter all the bugs we
-fixed long ago. /o\
+sna: Add XMir support
 
 With lots of updates by Christopher James Halse Rogers as he updated the
-XMir API.
+XMir API - but now supposedly frozen!
+
+RAOF ickle: I think the xmir api should be pretty much stable now,
+barring people coming up with more awesome ways of doing things.
 
 Signed-off-by: Christopher James Halse Rogers r...@ubuntu.com
 Signed-off-by: Chris Wilson ch...@chris-wilson.co.uk
@@ -25,43 +25,30 @@ Date:   Wed Jul 24 01:44:30 2013 +0100
  
 --- a/src/intel_device.c
 +++ b/src/intel_device.c
-@@ -276,6 +276,25 @@
+@@ -162,10 +162,23 @@
+   return ret;
  }
- #endif
  
 +static int __intel_open_xmir(const struct pci_device *pci)
 +{
-+  int fd = -1;
-+#if XMIR
 +  char id[20];
 +
-+  if (!xorgMir)
-+  return -1;
-+
 +  snprintf(id, sizeof(id),
 +   pci:%04x:%02x:%02x.%d,
 +   pci-domain, pci-bus, pci-dev, pci-func);
-+  fd = xmir_get_drm_fd(id);
-+  if (fd == -1)
-+  return -1;
-+#endif
-+
-+  return fd;
++  return xmir_get_drm_fd(id);
 +}
++
+ static int __intel_open_device(const struct pci_device *pci, const char *path)
+ {
+   int fd;
  
- #if defined(ODEV_ATTRIB_FD)
- static int get_fd(struct xf86_platform_device *dev)
-@@ -328,7 +347,9 @@
-   master_count = 1; /* DRM_MASTER is managed by Xserver */
-   fd = get_fd(platform);
-   if (fd == -1) {
--  fd = __intel_open_device(pci, path);
-+  fd = __intel_open_xmir(pci);
-+  if (fd == -1)
-+  fd = __intel_open_device(pci, path);
-   if (fd == -1)
-   goto err_path;
- 
++  if (xorgMir)
++  return __intel_open_xmir(pci);
++
+   if (path == NULL) {
+   char id[20];
+   int ret;
 --- a/src/intel_driver.h
 +++ b/src/intel_driver.h
 @@ -1,6 +1,8 @@
@@ -138,6 +125,36 @@ Date:   Wed Jul 24 01:44:30 2013 +0100
 +#endif
 +
  #endif /* _SNA_H */
+--- a/src/sna/sna_dri2.c
 b/src/sna/sna_dri2.c
+@@ -2873,6 +2873,13 @@
+ void sna_dri2_destroy_window(WindowPtr win) { }
+ #endif
+ 
++#if DRI2INFOREC_VERSION = 8  XMIR
++static int sna_dri_auth_magic2(ScreenPtr screen, uint32_t magic)
++{
++  return xmir_auth_drm_magic(to_sna_from_screen(screen)-xmir, magic);
++}
++#endif
++
+ static bool has_i830_dri(void)
+ {
+   return access(DRI_DRIVER_PATH /i830_dri.so, R_OK) == 0;
+@@ -3027,6 +3034,13 @@
+   info.ReuseBufferNotify = sna_dri2_reuse_buffer;
+ #endif
+ 
++#if DRI2INFOREC_VERSION = 8  XMIR
++  if (sna-xmir) {
++  info.version = 8;
++  info.AuthMagic2 = sna_dri_auth_magic2;
++  }
++#endif
++
+ #if USE_ASYNC_SWAP
+   info.version = 10;
+   info.scheduleSwap0 = 1;
 --- a/src/sna/sna_driver.c
 +++ b/src/sna/sna_driver.c
 @@ -548,6 +548,9 @@
@@ -150,7 +167,15 @@ Date:   Wed Jul 24 01:44:30 2013 +0100
/* Sanity check */
if (hosted()  (sna-flags  SNA_IS_HOSTED) == 0) {
xf86DrvMsg(scrn-scrnIndex, X_ERROR,
-@@ -592,9 +595,13 @@
+@@ -559,6 +562,7 @@
+   xf86DrvMsg(scrn-scrnIndex, X_PROBED, CPU: %s\n,
+  sna_cpu_features_to_string(sna-cpu_features, buf));
+ 
++  /* XXX query depth from host */
+   if (!xf86SetDepthBpp(scrn, 24, 0, 0,
+Support32bppFb |
+SupportConvert24to32 | PreferConvert24to32))
+@@ -592,6 +596,9 @@
  
sna_setup_capabilities(scrn, fd);
  
@@ -160,10 +185,6 @@ Date:   Wed Jul 24 01:44:30 2013 +0100
kgem_init(sna-kgem, fd,
  xf86GetPciInfoForEntity(pEnt-index),
  sna-info-gen);
-+
-   if (xf86ReturnOptValBool(sna-Options, OPTION_ACCEL_DISABLE, FALSE) ||
-   !sna_option_cast_to_bool(sna, OPTION_ACCEL_METHOD, TRUE)) {
-   xf86DrvMsg(sna-scrn-scrnIndex, X_CONFIG,
 @@ -710,6 +717,8 @@
  
if (*tv == NULL || ((*tv)-tv_usec | (*tv)-tv_sec) || has_shadow(sna))
@@ -184,7 +205,7 @@ Date:   

xserver-xorg-video-intel: Changes to 'ubuntu'

[Maarten Lankhorst]

 debian/patches/xmir.patch |   32 +++-
 1 file changed, 11 insertions(+), 21 deletions(-)

New commits:
commit 1195fe754edf459ca8c267aa7a946c39c20c9941
Author: Maarten Lankhorst maarten.lankho...@canonical.com
Date:   Thu Jul 17 10:02:56 2014 +0200

refresh xmir patch a second time

diff --git a/debian/patches/xmir.patch b/debian/patches/xmir.patch
index c709253..b2c334c 100644
--- a/debian/patches/xmir.patch
+++ b/debian/patches/xmir.patch
@@ -373,11 +373,9 @@ Date:   Wed Jul 24 01:44:30 2013 +0100
 +}
 +
 +#endif
-diff --git a/src/sna/sna_dri2.c b/src/sna/sna_dri2.c
-index 1baaf2b..e053dcc 100644
 --- a/src/sna/sna_dri2.c
 +++ b/src/sna/sna_dri2.c
-@@ -791,6 +791,7 @@ static void sna_dri2_select_mode(struct sna *sna, struct 
kgem_bo *dst, struct kg
+@@ -791,6 +791,7 @@
if (busy.busy  (1  17))
mode = KGEM_BLT;
kgem_bo_mark_busy(busy.handle == src-handle ? src : dst, mode);
@@ -385,28 +383,20 @@ index 1baaf2b..e053dcc 100644
_kgem_set_mode(sna-kgem, mode);
  }
  
-@@ -1351,16 +1352,16 @@ can_flip(struct sna * sna,
-   if (draw-type == DRAWABLE_PIXMAP)
+@@ -1356,6 +1357,12 @@
return false;
+   }
  
--  if (!sna-scrn-vtSema) {
--  DBG((%s: no, not attached to VT\n, __FUNCTION__));
 +  if ((sna-flags  SNA_IS_HOSTED) == 0) {
 +  DBG((%s: no, not hosted\n, __FUNCTION__));
++  return false;
++  }
++
++
+   if ((sna-flags  (SNA_HAS_FLIP | SNA_HAS_ASYNC_FLIP)) == 0) {
+   DBG((%s: no, pageflips disabled\n, __FUNCTION__));
return false;
-   }
- 
--  if ((sna-flags  (SNA_HAS_FLIP | SNA_HAS_ASYNC_FLIP)) == 0) {
--  DBG((%s: no, pageflips disabled\n, __FUNCTION__));
-+  if (!sna-scrn-vtSema) {
-+  DBG((%s: no, not attached to VT\n, __FUNCTION__));
-   return false;
-   }
- 
-   if (front-format != back-format) {
-   DBG((%s: no, format mismatch, front = %d, back = %d\n,
-__FUNCTION__, front-format, back-format));
-@@ -2966,6 +2977,13 @@ static const char *dri_driver_name(struct sna *sna)
+@@ -2966,6 +2973,13 @@
return s;
  }
  
@@ -420,7 +410,7 @@ index 1baaf2b..e053dcc 100644
  bool sna_dri2_open(struct sna *sna, ScreenPtr screen)
  {
DRI2InfoRec info;
-@@ -3027,6 +3045,13 @@ bool sna_dri2_open(struct sna *sna, ScreenPtr screen)
+@@ -3027,6 +3041,13 @@
info.ReuseBufferNotify = sna_dri2_reuse_buffer;
  #endif
  


-- 
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/e1x7geh-0006gv...@moszumanska.debian.org

xserver-xorg-video-intel: Changes to 'ubuntu'

[Maarten Lankhorst]

 debian/patches/xmir.patch |   12 +---
 1 file changed, 5 insertions(+), 7 deletions(-)

New commits:
commit a10095fc97234e859041c32f0351d21c648e2fcc
Author: Maarten Lankhorst maarten.lankho...@canonical.com
Date:   Thu Jul 17 10:47:50 2014 +0200

and a third time, still broken with glxgears

diff --git a/debian/patches/xmir.patch b/debian/patches/xmir.patch
index b2c334c..5cd4c97 100644
--- a/debian/patches/xmir.patch
+++ b/debian/patches/xmir.patch
@@ -25,7 +25,7 @@ Date:   Wed Jul 24 01:44:30 2013 +0100
  
 --- a/src/intel_device.c
 +++ b/src/intel_device.c
-@@ -276,6 +276,27 @@
+@@ -276,6 +276,25 @@
  }
  #endif
  
@@ -35,17 +35,15 @@ Date:   Wed Jul 24 01:44:30 2013 +0100
 +#if XMIR
 +  char id[20];
 +
++  if (!xorgMir)
++  return -1;
++
 +  snprintf(id, sizeof(id),
 +   pci:%04x:%02x:%02x.%d,
 +   pci-domain, pci-bus, pci-dev, pci-func);
 +  fd = xmir_get_drm_fd(id);
 +  if (fd == -1)
 +  return -1;
-+
-+  if (*path == NULL) /* XXX Fix Xmir - it knows both the fd and path */
-+  *path = drmGetDeviceNameFromFd(fd);
-+  if (*path == NULL)
-+  fd = -1;
 +#endif
 +
 +  return fd;
@@ -53,7 +51,7 @@ Date:   Wed Jul 24 01:44:30 2013 +0100
  
  #if defined(ODEV_ATTRIB_FD)
  static int get_fd(struct xf86_platform_device *dev)
-@@ -328,7 +349,9 @@
+@@ -328,7 +347,9 @@
master_count = 1; /* DRM_MASTER is managed by Xserver */
fd = get_fd(platform);
if (fd == -1) {


-- 
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/e1x7hm9-0007na...@moszumanska.debian.org

xserver-xorg-video-intel: Changes to 'ubuntu'

[Maarten Lankhorst]

 Makefile.am |6 
 NEWS|  106 
 configure.ac|  226 
 debian/changelog|   37 
 debian/control  |   12 
 debian/patches/xmir.patch   |  411 
 debian/upstream.changelog   | 6765 
 debian/xserver-xorg-video-intel.install |3 
 man/intel.man   |   13 
 src/Makefile.am |8 
 src/backlight.c |  492 +
 src/backlight.h |   56 
 src/compat-api.h|1 
 src/fd.c|   69 
 src/fd.h|   33 
 src/i915_pciids.h   |   32 
 src/intel_device.c  |  267 
 src/intel_driver.h  |4 
 src/intel_module.c  |   12 
 src/intel_options.c |2 
 src/intel_options.h |2 
 src/legacy/i810/Makefile.am |3 
 src/sna/Makefile.am |   16 
 src/sna/fb/fbpointbits.h|   23 
 src/sna/gen2_render.c   |   65 
 src/sna/gen3_render.c   |   22 
 src/sna/gen4_render.c   |   24 
 src/sna/gen5_render.c   |   49 
 src/sna/gen6_common.h   |   21 
 src/sna/gen6_render.c   |   60 
 src/sna/gen7_render.c   |   40 
 src/sna/gen8_render.c   |   66 
 src/sna/kgem.c  |  670 +
 src/sna/kgem.h  |   41 
 src/sna/sna.h   |  247 
 src/sna/sna_accel.c | 1344 +--
 src/sna/sna_blt.c   |  453 -
 src/sna/sna_composite.c |   85 
 src/sna/sna_cpu.c   |4 
 src/sna/sna_cpuid.h |4 
 src/sna/sna_damage.c|   42 
 src/sna/sna_damage.h|   20 
 src/sna/sna_display.c   | 3727 ++--
 src/sna/sna_display_fake.c  |   92 
 src/sna/sna_dri.c   | 2534 -
 src/sna/sna_dri2.c  | 3042 +++
 src/sna/sna_dri3.c  |  379 
 src/sna/sna_driver.c|  273 
 src/sna/sna_glyphs.c|  387 
 src/sna/sna_io.c|   43 
 src/sna/sna_present.c   |  465 +
 src/sna/sna_reg.h   |1 
 src/sna/sna_render.c|   34 
 src/sna/sna_render.h|8 
 src/sna/sna_render_inline.h |   28 
 src/sna/sna_threads.c   |  154 
 src/sna/sna_tiling.c|   76 
 src/sna/sna_transform.c |   57 
 src/sna/sna_trapezoids.c|   84 
 src/sna/sna_trapezoids_boxes.c  |  257 
 src/sna/sna_trapezoids_imprecise.c  |   86 
 src/sna/sna_trapezoids_mono.c   |7 
 src/sna/sna_trapezoids_precise.c|   86 
 src/sna/sna_video.c |   51 
 src/sna/sna_video.h |   18 
 src/sna/sna_video_overlay.c |   22 
 src/sna/sna_video_sprite.c  |  316 
 src/sna/sna_video_textured.c|   20 
 src/uxa/Makefile.am |   13 
 src/uxa/i830_reg.h  |   12 
 src/uxa/intel.h |   82 
 src/uxa/intel_batchbuffer.c |   16 
 src/uxa/intel_batchbuffer.h |8 
 src/uxa/intel_display.c |  683 +
 src/uxa/intel_dri.c |  215 
 src/uxa/intel_dri3.c|  140 
 

xserver-xorg-video-intel: Changes to 'ubuntu'

[Timo Aaltonen]

 NEWS  |   25 
 configure.ac  |2 
 debian/changelog  |   18 +-
 src/sna/gen4_render.c |   13 +-
 src/sna/gen4_render.h |2 
 src/sna/gen5_render.c |6 
 src/sna/gen6_render.c |   11 +
 src/sna/gen7_render.c |2 
 src/sna/gen8_render.c |2 
 src/sna/kgem.c|   14 +-
 src/sna/kgem.h|   10 +
 src/sna/sna_accel.c   |  301 ++
 src/sna/sna_glyphs.c  |3 
 src/uxa/intel_video.c |3 
 14 files changed, 265 insertions(+), 147 deletions(-)

New commits:
commit 9963cb51bb91c8b34cf1cdc0284df2d9348683d7
Author: Timo Aaltonen tjaal...@ubuntu.com
Date:   Mon Feb 10 14:10:05 2014 +0200

release to trusty

diff --git a/debian/changelog b/debian/changelog
index babc807..7ea3f45 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-video-intel (2:2.99.910-0ubuntu1) trusty; urgency=medium
+
+  * Merge from Debian git. (LP: #1277143)
+
+ -- Timo Aaltonen tjaal...@ubuntu.com  Mon, 10 Feb 2014 14:03:01 +0200
+
 xserver-xorg-video-intel (2:2.99.910-1) UNRELEASED; urgency=low
 
   * New upstream prerelease.

commit 233062bd373f018cae63c4439bec879c27201732
Author: Timo Aaltonen tjaal...@ubuntu.com
Date:   Mon Feb 10 12:10:31 2014 +0200

bump the version

diff --git a/debian/changelog b/debian/changelog
index 9e4af6a..d3d5841 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xserver-xorg-video-intel (2:2.99.909-1) UNRELEASED; urgency=low
+xserver-xorg-video-intel (2:2.99.910-1) UNRELEASED; urgency=low
 
   * New upstream prerelease.
 

commit 2fb2cd092dadba40b5ad2da57943c660a0c9bc14
Author: Chris Wilson ch...@chris-wilson.co.uk
Date:   Mon Feb 10 09:35:11 2014 +

2.99.910 snapshot

diff --git a/NEWS b/NEWS
index 63655d3..5700d34 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,28 @@
+Snapshot 2.99.910 (2013-02-10)
+==
+Another latent bug exposed by recent changes merit another snapshot for
+final testing.
+
+  * Only discard damage when overwriting the dirty CPU bo, instead
+of discarding damage that will be shown!
+
+  * Reset operation state when switching between glyph caches.
+https://bugs.freedesktop.org/show_bug.cgi?id=74494
+
+  * Fully reinitialise pixmaps allocated from the freed cache. Fixes
+a potential issue (crash or misrendering) when using some compositors.
+https://bugs.freedesktop.org/show_bug.cgi?id=74550
+
+  * Do not expose the TexturedVideo adaptor in UXA when it is disabled
+either due to a hung GPU or explicitly disabled by the user.
+
+  * Restore the pipe stall when changing CC state on gen6, otherwise
+the GPU may not flush intermediate results from all EU resulting
+in render corruption (usually the occasional black box).
+Regression from 2.99.906
+https://bugs.freedesktop.org/show_bug.cgi?id=7237
+
+
 Snapshot 2.99.909 (2013-02-01)
 ==
 Pass the brown paper bag. Ridiculously stupid bug in last minute coding.
diff --git a/configure.ac b/configure.ac
index f7a6d32..a3114af 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@
 # Initialize Autoconf
 AC_PREREQ([2.60])
 AC_INIT([xf86-video-intel],
-[2.99.909],
+[2.99.910],
 [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
 [xf86-video-intel])
 AC_CONFIG_SRCDIR([Makefile.am])

commit 37d8566ee78c67647b159a96ddb2675d1506b967
Author: Chris Wilson ch...@chris-wilson.co.uk
Date:   Sun Feb 9 12:28:27 2014 +

sna/gen6: Restore stall dropped when not flushing instead

commit 82e6d41c2f4f343bd1854d3d8ee4b624b5d68971
Author: Chris Wilson ch...@chris-wilson.co.uk
Date:   Thu Oct 31 13:35:59 2013 +

sna/gen6: Tweak flush around CC state changes

Replaced the pipeline stall with a flush - but only when the target was
dirty. The missing stall however seems to be required as well.

v2: Actually emit the stall for all CC state changes [Ilia Mirkin]

Reported-by: Ilia Mirkin imir...@alum.mit.edu
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=72375
Signed-off-by: Chris Wilson ch...@chris-wilson.co.uk

diff --git a/src/sna/gen6_render.c b/src/sna/gen6_render.c
index aadc6f7..f36bf79 100644
--- a/src/sna/gen6_render.c
+++ b/src/sna/gen6_render.c
@@ -870,15 +870,16 @@ gen6_emit_state(struct sna *sna,
 
assert(op-dst.bo-exec);
 
-   need_flush =
-   gen6_emit_cc(sna, GEN6_BLEND(op-u.gen6.flags)) 
-   wm_binding_table  1;
+   need_stall = wm_binding_table  1;
+   need_flush = false;
+   if (gen6_emit_cc(sna, GEN6_BLEND(op-u.gen6.flags)))
+   need_flush = need_stall;
gen6_emit_sampler(sna, GEN6_SAMPLER(op-u.gen6.flags));
gen6_emit_sf(sna, GEN6_VERTEX(op-u.gen6.flags)  2);
gen6_emit_wm(sna, GEN6_KERNEL(op-u.gen6.flags), 
GEN6_VERTEX(op-u.gen6.flags)  2);
gen6_emit_vertex_elements(sna, op);
 
-   

xserver-xorg-video-intel: Changes to 'ubuntu'

[Maarten Lankhorst]

 debian/changelog |6 ++
 1 file changed, 6 insertions(+)

New commits:
commit c38825b00f409e5f4727069dde701438245d8baa
Author: Maarten Lankhorst d...@mblankhorst.nl
Date:   Wed Feb 5 14:12:46 2014 +

add changelog entry for rebuild

diff --git a/debian/changelog b/debian/changelog
index 8dc60ce..b02929f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,12 @@ xserver-xorg-video-intel (2:2.99.909-1) UNRELEASED; 
urgency=low
 
  -- Timo Aaltonen tjaal...@ubuntu.com  Tue, 01 Oct 2013 14:07:22 +0300
 
+xserver-xorg-video-intel (2:2.99.907-0ubuntu2) trusty; urgency=medium
+
+  * Rebuild for xorg 1.15 abi.
+
+ -- Maarten Lankhorst maarten.lankho...@ubuntu.com  Wed, 05 Feb 2014 
09:51:52 +
+
 xserver-xorg-video-intel (2:2.99.907-0ubuntu1) trusty; urgency=low
 
   [ Timo Aaltonen ]


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1wb3dk-0005mz...@moszumanska.debian.org

xserver-xorg-video-intel: Changes to 'ubuntu'

[Maarten Lankhorst]

 debian/changelog |5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit a27403b093e95384cd45cca055c3b6b42c99d5ab
Author: Maarten Lankhorst d...@mblankhorst.nl
Date:   Wed Feb 5 14:16:02 2014 +

release to trusty

diff --git a/debian/changelog b/debian/changelog
index b02929f..1160791 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,9 @@
-xserver-xorg-video-intel (2:2.99.909-0ubuntu1) UNRELEASED; urgency=medium
+xserver-xorg-video-intel (2:2.99.909-0ubuntu1) trusty; urgency=medium
 
+  [ Timo Aaltonen ]
   * Merge from Debian git. (LP: #1272338)
 
- -- Timo Aaltonen tjaal...@ubuntu.com  Sun, 02 Feb 2014 09:12:25 +0200
+ -- Maarten Lankhorst maarten.lankho...@ubuntu.com  Wed, 05 Feb 2014 
14:14:16 +
 
 xserver-xorg-video-intel (2:2.99.909-1) UNRELEASED; urgency=low
 


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1wb3gp-0005ws...@moszumanska.debian.org

xserver-xorg-video-intel: Changes to 'ubuntu'

[Maarten Lankhorst]

 debian/changelog  |6 ++
 debian/patches/xmir.patch |   17 -
 2 files changed, 6 insertions(+), 17 deletions(-)

New commits:
commit 67368975c4395be906c96f8a73fda379072757f2
Author: Maarten Lankhorst d...@mblankhorst.nl
Date:   Wed Feb 5 14:33:09 2014 +

release to trusty

diff --git a/debian/changelog b/debian/changelog
index 5632ec2..64d2318 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,8 @@
-xserver-xorg-video-intel (2:2.99.909-0ubuntu2) UNRELEASED; urgency=medium
+xserver-xorg-video-intel (2:2.99.909-0ubuntu2) trusty; urgency=medium
 
   * Refresh xmir patch.
 
- -- Maarten Lankhorst maarten.lankho...@ubuntu.com  Wed, 05 Feb 2014 
14:31:48 +
+ -- Maarten Lankhorst maarten.lankho...@ubuntu.com  Wed, 05 Feb 2014 
14:33:04 +
 
 xserver-xorg-video-intel (2:2.99.909-0ubuntu1) trusty; urgency=medium
 

commit 11cd255f3ca7d87692da39f09c50776e8464678d
Author: Maarten Lankhorst d...@mblankhorst.nl
Date:   Wed Feb 5 14:32:55 2014 +

Refresh xmir patch.

diff --git a/debian/changelog b/debian/changelog
index 1160791..5632ec2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-video-intel (2:2.99.909-0ubuntu2) UNRELEASED; urgency=medium
+
+  * Refresh xmir patch.
+
+ -- Maarten Lankhorst maarten.lankho...@ubuntu.com  Wed, 05 Feb 2014 
14:31:48 +
+
 xserver-xorg-video-intel (2:2.99.909-0ubuntu1) trusty; urgency=medium
 
   [ Timo Aaltonen ]
diff --git a/debian/patches/xmir.patch b/debian/patches/xmir.patch
index af283b3..c772429 100644
--- a/debian/patches/xmir.patch
+++ b/debian/patches/xmir.patch
@@ -428,23 +428,6 @@ Date:   Wed Jul 24 01:44:30 2013 +0100
/* Sanity check */
if (hosted()  (sna-flags  SNA_IS_HOSTED) == 0) {
xf86DrvMsg(scrn-scrnIndex, X_ERROR,
-@@ -519,9 +522,14 @@ static Bool sna_pre_init(ScrnInfoPtr scr
-   goto cleanup;
-   }
- 
--  preferred_depth = sna-info-gen  030 ? 15 : 24;
--  if (!fb_supports_depth(fd, preferred_depth))
-+  if (sna-xmir) {
-+  /* XXX query depth from xmir */
-   preferred_depth = 24;
-+  } else {
-+  preferred_depth = sna-info-gen  030 ? 15 : 24;
-+  if (!fb_supports_depth(fd, preferred_depth))
-+  preferred_depth = 24;
-+  }
- 
-   if (!xf86SetDepthBpp(scrn, preferred_depth, 0, 0,
-Support32bppFb |
 @@ -558,9 +566,13 @@ static Bool sna_pre_init(ScrnInfoPtr scr
  
intel_detect_chipset(scrn, pEnt);


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1wb5ol-0006v9...@moszumanska.debian.org

xserver-xorg-video-intel: Changes to 'ubuntu'

[Timo Aaltonen]

 NEWS   |   73 +
 configure.ac   |   23 +
 debian/changelog   |   16 -
 src/intel_device.c |4 
 src/intel_module.c |8 
 src/sna/fb/fb.h|5 
 src/sna/fb/fbpush.c|2 
 src/sna/gen2_render.c  |   59 ++--
 src/sna/gen3_render.c  |   50 ++--
 src/sna/gen4_render.c  |  150 
 src/sna/gen4_vertex.c  |2 
 src/sna/gen5_render.c  |   22 +
 src/sna/gen6_render.c  |   24 +
 src/sna/gen7_render.c  |   24 +
 src/sna/gen8_render.c  |   24 +
 src/sna/gen8_vertex.c  |2 
 src/sna/kgem.c |  462 +++--
 src/sna/kgem.h |5 
 src/sna/sna.h  |   28 +-
 src/sna/sna_accel.c|  425 --
 src/sna/sna_blt.c  |   97 ---
 src/sna/sna_composite.c|   13 -
 src/sna/sna_damage.c   |  447 +++
 src/sna/sna_display.c  |  314 +++--
 src/sna/sna_dri.c  |   82 --
 src/sna/sna_driver.c   |   35 ++
 src/sna/sna_glyphs.c   |   21 -
 src/sna/sna_render.c   |5 
 src/sna/sna_render.h   |7 
 src/sna/sna_tiling.c   |2 
 src/sna/sna_trapezoids.c   |6 
 src/sna/sna_trapezoids_boxes.c |   19 -
 src/sna/sna_trapezoids_imprecise.c |   13 -
 src/sna/sna_trapezoids_mono.c  |   38 +--
 src/sna/sna_trapezoids_precise.c   |   13 -
 src/uxa/intel_display.c|   10 
 src/uxa/intel_dri.c|   10 
 src/uxa/intel_glamor.c |   16 +
 src/uxa/intel_glamor.h |4 
 src/uxa/intel_video.c  |   13 -
 tools/virtual.c|   46 +++
 41 files changed, 1631 insertions(+), 988 deletions(-)

New commits:
commit bb9a196da407280b75efcb175f373df3753e3ef4
Author: Timo Aaltonen tjaal...@ubuntu.com
Date:   Sun Feb 2 09:07:26 2014 +0200

bump the version

diff --git a/debian/changelog b/debian/changelog
index 3f4a883..9e4af6a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,5 @@
-xserver-xorg-video-intel (2:2.99.907-1) UNRELEASED; urgency=low
+xserver-xorg-video-intel (2:2.99.909-1) UNRELEASED; urgency=low
 
-  [ Timo Aaltonen ]
-  * New upstream prerelease.
-
-  [ Maarten Lankhorst ]
   * New upstream prerelease.
 
  -- Timo Aaltonen tjaal...@ubuntu.com  Tue, 01 Oct 2013 14:07:22 +0300

commit 2c4b2ed558bec3b71077fb12cc4e008819fa
Author: Chris Wilson ch...@chris-wilson.co.uk
Date:   Sat Feb 1 17:59:29 2014 +

2.99.909 snapshot

diff --git a/NEWS b/NEWS
index 83bf809..63655d3 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,15 @@
+Snapshot 2.99.909 (2013-02-01)
+==
+Pass the brown paper bag. Ridiculously stupid bug in last minute coding.
+
+  * Add Xv support using glamor acceleration in addition to adaptors
+provided by the UXA backend.
+
+  * Fix overeager discarding of CPU damage
+Regression in 2.99.908 :(
+https://bugs.freedesktop.org/show_bug.cgi?id=74327
+
+
 Snapshot 2.99.908 (2013-01-31)
 ==
 A couple of regressions dashed the hopes that .907 was to be the final
diff --git a/configure.ac b/configure.ac
index 4e93f95..f7a6d32 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@
 # Initialize Autoconf
 AC_PREREQ([2.60])
 AC_INIT([xf86-video-intel],
-[2.99.908],
+[2.99.909],
 [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
 [xf86-video-intel])
 AC_CONFIG_SRCDIR([Makefile.am])

commit 495bf89496a96eff0b2c5b6a95aa29df8d7fbc81
Author: Chris Wilson ch...@chris-wilson.co.uk
Date:   Sat Feb 1 18:57:06 2014 +

sna: Apply drawable offsets to partial CPU damage being replaced

Signed-off-by: Chris Wilson ch...@chris-wilson.co.uk

diff --git a/src/sna/sna_accel.c b/src/sna/sna_accel.c
index 1fbbddc..aecae51 100644
--- a/src/sna/sna_accel.c
+++ b/src/sna/sna_accel.c
@@ -2424,6 +2424,9 @@ sna_drawable_move_region_to_cpu(DrawablePtr drawable,
priv-cpu_bo  !priv-cpu_bo-flush 
__kgem_bo_is_busy(sna-kgem, priv-cpu_bo)) {
if (!region_subsumes_pixmap(region, pixmap)) {
+   if (get_drawable_deltas(drawable, pixmap, dx, 
dy))
+   RegionTranslate(region, dx, dy);
+
sna_damage_subtract(priv-cpu_damage, region);
if (sna_pixmap_move_to_gpu(pixmap, MOVE_READ | 
MOVE_ASYNC_HINT)) {
sna_pixmap_free_cpu(sna, priv, false);

commit 2ba8d40bf7e4d3e8fa541c001f82aa65f26bed3a
Author: Chris Wilson ch...@chris-wilson.co.uk
Date:   

xserver-xorg-video-intel: Changes to 'ubuntu'

[Timo Aaltonen]

 debian/changelog |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 80c7eadd63aab143680264b906c0360e2bb23a04
Author: Timo Aaltonen tjaal...@ubuntu.com
Date:   Sun Feb 2 09:11:42 2014 +0200

close a bug

diff --git a/debian/changelog b/debian/changelog
index 0c8865d..8893a6b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,6 @@
 xserver-xorg-video-intel (2:2.99.909-1) UNRELEASED; urgency=low
 
-  * New upstream prerelease.
+  * New upstream prerelease. (LP: #1272338)
 
  -- Timo Aaltonen tjaal...@ubuntu.com  Tue, 01 Oct 2013 14:07:22 +0300
 


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1w9rdv-0005g7...@moszumanska.debian.org

xserver-xorg-video-intel: Changes to 'ubuntu'

[Timo Aaltonen]

 debian/changelog |8 +++-
 1 file changed, 7 insertions(+), 1 deletion(-)

New commits:
commit 8f46d06fbc9576978076e6ab34018bc744898cd3
Author: Timo Aaltonen tjaal...@ubuntu.com
Date:   Sun Feb 2 09:13:12 2014 +0200

fix the changelog

diff --git a/debian/changelog b/debian/changelog
index 8893a6b..8dc60ce 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,12 @@
+xserver-xorg-video-intel (2:2.99.909-0ubuntu1) UNRELEASED; urgency=medium
+
+  * Merge from Debian git. (LP: #1272338)
+
+ -- Timo Aaltonen tjaal...@ubuntu.com  Sun, 02 Feb 2014 09:12:25 +0200
+
 xserver-xorg-video-intel (2:2.99.909-1) UNRELEASED; urgency=low
 
-  * New upstream prerelease. (LP: #1272338)
+  * New upstream prerelease.
 
  -- Timo Aaltonen tjaal...@ubuntu.com  Tue, 01 Oct 2013 14:07:22 +0300
 


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1w9rex-00062d...@moszumanska.debian.org

xserver-xorg-video-intel: Changes to 'ubuntu-saucy'

[Timo Aaltonen]

New branch 'ubuntu-saucy' available with the following commits:
commit 46c721e7d852661a7a649720b229872eed5c347a
Author: Timo Aaltonen tjaal...@ubuntu.com
Date:   Fri Jan 10 11:27:28 2014 +0200

really add sna-sanitize-output-crtc.diff


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1w1cr3-by...@moszumanska.debian.org

xserver-xorg-video-intel: Changes to 'ubuntu-saucy'

[Robert Hooker]

 debian/changelog|7 +++
 debian/patches/baytrail-sna-vsync.patch |   70 
 debian/patches/haswell-sna-vsync.patch  |   33 +++
 debian/patches/series   |2 
 4 files changed, 112 insertions(+)

New commits:
commit 63a2c517608379e61cd30a29ad4e88b031d59d37
Author: Robert Hooker sarv...@ubuntu.com
Date:   Fri Jan 10 11:28:39 2014 -0500

Backport 2 fixes to fix vsync on baytrail and haswell.

diff --git a/debian/changelog b/debian/changelog
index 2dc47d9..c064fda 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xserver-xorg-video-intel (2:2.99.904-0ubuntu2.1) saucy-proposed; urgency=low
+
+  * Add two patch series to fix vsync hangs on haswell and baytrail devices.
+Thanks timo-jyrinki and timchen119! (LP: #1243261)
+
+ -- Robert Hooker sarv...@ubuntu.com  Fri, 10 Jan 2014 11:24:45 -0500
+
 xserver-xorg-video-intel (2:2.99.904-0ubuntu2) saucy-proposed; urgency=low
 
   * sna-sanitize-output-crtc.diff: Fix a crash when failing to probe the
diff --git a/debian/patches/baytrail-sna-vsync.patch 
b/debian/patches/baytrail-sna-vsync.patch
new file mode 100644
index 000..1147847
--- /dev/null
+++ b/debian/patches/baytrail-sna-vsync.patch
@@ -0,0 +1,70 @@
+This is a squash of bd22abee8f33b20ff6bc7297b0a9ae8708d18727 and 
+0e692800055827cf526c7539515c71aecb58bf30 from xf86-video-intel git backported
+to 2.99.904.
+
+=== modified file 'src/sna/sna_display.c'
+--- a/src/sna/sna_display.c2014-01-10 04:13:58 +
 b/src/sna/sna_display.c2014-01-10 08:15:02 +
+@@ -3571,6 +3571,52 @@
+   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,
+@@ -3792,7 +3838,7 @@
+   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_gen6(sna, crtc, pipe, y1, y2, 
full_height);
++  ret =sna_emit_wait_for_scanline_vlv(sna, crtc, pipe, y1, y2, 
full_height);
+   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)
+
diff --git a/debian/patches/haswell-sna-vsync.patch 
b/debian/patches/haswell-sna-vsync.patch
new file mode 100644
index 000..c0f33b6
--- /dev/null
+++ b/debian/patches/haswell-sna-vsync.patch
@@ -0,0 +1,33 @@
+From 68cef6cd281572fcfb76a341dc45b7c8e5baffe6 Mon Sep 17 00:00:00 2001
+From: Chris Wilson ch...@chris-wilson.co.uk
+Date: Thu, 07 Nov 2013 13:09:25 +
+Subject: sna/gen7: Request secure batches for Haswell vsync
+
+Since commit 8ff8eb2b38dc705f5c86f524c1cd74a811a7b04c
+Author: Chris Wilson ch...@chris-wilson.co.uk
+Date:   Mon Sep 9 16:23:04 2013 +0100
+
+sna/hsw: Scanline waits require both DERRMR and forcewake
+
+we have been emitting LRI to enable vsync on the render ring. This
+requires a privileged batch buffer, and whilst we were checking for
+kernel support, we forgot to actually tell the kernel to submit the
+batch with the right privileges.
+
+Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=71328
+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 eb30dfa..889019c 100644
+--- a/src/sna/sna_display.c
 b/src/sna/sna_display.c

xserver-xorg-video-intel: Changes to 'ubuntu'

[Maarten Lankhorst]

 NEWS|   48 
 configure.ac|7 
 debian/changelog|   13 
 src/Makefile.am |   10 
 src/i915_pciids.h   |   25 
 src/intel_module.c  |   16 
 src/legacy/i810/Makefile.am |2 
 src/legacy/i810/i810_common.h   |4 
 src/legacy/i810/i810_cursor.c   |4 
 src/legacy/i810/i810_memory.c   |2 
 src/legacy/i810/i810_ring.h |2 
 src/legacy/i810/xvmc/Makefile.am|4 
 src/render_program/Makefile.am  |   23 
 src/render_program/exa_wm_src_affine.g8b|4 
 src/render_program/exa_wm_src_sample_argb.g8b   |3 
 src/render_program/exa_wm_src_sample_planar.g8b |5 
 src/render_program/exa_wm_write.g8b |   17 
 src/render_program/exa_wm_yuv_rgb.g8b   |   12 
 src/sna/Makefile.am |   19 
 src/sna/brw/Makefile.am |3 
 src/sna/fb/fbgc.c   |1 
 src/sna/fb/fbseg.c  |1 
 src/sna/gen2_render.c   |   52 
 src/sna/gen3_render.c   |   50 
 src/sna/gen4_render.c   |   28 
 src/sna/gen4_vertex.c   |1 
 src/sna/gen5_render.c   |   26 
 src/sna/gen6_common.h   |9 
 src/sna/gen6_render.c   |   33 
 src/sna/gen7_render.c   |   59 
 src/sna/gen8_eu.c   | 1379 
 src/sna/gen8_eu.h   |   19 
 src/sna/gen8_render.c   | 3909 
 src/sna/gen8_render.h   | 1132 ++
 src/sna/gen8_vertex.c   |  296 +
 src/sna/gen8_vertex.h   |   14 
 src/sna/kgem.c  |   74 
 src/sna/kgem.h  |   16 
 src/sna/kgem_debug_gen2.c   |1 
 src/sna/sna.h   |   14 
 src/sna/sna_accel.c |  488 +-
 src/sna/sna_blt.c   |   31 
 src/sna/sna_composite.c |9 
 src/sna/sna_damage.c|9 
 src/sna/sna_display.c   |  157 
 src/sna/sna_display_fake.c  |   53 
 src/sna/sna_dri.c   |   42 
 src/sna/sna_driver.c|   70 
 src/sna/sna_glyphs.c|   15 
 src/sna/sna_render.c|   66 
 src/sna/sna_render.h|   56 
 src/sna/sna_render_inline.h |8 
 src/sna/sna_trapezoids.c|5 
 src/sna/sna_trapezoids_boxes.c  |3 
 src/sna/sna_trapezoids_mono.c   |   10 
 src/sna/sna_video.c |   25 
 src/sna/sna_video_sprite.c  |5 
 src/uxa/Makefile.am |   14 
 src/uxa/i965_3d.c   |1 
 src/uxa/i965_render.c   |   11 
 src/uxa/intel.h |   10 
 src/uxa/intel_display.c |1 
 src/uxa/intel_dri.c |   19 
 src/uxa/intel_driver.c  |   11 
 src/uxa/intel_uxa.c |4 
 src/uxa/uxa-accel.c |3 
 src/uxa/uxa-glyphs.c|4 
 src/uxa/uxa-render.c|1 
 src/uxa/uxa-unaccel.c   |4 
 test/.gitignore |4 
 test/Makefile.am|8 
 test/basic-copyarea-size.c  |2 
 test/basic-copyarea.c   |6 
 test/basic-fillrect.c   |6 
 test/basic-putimage.c   |6 
 test/basic-rectangle.c  |6 
 test/basic-stippledrect.c   |  239 +
 test/basic-stress.c |2 
 test/basic-string.c |6 
 test/basic-tiledrect.c  |  236 +
 test/lowlevel-blt-bench.c   |2 
 test/mixed-stress.c |2 
 test/render-composite-solid-mask.c  |  118 
 test/render-composite-solid.c   |6 
 test/render-copy-alphaless.c|6 
 test/render-copyarea-mask.c |  163 +
 test/render-copyarea-size.c |   

xserver-xorg-video-intel: Changes to 'ubuntu'

[Timo Aaltonen]

 NEWS |   71 
 configure.ac |   31 
 debian/changelog |  165 
 debian/patches/series|1 
 debian/patches/sna-sanitize-output-crtc.diff |   67 
 debian/upstream.changelog| 4552 +++
 man/intel.man|   19 
 src/intel_device.c   |3 
 src/intel_module.c   |   12 
 src/sna/Makefile.am  |4 
 src/sna/blt.c|   13 
 src/sna/brw/brw_eu_util.c|  126 
 src/sna/brw/brw_wm.c |   16 
 src/sna/fb/fbline.c  |   14 
 src/sna/fb/fblinebits.h  |   15 
 src/sna/gen2_render.c|   11 
 src/sna/gen3_render.c|   15 
 src/sna/gen4_common.c|   64 
 src/sna/gen4_common.h|   49 
 src/sna/gen4_render.c|   62 
 src/sna/gen5_render.c|   72 
 src/sna/gen6_common.c|   71 
 src/sna/gen6_common.h|  192 +
 src/sna/gen6_render.c|  231 -
 src/sna/gen7_render.c|  277 -
 src/sna/kgem.c   |  733 +++-
 src/sna/kgem.h   |  155 
 src/sna/sna.h|   57 
 src/sna/sna_accel.c  | 3255 ---
 src/sna/sna_blt.c| 1263 +--
 src/sna/sna_composite.c  |   20 
 src/sna/sna_damage.c |   23 
 src/sna/sna_display.c|  652 ++-
 src/sna/sna_dri.c|   21 
 src/sna/sna_glyphs.c |  235 -
 src/sna/sna_io.c | 1120 --
 src/sna/sna_reg.h|   32 
 src/sna/sna_render.c |2 
 src/sna/sna_render.h |   19 
 src/sna/sna_threads.c|4 
 src/sna/sna_tiling.c |  320 +
 src/sna/sna_trapezoids.c |   23 
 src/sna/sna_trapezoids_mono.c|2 
 src/uxa/i915_video.c |5 
 src/uxa/intel_driver.c   |3 
 src/uxa/intel_uxa.c  |3 
 test/Makefile.am |2 
 tools/virtual.c  |  227 +
 xvmc/i915_xvmc.c |2 
 xvmc/i965_xvmc.c |2 
 xvmc/intel_batchbuffer.c |   60 
 xvmc/intel_batchbuffer.h |4 
 xvmc/intel_xvmc.c|   58 
 xvmc/xvmc_vld.c  |4 
 54 files changed, 10938 insertions(+), 3521 deletions(-)

New commits:
commit 00f88d1ab93c6c245b620bf479fe2ceecb11a00f
Author: Timo Aaltonen tjaal...@ubuntu.com
Date:   Thu Nov 21 11:09:34 2013 +0200

drop patch

diff --git a/debian/changelog b/debian/changelog
index bbdf4fd..24defcd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xserver-xorg-video-intel (2:2.99.906-0ubuntu1) UNRELEASED; urgency=low
+
+  * Merge from unreleased debian git.
+  * Drop sna-sanitize-output-crtc.diff, upstream.
+
+ -- Timo Aaltonen tjaal...@ubuntu.com  Thu, 21 Nov 2013 11:00:00 +0200
+
 xserver-xorg-video-intel (2:2.99.906-1) UNRELEASED; urgency=low
 
   * New upstream prerelease.
diff --git a/debian/patches/series b/debian/patches/series
index 421fa2f..59a6a3b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
 # XMir series
 
 xmir.patch
-sna-sanitize-output-crtc.diff
diff --git a/debian/patches/sna-sanitize-output-crtc.diff 
b/debian/patches/sna-sanitize-output-crtc.diff
deleted file mode 100644
index 5b6a11a..000
--- a/debian/patches/sna-sanitize-output-crtc.diff
+++ /dev/null
@@ -1,67 +0,0 @@
-commit f0bd716425d1514b62565f9a65397cd1cb2ffb3a
-Author: Chris Wilson ch...@chris-wilson.co.uk
-Date:   Thu Oct 10 16:22:45 2013 +0100
-
-sna: Sanitize output-crtc before falling back oto xf86InitialConfiguration
-
-During initialisation, we stash the currently attached CRTC id in
-output-crtc. This is fine as ordinarily we would not dereference
-output-crtc until after it had been assigned a real CRTC. However,
-
-commit 6fda305e2f2f991b39d09e67d0b17c8c3d50f9a4
-Author: Chris Wilson ch...@chris-wilson.co.uk
-Date:   Wed Oct 9 15:59:42 2013 +0100
-
-sna: Append the current mode to the output list if not found
-
-introduces such an early dereference and causes a crash if we fail to
-probe the KMS configuration (usually due to a user override).
-
-Reported-by: Łukasz Maśko 

xserver-xorg-video-intel: Changes to 'ubuntu'

[Timo Aaltonen]

 debian/patches/sna-sanitize-output-crtc.diff |   67 +++
 1 file changed, 67 insertions(+)

New commits:
commit 5a5422814300f624b118439a1f09327ff8da5a06
Author: Timo Aaltonen tjaal...@ubuntu.com
Date:   Fri Oct 18 09:32:10 2013 +0300

add the patch too

diff --git a/debian/patches/sna-sanitize-output-crtc.diff 
b/debian/patches/sna-sanitize-output-crtc.diff
new file mode 100644
index 000..5b6a11a
--- /dev/null
+++ b/debian/patches/sna-sanitize-output-crtc.diff
@@ -0,0 +1,67 @@
+commit f0bd716425d1514b62565f9a65397cd1cb2ffb3a
+Author: Chris Wilson ch...@chris-wilson.co.uk
+Date:   Thu Oct 10 16:22:45 2013 +0100
+
+sna: Sanitize output-crtc before falling back oto xf86InitialConfiguration
+
+During initialisation, we stash the currently attached CRTC id in
+output-crtc. This is fine as ordinarily we would not dereference
+output-crtc until after it had been assigned a real CRTC. However,
+
+commit 6fda305e2f2f991b39d09e67d0b17c8c3d50f9a4
+Author: Chris Wilson ch...@chris-wilson.co.uk
+Date:   Wed Oct 9 15:59:42 2013 +0100
+
+sna: Append the current mode to the output list if not found
+
+introduces such an early dereference and causes a crash if we fail to
+probe the KMS configuration (usually due to a user override).
+
+Reported-by: Łukasz Maśko e...@yen.ipipan.waw.pl
+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 71c4c60..27a4467 100644
+--- a/src/sna/sna_display.c
 b/src/sna/sna_display.c
+@@ -3225,8 +3225,10 @@ static bool sna_probe_initial_configuration(struct sna 
*sna)
+   xf86OutputPtr output = config-output[i];
+   uint32_t crtc_id;
+ 
+-  if (to_sna_output(output) == NULL)
++  if (to_sna_output(output) == NULL) {
++  assert(output-crtc == NULL);
+   continue;
++  }
+ 
+   crtc_id = (uintptr_t)output-crtc;
+   output-crtc = NULL;
+@@ -3321,6 +3323,16 @@ static bool sna_probe_initial_configuration(struct sna 
*sna)
+ }
+ 
+ static void
++sanitize_outputs(struct sna *sna)
++{
++  xf86CrtcConfigPtr config = XF86_CRTC_CONFIG_PTR(sna-scrn);
++  int i;
++
++  for (i = 0; i  config-num_output; i++)
++  config-output[i]-crtc = NULL;
++}
++
++static void
+ sna_crtc_config_notify(ScreenPtr screen)
+ {
+   DBG((%s\n, __FUNCTION__));
+@@ -3372,8 +3384,10 @@ bool sna_mode_pre_init(ScrnInfoPtr scrn, struct sna 
*sna)
+   if (!sna_mode_fake_init(sna, num_fake))
+   return false;
+ 
+-  if (!sna_probe_initial_configuration(sna))
++  if (!sna_probe_initial_configuration(sna)) {
++  sanitize_outputs(sna);
+   xf86InitialConfiguration(scrn, TRUE);
++  }
+ 
+   sna_setup_provider(scrn);
+   return scrn-modes != NULL;


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1vx3bc-0004zu...@vasks.debian.org

xserver-xorg-video-intel: Changes to 'ubuntu-quantal'

[Timo Aaltonen]

 src/scripts/clock-graph.5c |  174 -
 src/scripts/clock.5c   |   40 --
 src/scripts/fix.5c |   14 ---
 src/scripts/tv.5c  |  128 -
 src/sna/brw/brw_eu_debug.c |   95 
 src/sna/brw/brw_eu_util.c  |  126 
 6 files changed, 577 deletions(-)

New commits:
commit 99f67a2fe7e1ef3eefff56880f9eedde89d29bb4
Author: Timo Aaltonen tjaal...@ubuntu.com
Date:   Fri Oct 18 09:37:16 2013 +0300

clean crap from the branch to make reviewing more pleasant

diff --git a/src/scripts/clock-graph.5c b/src/scripts/clock-graph.5c
deleted file mode 100644
index 324febf..000
--- a/src/scripts/clock-graph.5c
+++ /dev/null
@@ -1,174 +0,0 @@
-autoload Cairo;
-import Cairo;
-library examples/sort.5c;
-import Sort;
-
-int width = 1000, height = 200;
-int min_vco = 14;
-int max_vco = 28;
-int min = 0x;
-int max = 0;
-
-int max_clocks = 2000;
-int[4][max_clocks] clocks;
-int[4][max_clocks] vcos;
-int[4] clock_count = {0...};
-
-int[4] p2vals = {5,10,7,14};
-
-cairo_t cr = Cairo::new(width, height);
-
-void calc_p2(int p2i)
-{
-   int p2 = p2vals[p2i];
-   int min_p, max_p;
-
-   clocks[p2i] = (int [max_clocks]){0...};
-
-   if (p2 == 7 || p2 == 14) {
-   /* LVDS */
-   min_p = 7;
-   max_p = 98;
-   } else {
-   /* SDVO/DAC */
-   min_p = 5;
-   max_p = 80;
-   }
-
-   for (int m1 = 10; m1 = 22; m1++) {
-   for (int m2 = 5; m2 = 9; m2++) {
-   for (int n = 1; n = 5; n++) {
-   for (int p1 = 1; p1 = 8; p1++) {
-   int ref = 9600;
-   int m = 5 * (m1 + 2) + (m2 + 2);
-   int p = p1 * p2;
-   int vco = floor(ref * m / (n + 2));
-   int clock = floor(vco / p);
-
-   if (p  min_p || p  max_p)
-   continue;
-   if (m  70 || m  120)
-   continue;
-   if (m2  m1)
-   continue; /* won't happen */
-   if (vco  min_vco || vco  max_vco)
-   continue;
-
-/*
-   printf(clock: %d (%d,%d), %d, 
-   (%d,%d)\n,
-   floor(clock / 1000),
-   m1, m2, n, p1, p2);
-*/
-
-   clocks[p2i][clock_count[p2i]] = clock;
-   vcos[p2i][clock_count[p2i]] = vco;
-   clock_count[p2i]++;
-   }
-   }
-   }
-   }
-}
-
-bool sort_p2(poly a, poly b)
-{
-   return a  b;
-}
-
-int min_rate = 25000 * 1000;
-int max_rate = 20 * 1000;
-
-real scale_x(real clock)
-{
-   int min_x = 75, max_x = width - 50;
-
-   real frac = (clock - min_rate) / (max_rate - min_rate);
-
-   return min_x + frac * (max_x - min_x);
-}
-
-for (p2i = 0; p2i  dim(p2vals); p2i++) {
-   int p2 = p2vals[p2i]; 
-   calc_p2(p2i);
-   real row_y1 = (p2i + 1) / (dim(p2vals) + 1) * height;
-   real row_y2 = p2i / (dim(p2vals) + 1) * height;
-
-   /*qsort(p2vals[p2i], sort_p2);*/
-
-   switch (p2) {
-   case 5:
-   set_source_rgb(cr, 1,0,0);
-   break;
-   case 10:
-   set_source_rgb(cr, 0,1,0);
-   break;
-   case 7:
-   set_source_rgb(cr, 0,0,1);
-   break;
-   case 14:
-   set_source_rgb(cr, 0,0,0);
-   break;
-   }
-
-   /* draw the line for the clock */
-   for (int i = 0; i  clock_count[p2i]; i++) {
-   int clock = clocks[p2i][i];
-   real xpos;
-
-   if (clock  min_rate || clock  max_rate)
-   continue;
-
-   xpos = scale_x(clock);
-   move_to(cr, xpos, row_y1);
-   line_to(cr, xpos, row_y2);
-   stroke(cr);
-   }
-
-   set_source_rgb(cr, 1, 1, 1);
-   /* add a mark for the vco value of the clocks at each location */
-   for (int i = 0; i  clock_count[p2i]; i++) {
-   int clock = clocks[p2i][i];
-   int vco = vcos[p2i][i];
-   real mark_center;
-
-   if (clock  min_rate || clock  max_rate)
-   continue;
-
-   real xpos = scale_x(clock);
-   real vcofrac = 

xserver-xorg-video-intel: Changes to 'ubuntu'

[Timo Aaltonen]

 debian/changelog  |9 -
 debian/patches/series |1 +
 2 files changed, 9 insertions(+), 1 deletion(-)

New commits:
commit a828fb421e2627dd35597966383e75bc7f43448d
Author: Timo Aaltonen tjaal...@ubuntu.com
Date:   Fri Oct 11 07:55:54 2013 +0300

release to saucy-proposed

diff --git a/debian/changelog b/debian/changelog
index a3a25ed..2dc47d9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xserver-xorg-video-intel (2:2.99.904-0ubuntu2) UNRELEASED; urgency=low
+xserver-xorg-video-intel (2:2.99.904-0ubuntu2) saucy-proposed; urgency=low
 
   * sna-sanitize-output-crtc.diff: Fix a crash when failing to probe the
 KMS configuration.

commit 3a75b7a1bd263b62131793e7e4df400fa4aafa6a
Author: Timo Aaltonen tjaal...@ubuntu.com
Date:   Fri Oct 11 07:55:30 2013 +0300

sna-sanitize-output-crtc.diff: Fix a crash when failing to probe the KMS 
configuration.

diff --git a/debian/changelog b/debian/changelog
index f7eab54..a3a25ed 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xserver-xorg-video-intel (2:2.99.904-0ubuntu2) UNRELEASED; urgency=low
+
+  * sna-sanitize-output-crtc.diff: Fix a crash when failing to probe the
+KMS configuration.
+
+ -- Timo Aaltonen tjaal...@ubuntu.com  Fri, 11 Oct 2013 07:54:27 +0300
+
 xserver-xorg-video-intel (2:2.99.904-0ubuntu1) saucy; urgency=low
 
   * Merge from unreleased debian git
diff --git a/debian/patches/series b/debian/patches/series
index 59a6a3b..421fa2f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 # XMir series
 
 xmir.patch
+sna-sanitize-output-crtc.diff

commit 6585209279e370e59b0490288357ab4704ed55e8
Author: Timo Aaltonen tjaal...@ubuntu.com
Date:   Wed Oct 9 19:53:12 2013 +0300

release to saucy

diff --git a/debian/changelog b/debian/changelog
index 69c21ca..f7eab54 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xserver-xorg-video-intel (2:2.99.904-0ubuntu1) UNRELEASED; urgency=low
+xserver-xorg-video-intel (2:2.99.904-0ubuntu1) saucy; urgency=low
 
   * Merge from unreleased debian git
 - new release candidate (LP: #1218839, #1157458, #1216252, #1232546)


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1vuumt-0007t4...@vasks.debian.org

xserver-xorg-video-intel: Changes to 'ubuntu'

[Timo Aaltonen]

 NEWS   |   38 
 configure.ac   |   16 
 debian/changelog   |   20 
 debian/patches/xmir.patch  |  308 +
 src/compat-api.h   |4 
 src/intel_device.c |   99 
 src/intel_driver.h |   13 
 src/intel_module.c |   44 
 src/legacy/i810/i810_driver.c  |2 
 src/sna/Makefile.am|5 
 src/sna/gen3_render.c  |   70 
 src/sna/gen4_render.c  |   28 
 src/sna/gen4_vertex.c  |   26 
 src/sna/gen4_vertex.h  |1 
 src/sna/gen5_render.c  |   34 
 src/sna/gen6_render.c  |   48 
 src/sna/gen7_render.c  |   99 
 src/sna/kgem.c |   77 
 src/sna/kgem.h |2 
 src/sna/sna.h  |1 
 src/sna/sna_accel.c|   35 
 src/sna/sna_composite.c|  187 
 src/sna/sna_display.c  |   75 
 src/sna/sna_dri.c  |   13 
 src/sna/sna_driver.c   |   15 
 src/sna/sna_gradient.c |9 
 src/sna/sna_render.c   |9 
 src/sna/sna_render.h   |2 
 src/sna/sna_threads.c  |2 
 src/sna/sna_trapezoids.c   | 7554 ++---
 src/sna/sna_trapezoids.h   |  342 +
 src/sna/sna_trapezoids_boxes.c | 1461 +++
 src/sna/sna_trapezoids_imprecise.c | 3916 +++
 src/sna/sna_trapezoids_mono.c  | 1428 ++
 src/sna/sna_trapezoids_precise.c   | 3302 
 src/sna/sna_video.c|   11 
 src/sna/sna_video.h|1 
 src/sna/sna_video_hwmc.c   |   12 
 src/sna/sna_video_sprite.c |5 
 src/uxa/intel_driver.c |2 
 tools/virtual.c|2 
 41 files changed, 11858 insertions(+), 7460 deletions(-)

New commits:
commit bf7d059cf65f0e35cd0eb28eeb2672685b74e5bc
Author: Timo Aaltonen tjaal...@ubuntu.com
Date:   Wed Oct 9 19:44:10 2013 +0300

refresh xmir.patch

diff --git a/debian/changelog b/debian/changelog
index 2f82b5f..69c21ca 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+xserver-xorg-video-intel (2:2.99.904-0ubuntu1) UNRELEASED; urgency=low
+
+  * Merge from unreleased debian git
+- new release candidate (LP: #1218839, #1157458, #1216252, #1232546)
+  * xmir.patch: refreshed.
+
+ -- Timo Aaltonen tjaal...@ubuntu.com  Wed, 09 Oct 2013 19:40:51 +0300
+
 xserver-xorg-video-intel (2:2.99.904-1) UNRELEASED; urgency=low
 
   * New upstream prerelease.
diff --git a/debian/patches/xmir.patch b/debian/patches/xmir.patch
index 3636e58..af283b3 100644
--- a/debian/patches/xmir.patch
+++ b/debian/patches/xmir.patch
@@ -13,8 +13,6 @@ Date:   Wed Jul 24 01:44:30 2013 +0100
 Signed-off-by: Christopher James Halse Rogers r...@ubuntu.com
 Signed-off-by: Chris Wilson ch...@chris-wilson.co.uk
 
-diff --git a/src/Makefile.am b/src/Makefile.am
-index b0781ca..126bde2 100644
 --- a/src/Makefile.am
 +++ b/src/Makefile.am
 @@ -59,6 +59,7 @@ intel_drv_la_SOURCES = \
@@ -25,11 +23,9 @@ index b0781ca..126bde2 100644
compat-api.h \
$(NULL)
  
-diff --git a/src/intel_device.c b/src/intel_device.c
-index 92472c5..2dd1625 100644
 --- a/src/intel_device.c
 +++ b/src/intel_device.c
-@@ -146,10 +146,34 @@ static int fd_set_nonblock(int fd)
+@@ -175,10 +175,34 @@ static int fd_set_nonblock(int fd)
return fd;
  }
  
@@ -64,8 +60,6 @@ index 92472c5..2dd1625 100644
if (*path == NULL) {
char id[20];
int ret;
-diff --git a/src/intel_driver.h b/src/intel_driver.h
-index e54054f..0c5e4ae 100644
 --- a/src/intel_driver.h
 +++ b/src/intel_driver.h
 @@ -1,6 +1,8 @@
@@ -74,10 +68,10 @@ index e54054f..0c5e4ae 100644
  
 +#include intel_xmir.h
 +
+ struct xf86_platform_device;
+ 
  #define INTEL_VERSION 4000
- #define INTEL_NAME intel
- #define INTEL_DRIVER_NAME intel
-@@ -129,6 +131,6 @@ void intel_put_device(ScrnInfoPtr scrn);
+@@ -134,6 +136,6 @@ void intel_put_device(ScrnInfoPtr scrn);
  
  void __intel_uxa_release_device(ScrnInfoPtr scrn);
  
@@ -85,9 +79,6 @@ index e54054f..0c5e4ae 100644
 +#define hosted() (xorgMir)
  
  #endif /* INTEL_DRIVER_H */
-diff --git a/src/intel_xmir.h b/src/intel_xmir.h
-new file mode 100644
-index 000..2e3c85a
 --- /dev/null
 +++ b/src/intel_xmir.h
 @@ -0,0 +1,15 @@
@@ -106,11 +97,9 @@ index 000..2e3c85a
 +#endif
 +
 +#endif /* INTEL_XMIR_H */
-diff --git a/src/sna/Makefile.am b/src/sna/Makefile.am
-index 030869d..5cf1cbf 100644
 --- a/src/sna/Makefile.am
 +++ b/src/sna/Makefile.am
-@@ -76,6 +76,7 @@ libsna_la_SOURCES = \
+@@ -81,6 +81,7 @@ libsna_la_SOURCES = \
sna_video_overlay.c \
sna_video_sprite.c \
sna_video_textured.c \
@@ -118,19 +107,17 @@ index 030869d..5cf1cbf 100644
gen2_render.c \
gen2_render.h \
gen3_render.c \
-diff --git 

xserver-xorg-video-intel: Changes to 'ubuntu-raring'

[Timo Aaltonen]

 debian/changelog  |7 +
 debian/patches/series |1 
 debian/patches/sna-fixup-possible-clones.diff |  130 ++
 3 files changed, 138 insertions(+)

New commits:
commit fe699c4bc47146fb94e147df21edd988b4b252e9
Author: Timo Aaltonen tjaal...@ubuntu.com
Date:   Fri Oct 4 11:51:27 2013 +0300

release to raring

diff --git a/debian/changelog b/debian/changelog
index e0f0d35..d4da552 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xserver-xorg-video-intel (2:2.21.6-0ubuntu4.3) UNRELEASED; urgency=low
+xserver-xorg-video-intel (2:2.21.6-0ubuntu4.3) raring-proposed; urgency=low
 
   * sna-fixup-possible-clones.diff: Backport from 2.21.9 to fix
 clone mode on haswell laptops. (LP: #1202524)

commit 35eb0d3209bb554ecd65be0d9a7faa08ac1bb342
Author: Timo Aaltonen tjaal...@ubuntu.com
Date:   Fri Oct 4 11:41:17 2013 +0300

sna-fixup-possible-clones.diff: Backport from 2.21.9 to fix clone mode on 
haswell laptops. (LP: #1202524)

diff --git a/debian/changelog b/debian/changelog
index ef6fb6a..e0f0d35 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xserver-xorg-video-intel (2:2.21.6-0ubuntu4.3) UNRELEASED; urgency=low
+
+  * sna-fixup-possible-clones.diff: Backport from 2.21.9 to fix
+clone mode on haswell laptops. (LP: #1202524)
+
+ -- Timo Aaltonen tjaal...@ubuntu.com  Fri, 04 Oct 2013 11:39:07 +0300
+
 xserver-xorg-video-intel (2:2.21.6-0ubuntu4.2) raring-proposed; urgency=low
 
   * Add hsw-green-xv.patch, backport from 2.21.10 to fix green screens when 
using XV
diff --git a/debian/patches/series b/debian/patches/series
index e61d6cc..504e83f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,3 +6,4 @@ add-more-reserved-hsw-ids.diff
 add-known-hsw-names.diff
 add-more-correct-hsw-names.diff
 hsw-green-xv.patch
+sna-fixup-possible-clones.diff
diff --git a/debian/patches/sna-fixup-possible-clones.diff 
b/debian/patches/sna-fixup-possible-clones.diff
new file mode 100644
index 000..8af11c9
--- /dev/null
+++ b/debian/patches/sna-fixup-possible-clones.diff
@@ -0,0 +1,130 @@
+commit fc1e0702b25e647cb423851fb7228989fec28bd6
+Author: Daniel Vetter daniel.vet...@ffwll.ch
+Date:   Wed May 29 11:25:28 2013 +0100
+
+sna: fixup up possible_clones kms-X impedance mismatch
+
+We need to be a notch more careful with remapping the possible clones
+mask from the kernel:
+- SDVO and Haswell DDI have multiple connectors mapping to the same 
encoder.
+- The connector list can be reordered compared to the encoder list.
+  This is used to move eDP/LVDS to the front.
+
+Also add even more debug output.
+
+Signed-off-by: Daniel Vetter daniel.vet...@ffwll.ch
+
+--- a/src/sna/sna_display.c
 b/src/sna/sna_display.c
+@@ -84,6 +84,7 @@ struct sna_property {
+ struct sna_output {
+   int id;
+   drmModeConnectorPtr mode_output;
++  int encoder_idx;
+   int num_props;
+   struct sna_property *props;
+ 
+@@ -98,6 +99,16 @@ struct sna_output {
+   struct list link;
+ };
+ 
++static inline struct sna_output *to_sna_output(xf86OutputPtr output)
++{
++  return output-driver_private;
++}
++
++static inline int to_connector_id(xf86OutputPtr output)
++{
++  return to_sna_output(output)-mode_output-connector_id;
++}
++
+ static inline struct sna_crtc *to_sna_crtc(xf86CrtcPtr crtc)
+ {
+   return crtc-driver_private;
+@@ -735,14 +746,11 @@ sna_crtc_apply(xf86CrtcPtr crtc)
+ 
+   for (i = 0; i  xf86_config-num_output; i++) {
+   xf86OutputPtr output = xf86_config-output[i];
+-  struct sna_output *sna_output;
+ 
+   if (output-crtc != crtc)
+   continue;
+ 
+-  sna_output = output-driver_private;
+-  output_ids[output_count] =
+-  sna_output-mode_output-connector_id;
++  output_ids[output_count] = to_connector_id(output);
+   output_count++;
+   }
+ 
+@@ -2326,6 +2334,7 @@ sna_output_init(ScrnInfoPtr scrn, struct
+   struct sna_output *sna_output;
+   const char *output_name;
+   char name[32];
++  int i;
+ 
+   koutput = drmModeGetConnector(sna-kgem.fd,
+ mode-kmode-connectors[num]);
+@@ -2380,6 +2389,13 @@ sna_output_init(ScrnInfoPtr scrn, struct
+   output-subpixel_order = subpixel_conv_table[koutput-subpixel];
+   output-driver_private = sna_output;
+ 
++  for (i = 0; i  mode-kmode-count_encoders; i++) {
++  if (enc.encoder_id == mode-kmode-encoders[i]) {
++  sna_output-encoder_idx = i;
++  break;
++  }
++  }
++
+   if (is_panel(koutput-connector_type))
+   sna_output_backlight_init(output);
+ 
+@@ -2395,33 +2411,34 @@ cleanup_connector:
+   drmModeFreeConnector(koutput);
+ }
+ 
+-/* The kernel reports possible encoder clones, 

xserver-xorg-video-intel: Changes to 'ubuntu'

[Timo Aaltonen]

 debian/changelog |5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit c6cd677fbc0624df060a7b904876b777aabafb2f
Author: Timo Aaltonen tjaal...@ubuntu.com
Date:   Fri Oct 4 07:45:15 2013 +0300

release to saucy, close FFE

diff --git a/debian/changelog b/debian/changelog
index 19ed0ef..0fdf14e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,7 @@
-xserver-xorg-video-intel (2:2.99.903-0ubuntu1) UNRELEASED; urgency=low
+xserver-xorg-video-intel (2:2.99.903-0ubuntu1) saucy; urgency=low
 
   * Merge from unreleased debian git (LP: #103, #1224106, #1228677,
-#1233990)
+#1233990, #1234027)
   * Drop patches that were from upstream.
   * source: Revert to source format 1.0.
   * xmir.patch: Refresh.

commit 5db0896b7a4694bf5450199f0dd5a60d9baa8fef
Author: Timo Aaltonen tjaal...@ubuntu.com
Date:   Fri Oct 4 07:45:00 2013 +0300

close another bug

diff --git a/debian/changelog b/debian/changelog
index 668541e..19ed0ef 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 xserver-xorg-video-intel (2:2.99.903-0ubuntu1) UNRELEASED; urgency=low
 
-  * Merge from unreleased debian git (LP: #103, #1224106, #1228677)
+  * Merge from unreleased debian git (LP: #103, #1224106, #1228677,
+#1233990)
   * Drop patches that were from upstream.
   * source: Revert to source format 1.0.
   * xmir.patch: Refresh.


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1vrxj1-0004ul...@vasks.debian.org

xserver-xorg-video-intel: Changes to 'ubuntu-quantal'

[Timo Aaltonen]

 debian/changelog |7 +
 debian/patches/fix-possible-clones-computation.patch |  126 +++
 debian/patches/series|1 
 3 files changed, 134 insertions(+)

New commits:
commit e7c37292e6ac8a1c91554b75e80daee008fb942a
Author: Timo Aaltonen tjaal...@ubuntu.com
Date:   Thu Oct 3 09:57:12 2013 +0300

commit -0u2.3

diff --git a/debian/changelog b/debian/changelog
index 527bb16..eaced1d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xserver-xorg-video-intel (2:2.20.9-0ubuntu2.3) quantal-proposed; urgency=low
+
+  * Add fix-possible-clones-computation.patch: Backport from 2.20.10 to fix
+clone mode on haswell laptops. (LP: #1202524)
+
+ -- Robert Hooker sarv...@ubuntu.com  Thu, 01 Aug 2013 09:24:13 -0400
+
 xserver-xorg-video-intel (2:2.20.9-0ubuntu2.2) quantal-proposed; urgency=low
 
   * Added patches to add/fix Haswell pci-id's (LP: #1175533)
diff --git a/debian/patches/fix-possible-clones-computation.patch 
b/debian/patches/fix-possible-clones-computation.patch
new file mode 100644
index 000..f7883a6
--- /dev/null
+++ b/debian/patches/fix-possible-clones-computation.patch
@@ -0,0 +1,126 @@
+--- a/src/intel_display.c
 b/src/intel_display.c
+@@ -1435,7 +1435,6 @@
+   intel_output_backlight_init(output);
+ 
+   output-possible_crtcs = kencoder-possible_crtcs;
+-  output-possible_clones = kencoder-possible_clones;
+   output-interlaceAllowed = TRUE;
+ 
+   intel_output-output = output;
+@@ -1680,6 +1679,60 @@
+   drmHandleEvent(mode-fd, mode-event_context);
+ }
+ 
++static drmModeEncoderPtr
++intel_get_kencoder(struct intel_mode *mode, int num)
++{
++  struct intel_output *iterator;
++  int id = mode-mode_res-encoders[num];
++
++  list_for_each_entry(iterator, mode-outputs, link)
++  if (iterator-mode_encoder-encoder_id == id)
++  return iterator-mode_encoder;
++
++  return NULL;
++}
++
++/*
++ * Libdrm's possible_clones is a mask of encoders, Xorg's possible_clones is a
++ * mask of outputs. This function sets Xorg's possible_clones based on the
++ * values read from libdrm.
++ */
++static void
++intel_compute_possible_clones(ScrnInfoPtr scrn, struct intel_mode *mode)
++{
++  xf86CrtcConfigPtr config = XF86_CRTC_CONFIG_PTR(scrn);
++  struct intel_output *intel_output, *clone;
++  drmModeEncoderPtr cloned_encoder;
++  uint32_t mask;
++  int i, j, k;
++  CARD32 possible_clones;
++
++  for (i = 0; i  config-num_output; i++) {
++  possible_clones = 0;
++  intel_output = config-output[i]-driver_private;
++
++  mask = intel_output-mode_encoder-possible_clones;
++  for (j = 0; mask != 0; j++, mask = 1) {
++
++  if ((mask  1) == 0)
++  continue;
++
++  cloned_encoder = intel_get_kencoder(mode, j);
++  if (!cloned_encoder)
++  continue;
++
++  for (k = 0; k  config-num_output; k++) {
++  clone = config-output[k]-driver_private;
++  if (clone-mode_encoder-encoder_id ==
++  cloned_encoder-encoder_id)
++  possible_clones |= (1  k);
++  }
++  }
++
++  config-output[i]-possible_clones = possible_clones;
++  }
++}
++
+ Bool intel_mode_pre_init(ScrnInfoPtr scrn, int fd, int cpp)
+ {
+   intel_screen_private *intel = intel_get_screen_private(scrn);
+@@ -1715,6 +1768,7 @@
+ 
+   for (i = 0; i  mode-mode_res-count_connectors; i++)
+   intel_output_init(scrn, mode, i);
++  intel_compute_possible_clones(scrn, mode);
+ 
+ #ifdef INTEL_PIXMAP_SHARING
+   xf86ProviderSetup(scrn, NULL, Intel);
+--- a/src/sna/sna_display.c
 b/src/sna/sna_display.c
+@@ -2291,6 +2291,35 @@
+   drmModeFreeConnector(koutput);
+ }
+ 
++/* The kernel reports possible encoder clones, whereas X uses a list of
++ * possible connector clones. This is works when we have a 1:1 mapping
++ * between encoders and connectors, but breaks for Haswell which has a pair
++ * of DP/HDMI connectors hanging off a single encoder.
++ */
++static void
++sna_mode_compute_possible_clones(ScrnInfoPtr scrn)
++{
++  xf86CrtcConfigPtr config = XF86_CRTC_CONFIG_PTR(scrn);
++  unsigned clones[32] = { 0 };
++  int i, j;
++
++  assert(config-num_output = 32);
++
++  /* Convert from encoder numbering to output numbering */
++  for (i = 0; i  config-num_output; i++) {
++  unsigned mask = config-output[i]-possible_clones;
++  for (j = 0; mask != 0; j++, mask = 1) {
++  if ((mask  1) == 0)
++  continue;
++
++  clones[j] |= 1  i;
++  

xserver-xorg-video-intel: Changes to 'ubuntu'

[Timo Aaltonen]

 ChangeLog  
|69207 -
 Makefile.am
|4 
 NEWS   
|   97 
 configure.ac   
|  534 
 debian/changelog   
|   28 
 debian/control 
|   10 
 debian/patches/0001-sna-Make-sure-the-frontbuffer-exists-before-doing-pi.patch 
|   60 
 debian/patches/Check-for-struct-sysinfo-as-well-as-sys-sysinfo.h.patch 
|   51 
 debian/patches/Link-the-driver-against-pixman.patch
|   38 
 debian/patches/check-hosted-initialisation-succeeds.patch  
|   26 
 debian/patches/disable-unneeded-functions-when-hosted.patch
|  261 
 debian/patches/dont-copy-fbcon-if-hosted.patch 
|   26 
 debian/patches/fix-spelling-of-caching.patch   
|  180 
 debian/patches/more-modesetting-disablement-when-hosted.patch  
|  235 
 debian/patches/series  
|   10 
 debian/patches/unwrap-legacy-modesetting-when-hosted.patch 
|   57 
 debian/patches/xmir.patch  
|  220 
 debian/rules   
|3 
 debian/source/format   
|1 
 debian/upstream.changelog  
|69797 ++
 man/intel.man  
|   34 
 src/Makefile.am
|2 
 src/compat-api.h   
|4 
 src/intel_device.c 
|   90 
 src/intel_driver.h 
|4 
 src/intel_module.c 
|   36 
 src/intel_options.c
|5 
 src/intel_options.h
|4 
 src/legacy/Makefile.am 
|2 
 src/legacy/i810/i810_accel.c   
|1 
 src/legacy/i810/i810_cursor.c  
|1 
 src/legacy/i810/i810_dga.c 
|1 
 src/legacy/i810/i810_dri.c 
|1 
 src/legacy/i810/i810_driver.c  
|1 
 src/legacy/i810/i810_hwmc.c
|1 
 src/legacy/i810/i810_memory.c  
|1 
 src/legacy/i810/i810_video.c   
|1 
 src/legacy/i810/i810_wmark.c   
|1 
 src/legacy/i810/i810_xaa.c 
|1 
 src/sna/Makefile.am
|1 
 src/sna/compiler.h 
|6 
 src/sna/fb/fbclip.c
|2 
 src/sna/fb/fbclip.h
|7 
 src/sna/fb/fbpict.h
|1 
 src/sna/gen2_render.c  
|3 
 src/sna/gen3_render.c  
|   61 
 src/sna/gen4_render.c  
|   45 
 src/sna/gen4_vertex.c  
|   85 
 src/sna/gen5_render.c  
|   39 
 src/sna/gen6_render.c  
|  152 
 src/sna/gen7_render.c  
|  188 
 src/sna/kgem.c 
|  603 
 src/sna/kgem.h 
|   30 
 src/sna/sna.h  
|  104 
 src/sna/sna_accel.c
| 1180 
 src/sna/sna_acpi.c 
|  

xserver-xorg-video-intel: Changes to 'ubuntu'

[Timo Aaltonen]

 debian/changelog |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 5fe113590ec4517a28d9f82a087dbddbbb69eab2
Author: Timo Aaltonen tjaal...@ubuntu.com
Date:   Tue Oct 1 17:27:18 2013 +0300

close some bugs

diff --git a/debian/changelog b/debian/changelog
index cebe397..668541e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,6 @@
 xserver-xorg-video-intel (2:2.99.903-0ubuntu1) UNRELEASED; urgency=low
 
-  * Merge from unreleased debian git
+  * Merge from unreleased debian git (LP: #103, #1224106, #1228677)
   * Drop patches that were from upstream.
   * source: Revert to source format 1.0.
   * xmir.patch: Refresh.


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1vr1q8-0005xi...@vasks.debian.org

xserver-xorg-video-intel: Changes to 'ubuntu-raring'

[Timo Aaltonen]

 debian/changelog  |7 +++
 debian/patches/series |1 +
 2 files changed, 8 insertions(+)

New commits:
commit 0960534105e5c99e648f07c9cac85086c01b30eb
Author: Timo Aaltonen tjaal...@ubuntu.com
Date:   Sat Sep 28 08:56:26 2013 +0300

Add hsw-green-xv.patch, backport from 2.21.10 to fix green screens when 
using XV on Haswell generation GPUs. (LP: #1220645)

diff --git a/debian/changelog b/debian/changelog
index 204c640..ef6fb6a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xserver-xorg-video-intel (2:2.21.6-0ubuntu4.2) raring-proposed; urgency=low
+
+  * Add hsw-green-xv.patch, backport from 2.21.10 to fix green screens when 
using XV
+on Haswell generation GPUs. (LP: #1220645)
+
+ -- Robert Hooker sarv...@ubuntu.com  Fri, 27 Sep 2013 16:25:34 -0400
+
 xserver-xorg-video-intel (2:2.21.6-0ubuntu4.1) raring-proposed; urgency=low
 
   * Added patches to add/fix Haswell pci-id's (LP: #1175533)
diff --git a/debian/patches/series b/debian/patches/series
index f2bcc76..e61d6cc 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,3 +5,4 @@ fix-hsw-gt3-names.diff
 add-more-reserved-hsw-ids.diff
 add-known-hsw-names.diff
 add-more-correct-hsw-names.diff
+hsw-green-xv.patch


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1vpnxk-0006ry...@vasks.debian.org

xserver-xorg-video-intel: Changes to 'ubuntu-raring'

[Timo Aaltonen]

 debian/patches/hsw-green-xv.patch |   79 ++
 1 file changed, 79 insertions(+)

New commits:
commit 72d3038f0d641f0c168dfc6985a12830cfec209c
Author: Timo Aaltonen tjaal...@ubuntu.com
Date:   Sat Sep 28 09:14:05 2013 +0300

add the patch too

diff --git a/debian/patches/hsw-green-xv.patch 
b/debian/patches/hsw-green-xv.patch
new file mode 100644
index 000..1cba97e
--- /dev/null
+++ b/debian/patches/hsw-green-xv.patch
@@ -0,0 +1,79 @@
+From 8f340f90f4b2f269d6308d0bd31fbc2a5f579608 Mon Sep 17 00:00:00 2001
+From: Chris Wilson ch...@chris-wilson.co.uk
+Date: Thu, 13 Jun 2013 15:08:49 +
+Subject: sna/gen7: Set sampler swizzle for video sources
+
+Otherwise the sampler on Haswell will just read all zeros when trying to
+playback a video.
+
+Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=65699
+Signed-off-by: Chris Wilson ch...@chris-wilson.co.uk
+---
+diff --git a/src/sna/gen7_render.c b/src/sna/gen7_render.c
+index 1212975..20dc6d8 100644
+--- a/src/sna/gen7_render.c
 b/src/sna/gen7_render.c
+@@ -1638,33 +1638,41 @@ gen7_composite_create_blend_state(struct 
sna_static_stream *stream)
+ }
+ 
+ static uint32_t gen7_bind_video_source(struct sna *sna,
+- struct kgem_bo *src_bo,
+- uint32_t src_offset,
+- int src_width,
+- int src_height,
+- int src_pitch,
+- uint32_t src_surf_format)
++ struct kgem_bo *bo,
++ uint32_t offset,
++ int width,
++ int height,
++ int pitch,
++ uint32_t format)
+ {
+-  struct gen7_surface_state *ss;
++  uint32_t *ss, bind;
+ 
+-  sna-kgem.surface -= sizeof(struct gen7_surface_state) / 
sizeof(uint32_t);
++  bind = sna-kgem.surface -=
++  sizeof(struct gen7_surface_state) / sizeof(uint32_t);
+ 
+-  ss = memset(sna-kgem.batch + sna-kgem.surface, 0, sizeof(*ss));
+-  ss-ss0.surface_type = GEN7_SURFACE_2D;
+-  ss-ss0.surface_format = src_surf_format;
++  assert(bo-tiling == I915_TILING_NONE);
+ 
+-  ss-ss1.base_addr =
+-  kgem_add_reloc(sna-kgem,
+- sna-kgem.surface + 1,
+- src_bo,
++  ss = sna-kgem.batch + bind;
++  ss[0] = (GEN7_SURFACE_2D  GEN7_SURFACE_TYPE_SHIFT |
++   format  GEN7_SURFACE_FORMAT_SHIFT);
++  ss[1] = kgem_add_reloc(sna-kgem, bind + 1, bo,
+  I915_GEM_DOMAIN_SAMPLER  16,
+- src_offset);
++ offset);
++  ss[2] = ((width - 1)   GEN7_SURFACE_WIDTH_SHIFT |
++   (height - 1)  GEN7_SURFACE_HEIGHT_SHIFT);
++  ss[3] = (pitch - 1)  GEN7_SURFACE_PITCH_SHIFT;
++  ss[4] = 0;
++  ss[5] = 0;
++  ss[6] = 0;
++  ss[7] = 0;
++  if (sna-kgem.gen == 075)
++  ss[7] |= HSW_SURFACE_SWIZZLE(RED, GREEN, BLUE, ALPHA);
+ 
+-  ss-ss2.width  = src_width - 1;
+-  ss-ss2.height = src_height - 1;
+-  ss-ss3.pitch  = src_pitch - 1;
++  DBG(([%x] bind bo(handle=%d, addr=%d), format=%d, width=%d, height=%d, 
pitch=%d, offset=%d\n,
++   bind, bo-handle, ss[1],
++   format, width, height, pitch, offset));
+ 
+-  return sna-kgem.surface * sizeof(uint32_t);
++  return bind * sizeof(uint32_t);
+ }
+ 
+ static void gen7_emit_video_state(struct sna *sna,
+--
+cgit v0.9.0.2-2-gbebe


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1vpnn7-te...@vasks.debian.org

xserver-xorg-video-intel: Changes to 'ubuntu'

[Christopher Halse Rogers]

 debian/changelog  |   10 
 debian/patches/check-hosted-initialisation-succeeds.patch |   26 
 debian/patches/disable-unneeded-functions-when-hosted.patch   |  261 ++
 debian/patches/dont-copy-fbcon-if-hosted.patch|   26 
 debian/patches/fix-spelling-of-caching.patch  |  180 +
 debian/patches/more-modesetting-disablement-when-hosted.patch |  235 ++
 debian/patches/series |9 
 debian/patches/unwrap-legacy-modesetting-when-hosted.patch|   57 
 debian/patches/xmir.patch |  940 +-
 9 files changed, 949 insertions(+), 795 deletions(-)

New commits:
commit 55d225496e8a2f90d03cdf093e9c5bc6a5562f40
Author: Christopher James Halse Rogers r...@ubuntu.com
Date:   Fri Sep 6 17:31:44 2013 +1000

Fix cacheline dirt corruption

diff --git a/debian/changelog b/debian/changelog
index 408b179..02ac4bd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+xserver-xorg-video-intel (2:2.21.14-4ubuntu4) saucy; urgency=low
+
+  * XMir: Make a conservative guess as to whether the Mir buffer will be used
+for scanout, and take caching decisions appropriately. Fixes cache dirt
+transient horizontal-line misrendering with Mir bypass (LP: #1218735)
+  * xmir.patch: Split monolithic concatenated patch out into a quilt patch
+series.
+
+ -- Christopher James Halse Rogers r...@ubuntu.com  Thu, 05 Sep 2013 
15:56:49 +1000
+
 xserver-xorg-video-intel (2:2.21.14-4ubuntu3) saucy; urgency=low
 
   * Fix valgrind-enabling check
diff --git a/debian/patches/check-hosted-initialisation-succeeds.patch 
b/debian/patches/check-hosted-initialisation-succeeds.patch
new file mode 100644
index 000..829e3f4
--- /dev/null
+++ b/debian/patches/check-hosted-initialisation-succeeds.patch
@@ -0,0 +1,26 @@
+commit 394978867edf3746c285491db6be41abfe325d87
+Author: Chris Wilson ch...@chris-wilson.co.uk
+Date:   Wed Aug 14 08:38:52 2013 +0100
+
+sna: Check that we successfully install the required hosting midlayer
+
+Signed-off-by: Chris Wilson ch...@chris-wilson.co.uk
+
+diff --git a/src/sna/sna_driver.c b/src/sna/sna_driver.c
+index c27deb6..83a5bba 100644
+--- a/src/sna/sna_driver.c
 b/src/sna/sna_driver.c
+@@ -430,6 +430,13 @@ static Bool sna_pre_init(ScrnInfoPtr scrn, int flags)
+   goto cleanup;
+   }
+ 
++  /* Sanity check */
++  if (hosted()  (sna-flags  SNA_IS_HOSTED) == 0) {
++  xf86DrvMsg(scrn-scrnIndex, X_ERROR,
++ Failed to setup hosted device.\n);
++  goto cleanup;
++  }
++
+   preferred_depth = sna-info-gen  030 ? 15 : 24;
+   if (!fb_supports_depth(fd, preferred_depth))
+   preferred_depth = 24;
diff --git a/debian/patches/disable-unneeded-functions-when-hosted.patch 
b/debian/patches/disable-unneeded-functions-when-hosted.patch
new file mode 100644
index 000..69198fd
--- /dev/null
+++ b/debian/patches/disable-unneeded-functions-when-hosted.patch
@@ -0,0 +1,261 @@
+commit b6b5c3f009585151eb772dfc2526843c7cee82b3
+Author: Chris Wilson ch...@chris-wilson.co.uk
+Date:   Fri Aug 9 11:34:39 2013 +0100
+
+intel: Disable incompatible features whilst hosted
+
+Start adding the infrastructure to disable direct hardware access if X
+is being run under a system compositor (aka hosted).
+
+Signed-off-by: Chris Wilson ch...@chris-wilson.co.uk
+
+diff --git a/src/intel_device.c b/src/intel_device.c
+index c5f0a38..d9ff8bc 100644
+--- a/src/intel_device.c
 b/src/intel_device.c
+@@ -92,7 +92,7 @@ static int __intel_check_device(int fd)
+   if (drmIoctl(fd, DRM_IOCTL_I915_GETPARAM, gp))
+   ret = FALSE;
+   }
+-  if (ret) {
++  if (ret  !hosted()) {
+   struct drm_mode_card_res res;
+ 
+   memset(res, 0, sizeof(res));
+@@ -199,6 +199,12 @@ int intel_open_device(int entity_num,
+   dev-open_count = 0;
+   dev-master_count = 0;
+ 
++  /* If hosted under a system compositor, just pretend to be master */
++  if (hosted()) {
++  dev-open_count++;
++  dev-master_count++;
++  }
++
+   xf86GetEntityPrivate(entity_num, intel_device_key)-ptr = dev;
+ 
+   return fd;
+@@ -222,6 +228,8 @@ int intel_get_device(ScrnInfoPtr scrn)
+   drmSetVersion sv;
+   int retry = 2000;
+ 
++  assert(!hosted());
++
+   /* Check that what we opened was a master or a
+* master-capable FD, by setting the version of the
+* interface we'll use to talk to it.
+@@ -267,6 +275,7 @@ int intel_get_master(ScrnInfoPtr scrn)
+   if (dev-master_count++ == 0) {
+   int retry = 2000;
+ 
++  assert(!hosted());
+   do {
+   ret = drmSetMaster(dev-fd);
+   if (ret == 0)
+@@ -288,6 +297,7 

xserver-xorg-video-intel: Changes to 'ubuntu'

[Christopher Halse Rogers]

 debian/changelog  |6 
 debian/control|2 
 debian/patches/xmir.patch |  379 ++
 3 files changed, 384 insertions(+), 3 deletions(-)

New commits:
commit 74831788f4aba5e82118760a320064127a1e9ec9
Author: Christopher James Halse Rogers r...@ubuntu.com
Date:   Thu Aug 29 20:08:51 2013 +1000

Update for new XMir API

diff --git a/debian/changelog b/debian/changelog
index 01f9bc2..408b179 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,10 @@
-xserver-xorg-video-intel (2:2.21.14-4ubuntu3) UNRELEASED; urgency=low
+xserver-xorg-video-intel (2:2.21.14-4ubuntu3) saucy; urgency=low
 
   * Fix valgrind-enabling check
+  * Update for new XMir API
+  * Bump build-depend on xserver-xorg-dev to ensure new XMir API
 
- -- Christopher James Halse Rogers r...@ubuntu.com  Mon, 26 Aug 2013 
18:54:40 +1000
+ -- Christopher James Halse Rogers r...@ubuntu.com  Thu, 29 Aug 2013 
20:08:05 +1000
 
 xserver-xorg-video-intel (2:2.21.14-4ubuntu2) saucy; urgency=low
 
diff --git a/debian/control b/debian/control
index ced4c6c..7ed1f5e 100644
--- a/debian/control
+++ b/debian/control
@@ -9,7 +9,7 @@ Build-Depends:
  dh-autoreconf,
  pkg-config,
 # Depend on latest server to ensure XMir support
- xserver-xorg-dev (= 2:1.14.2-0ubuntu4~),
+ xserver-xorg-dev (= 2:1.14.2.901-2ubuntu4~),
  x11proto-core-dev,
  x11proto-fonts-dev,
  x11proto-xinerama-dev,
diff --git a/debian/patches/xmir.patch b/debian/patches/xmir.patch
index 454882e..05155a6 100644
--- a/debian/patches/xmir.patch
+++ b/debian/patches/xmir.patch
@@ -767,3 +767,382 @@ index 000..a7c882d
 +}
 +
 +#endif
+commit 5c4c1309ed043cce920c97633c5d5228d60308b8
+Author: Christopher James Halse Rogers r...@ubuntu.com
+Date:   Thu Aug 22 11:17:04 2013 +1000
+
+Update to new XMir API
+
+diff --git a/src/sna/sna_xmir.c b/src/sna/sna_xmir.c
+index a7c882d..4ecdad9 100644
+--- a/src/sna/sna_xmir.c
 b/src/sna/sna_xmir.c
+@@ -50,9 +50,9 @@
+ #define FORCE_FULL_REDRAW 0
+ 
+ static void
+-sna_xmir_copy_to_mir(WindowPtr win, RegionPtr region)
++sna_xmir_copy_to_mir(xmir_window *xmir_win, RegionPtr region)
+ {
+-  PixmapPtr src = get_window_pixmap(win);
++  PixmapPtr src = get_window_pixmap(xmir_window_to_windowptr(xmir_win));
+   struct sna *sna = to_sna_from_pixmap(src);
+   struct sna_pixmap *priv;
+   struct kgem_bo *bo;
+@@ -70,7 +70,7 @@ sna_xmir_copy_to_mir(WindowPtr win, RegionPtr region)
+   /* XXX size and pitch are bogus, but only used for sanity checks */
+ 
+   bo = kgem_create_for_prime(sna-kgem,
+- xmir_prime_fd_for_window(win),
++ xmir_window_get_fd(xmir_win),
+  priv-gpu_bo-pitch * src-drawable.height);
+   if (bo == NULL)
+   return;
+@@ -94,32 +94,15 @@ sna_xmir_copy_to_mir(WindowPtr win, RegionPtr region)
+  src, bo, 0, 0,
+  boxes, nbox, COPY_LAST)) {
+   kgem_submit(sna-kgem);
+-  xmir_submit_rendering_for_window(win, region);
++  xmir_submit_rendering_for_window(xmir_win, region);
+   }
+ 
+   kgem_bo_destroy(sna-kgem, bo);
+ }
+ 
+-static void
+-sna_xmir_buffer_available(WindowPtr win)
+-{
+-  RegionPtr region = xmir_window_get_dirty(win);
+-  if (RegionNotEmpty(region))
+-  sna_xmir_copy_to_mir(win, region);
+-}
+-
+-static void
+-sna_xmir_submit_dirty_window(WindowPtr win)
+-{
+-  if (!xmir_window_has_free_buffer(win))
+-  return;
+-
+-  sna_xmir_copy_to_mir(win, xmir_window_get_dirty(win));
+-}
+-
+ static const xmir_driver sna_xmir_driver = {
+   XMIR_DRIVER_VERSION,
+-  sna_xmir_buffer_available
++  sna_xmir_copy_to_mir
+ };
+ 
+ bool sna_xmir_create(struct sna *sna)
+@@ -157,7 +140,7 @@ void sna_xmir_post_damage(struct sna *sna)
+   return;
+ 
+   xmir_screen_for_each_damaged_window(sna-xmir,
+-  sna_xmir_submit_dirty_window);
++  sna_xmir_copy_to_mir);
+ }
+ 
+ #endif
+commit 1edd7a1d8e54daf628df1317e65c96c903c72f85
+Author: Christopher James Halse Rogers r...@ubuntu.com
+Date:   Fri Aug 23 10:20:49 2013 +1000
+
+Don't call sna_mode_update when SNA_IS_HOSTED
+
+diff --git a/src/sna/sna_driver.c b/src/sna/sna_driver.c
+index 6fe49c9..7870a47 100644
+--- a/src/sna/sna_driver.c
 b/src/sna/sna_driver.c
+@@ -207,7 +207,8 @@ static Bool sna_become_master(struct sna *sna)
+   sna_set_fallback_mode(scrn);
+   }
+ 
+-  sna_mode_update(sna);
++  if (!(sna-flags  SNA_IS_HOSTED))
++  sna_mode_update(sna);
+   return TRUE;
+ }
+ 
+commit 0c51dfcf7f2ef610fd3dc80bce71fc8c0a6f47cc
+Author: Christopher James Halse Rogers r...@ubuntu.com
+Date:   Fri Aug 23 14:36:48 2013 +1000
+
+Fix rendering when copying from xmir_win that only partially covers 

xserver-xorg-video-intel: Changes to 'ubuntu'

[Christopher Halse Rogers]

 debian/changelog |6 ++
 debian/rules |4 ++--
 2 files changed, 8 insertions(+), 2 deletions(-)

New commits:
commit 79844b60a0b679f511dc706f5c4bb51d936c3120
Author: Christopher James Halse Rogers r...@ubuntu.com
Date:   Mon Aug 26 18:54:57 2013 +1000

Fix valgrind-enabling check

diff --git a/debian/changelog b/debian/changelog
index 4f1dc36..01f9bc2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-video-intel (2:2.21.14-4ubuntu3) UNRELEASED; urgency=low
+
+  * Fix valgrind-enabling check
+
+ -- Christopher James Halse Rogers r...@ubuntu.com  Mon, 26 Aug 2013 
18:54:40 +1000
+
 xserver-xorg-video-intel (2:2.21.14-4ubuntu2) saucy; urgency=low
 
   * Re-add changes to xmir.
diff --git a/debian/rules b/debian/rules
index 4943e58..67a6120 100755
--- a/debian/rules
+++ b/debian/rules
@@ -8,9 +8,9 @@ export CPPFLAGS := $(shell dpkg-buildflags --get CPPFLAGS)
 export CFLAGS := $(shell dpkg-buildflags --get CFLAGS)
 export LDFLAGS := $(shell dpkg-buildflags --get LDFLAGS)
 
-DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
+DEB_HOST_ARCH_OS ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
 
-ifeq ($(DEB_HOST_ARCH), linux)
+ifeq ($(DEB_HOST_ARCH_OS), linux)
 valgrind = --enable-valgrind
 else
 valgrind = --disable-valgrind


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1vdszm-0008jw...@vasks.debian.org

xserver-xorg-video-intel: Changes to 'ubuntu'

[Maarten Lankhorst]

 debian/changelog |6 ++
 1 file changed, 6 insertions(+)

New commits:
commit 7901365471093b5cbb19e10bc28ff2e00a717129
Author: Maarten Lankhorst maarten.lankho...@canonical.com
Date:   Thu Aug 22 09:18:20 2013 +0200

Re-add changes to xmir.

diff --git a/debian/changelog b/debian/changelog
index b93dc81..4f1dc36 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-video-intel (2:2.21.14-4ubuntu2) saucy; urgency=low
+
+  * Re-add changes to xmir.
+
+ -- Maarten Lankhorst maarten.lankho...@ubuntu.com  Thu, 15 Aug 2013 
10:36:22 +0200
+
 xserver-xorg-video-intel (2:2.21.14-4ubuntu1) saucy; urgency=low
 
   * New upstream release. (LP: #1204261, #1203273, #1172450)


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1vcpa0-0008ak...@vasks.debian.org

xserver-xorg-video-intel: Changes to 'ubuntu'

[Christopher Halse Rogers]

 debian/changelog   |   14 
 debian/patches/fix-preinit-cleanup-paths.patch |   94 +++
 debian/patches/series  |2 
 debian/patches/xmir.patch  |  714 +++--
 4 files changed, 554 insertions(+), 270 deletions(-)

New commits:
commit bfc1b6badcc5010cabfed0509894853895364aa5
Author: Christopher James Halse Rogers r...@ubuntu.com
Date:   Thu Aug 15 11:50:39 2013 +1000

Update XMir patch following ickle's branch

diff --git a/debian/changelog b/debian/changelog
index 6a74bb1..cfbca0c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+xserver-xorg-video-intel (2:2.21.12-1ubuntu3) saucy; urgency=low
+
+  * fix-preinit-cleanup-paths.patch: Upstream cherrypick to fix leaks in
+sna_pre_init failure paths. Prerequisite for new XMir patch.
+  * xmir.patch: Update to follow upstream developments
+
+ -- Christopher James Halse Rogers r...@ubuntu.com  Thu, 15 Aug 2013 
11:46:10 +1000
+
 xserver-xorg-video-intel (2:2.21.12-1ubuntu2) saucy; urgency=low
 
   * Fix crash in sna_adjust_frame under XMir (LP: #1212065)
diff --git a/debian/patches/fix-preinit-cleanup-paths.patch 
b/debian/patches/fix-preinit-cleanup-paths.patch
new file mode 100644
index 000..72065a5
--- /dev/null
+++ b/debian/patches/fix-preinit-cleanup-paths.patch
@@ -0,0 +1,94 @@
+commit d7465ece29c9ae665a5a9f5bdac764a19062786e
+Author: Chris Wilson ch...@chris-wilson.co.uk
+Date:   Mon Jul 29 21:55:29 2013 +0100
+
+sna: Cleanup along all error paths in sna_pre_init()
+
+Only one out of a dozen error paths actually freed the locally allocated
+memory, oops.
+
+Signed-off-by: Chris Wilson ch...@chris-wilson.co.uk
+
+diff --git a/src/sna/sna_driver.c b/src/sna/sna_driver.c
+index 9c338bb..16dbc91 100644
+--- a/src/sna/sna_driver.c
 b/src/sna/sna_driver.c
+@@ -276,15 +276,6 @@ cleanup_front:
+   return FALSE;
+ }
+ 
+-static void PreInitCleanup(ScrnInfoPtr scrn)
+-{
+-  if (!scrn || !scrn-driverPrivate)
+-  return;
+-
+-  free(scrn-driverPrivate);
+-  scrn-driverPrivate = NULL;
+-}
+-
+ static void sna_selftest(void)
+ {
+   sna_damage_selftest();
+@@ -434,7 +425,7 @@ static Bool sna_pre_init(ScrnInfoPtr scrn, int flags)
+   if (fd == -1) {
+   xf86DrvMsg(scrn-scrnIndex, X_ERROR,
+  Failed to become DRM master.\n);
+-  return FALSE;
++  goto cleanup;
+   }
+ 
+   preferred_depth = sna-info-gen  030 ? 15 : 24;
+@@ -444,7 +435,7 @@ static Bool sna_pre_init(ScrnInfoPtr scrn, int flags)
+   if (!xf86SetDepthBpp(scrn, preferred_depth, 0, 0,
+Support32bppFb |
+SupportConvert24to32 | PreferConvert24to32))
+-  return FALSE;
++  goto cleanup;
+ 
+   switch (scrn-depth) {
+   case 8:
+@@ -458,18 +449,18 @@ static Bool sna_pre_init(ScrnInfoPtr scrn, int flags)
+   xf86DrvMsg(scrn-scrnIndex, X_ERROR,
+  Given depth (%d) is not supported by the Intel 
driver and this chipset.\n,
+  scrn-depth);
+-  return FALSE;
++  goto cleanup;
+   }
+   xf86PrintDepthBpp(scrn);
+ 
+   if (!xf86SetWeight(scrn, defaultWeight, defaultWeight))
+-  return FALSE;
++  goto cleanup;
+   if (!xf86SetDefaultVisual(scrn, -1))
+-  return FALSE;
++  goto cleanup;
+ 
+   sna-Options = intel_options_get(scrn);
+   if (sna-Options == NULL)
+-  return FALSE;
++  goto cleanup;
+ 
+   sna_setup_capabilities(scrn, fd);
+ 
+@@ -523,8 +514,7 @@ static Bool sna_pre_init(ScrnInfoPtr scrn, int flags)
+   if (!sna_mode_pre_init(scrn, sna)) {
+   xf86DrvMsg(scrn-scrnIndex, X_ERROR,
+  No outputs and no modes.\n);
+-  PreInitCleanup(scrn);
+-  return FALSE;
++  goto cleanup;
+   }
+   scrn-currentMode = scrn-modes;
+ 
+@@ -536,6 +526,11 @@ static Bool sna_pre_init(ScrnInfoPtr scrn, int flags)
+   sna-dri_available = !!xf86LoadSubModule(scrn, dri2);
+ 
+   return TRUE;
++
++cleanup:
++  scrn-driverPrivate = (void *)((uintptr_t)sna-info | 1);
++  free(sna);
++  return FALSE;
+ }
+ 
+ static void
diff --git a/debian/patches/series b/debian/patches/series
index c72571f..765b2c3 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,4 +2,6 @@
 sna-note-that-borderClip-region.patch
 sna-fix-typo-in-computing-box.patch
 sna-fall-back-to-proc-cpuinfo.patch
+
+fix-preinit-cleanup-paths.patch
 xmir.patch
diff --git a/debian/patches/xmir.patch b/debian/patches/xmir.patch
index 467de7b..454882e 100644
--- a/debian/patches/xmir.patch
+++ b/debian/patches/xmir.patch
@@ -1,80 +1,33 @@
-commit ea3344d571ff728f5cb84c6920635e552090ec7c
+commit b6b5c3f009585151eb772dfc2526843c7cee82b3
 

xserver-xorg-video-intel: Changes to 'ubuntu'

[Christopher Halse Rogers]

 debian/changelog  |5 
 debian/control|3 
 debian/patches/series |1 
 debian/patches/xmir.patch |  595 ++
 4 files changed, 602 insertions(+), 2 deletions(-)

New commits:
commit 293f821ee866f13097ed68e0314d16d11d1e0388
Author: Christopher James Halse Rogers r...@ubuntu.com
Date:   Thu Aug 1 16:08:32 2013 +1000

Add initial XMir patch

diff --git a/debian/changelog b/debian/changelog
index b25ec80..6093547 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,7 +9,10 @@ xserver-xorg-video-intel (2:2.21.12-1ubuntu1) UNRELEASED; 
urgency=low
   * Cherry-pick 3 commits from upstream git to fix SNA regressions in 2.21.12
 (34c9b759f, 7f76a2bf3, a764a6e69b)
 
- -- Maarten Lankhorst maarten.lankho...@ubuntu.com  Thu, 18 Jul 2013 
13:51:58 +0200
+  [ Christopher James Halse Rogers ]
+  * Add initial XMir support patch
+
+ -- Christopher James Halse Rogers r...@ubuntu.com  Thu, 01 Aug 2013 
16:06:42 +1000
 
 xserver-xorg-video-intel (2:2.21.12-1) UNRELEASED; urgency=low
 
diff --git a/debian/control b/debian/control
index 716a434..b686176 100644
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,8 @@ Build-Depends:
  debhelper (= 8),
  dh-autoreconf,
  pkg-config,
- xserver-xorg-dev (= 2:1.11.99.901),
+# Depend on latest server to ensure XMir support
+ xserver-xorg-dev (= 2:1.14.2-0ubuntu4~),
  x11proto-core-dev,
  x11proto-fonts-dev,
  x11proto-xinerama-dev,
diff --git a/debian/patches/series b/debian/patches/series
index 2c1177d..c72571f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@
 sna-note-that-borderClip-region.patch
 sna-fix-typo-in-computing-box.patch
 sna-fall-back-to-proc-cpuinfo.patch
+xmir.patch
diff --git a/debian/patches/xmir.patch b/debian/patches/xmir.patch
new file mode 100644
index 000..0ca2bc2
--- /dev/null
+++ b/debian/patches/xmir.patch
@@ -0,0 +1,595 @@
+commit ea3344d571ff728f5cb84c6920635e552090ec7c
+Author: Chris Wilson ch...@chris-wilson.co.uk
+Date:   Wed Jul 24 01:44:30 2013 +0100
+
+sna: Preliminary patch for XMir
+
+For the intrepid explorer, who is desperate to encounter all the bugs we
+fixed long ago. /o\
+
+Signed-off-by: Chris Wilson ch...@chris-wilson.co.uk
+
+Index: xf86-video-intel/src/Makefile.am
+===
+--- xf86-video-intel.orig/src/Makefile.am  2013-08-01 16:06:54.220945668 
+1000
 xf86-video-intel/src/Makefile.am   2013-08-01 16:06:54.212945668 +1000
+@@ -46,6 +46,7 @@
+   intel_device.c \
+   intel_options.c \
+   intel_module.c \
++  intel_xmir.h \
+   compat-api.h \
+   $(NULL)
+ 
+Index: xf86-video-intel/src/intel_device.c
+===
+--- xf86-video-intel.orig/src/intel_device.c   2013-08-01 16:06:54.220945668 
+1000
 xf86-video-intel/src/intel_device.c2013-08-01 16:06:54.212945668 
+1000
+@@ -92,7 +92,7 @@
+   if (drmIoctl(fd, DRM_IOCTL_I915_GETPARAM, gp))
+   ret = FALSE;
+   }
+-  if (ret) {
++  if (ret  !xorgMir) {
+   struct drm_mode_card_res res;
+ 
+   memset(res, 0, sizeof(res));
+@@ -121,10 +121,34 @@
+   return fd;
+ }
+ 
++static int __intel_open_xmir(const struct pci_device *pci,
++   char **path)
++{
++  char id[20];
++  int fd;
++
++  snprintf(id, sizeof(id),
++   pci:%04x:%02x:%02x.%d,
++   pci-domain, pci-bus, pci-dev, pci-func);
++  fd = xmir_get_drm_fd(id);
++  if (fd == -1)
++  return -1;
++
++  if (*path == NULL) /* XXX Fix Xmir - it knows both the fd and path */
++  *path = drmGetDeviceNameFromFd(fd);
++  if (*path == NULL)
++  fd = -1;
++
++  return fd;
++}
++
+ static int __intel_open_device(const struct pci_device *pci, char **path)
+ {
+   int fd;
+ 
++  if (xorgMir)
++  return __intel_open_xmir(pci, path);
++
+   if (*path == NULL) {
+   char id[20];
+   int ret;
+@@ -199,6 +223,12 @@
+   dev-open_count = 0;
+   dev-master_count = 0;
+ 
++  /* If hosted under a system compositor, just pretend to be master */
++  if (xorgMir) {
++  dev-open_count++;
++  dev-master_count++;
++  }
++
+   xf86GetEntityPrivate(entity_num, intel_device_key)-ptr = dev;
+ 
+   return fd;
+@@ -222,6 +252,8 @@
+   drmSetVersion sv;
+   int retry = 2000;
+ 
++  assert(!xorgMir);
++
+   /* Check that what we opened was a master or a
+* master-capable FD, by setting the version of the
+* interface we'll use to talk to it.
+@@ -267,6 +299,7 @@
+   if (dev-master_count++ == 0) {
+   int retry = 2000;
+ 
++  assert(!xorgMir);
+   do {
+   

xserver-xorg-video-intel: Changes to 'ubuntu'

[Christopher Halse Rogers]

 debian/changelog |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit a6bfcf6faff436754ce57195ec22de5048f00f9d
Author: Christopher James Halse Rogers r...@ubuntu.com
Date:   Fri Aug 2 20:29:15 2013 +1000

Release to Saucy

diff --git a/debian/changelog b/debian/changelog
index 6093547..ca51f66 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xserver-xorg-video-intel (2:2.21.12-1ubuntu1) UNRELEASED; urgency=low
+xserver-xorg-video-intel (2:2.21.12-1ubuntu1) saucy; urgency=low
 
   [ Maarten Lankhorst ]
   * Merge from unreleased debian git (LP: #1198409, #1173557, #1199746, 
#1200766)


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1v5cbv-0001bu...@vasks.debian.org

xserver-xorg-video-intel: Changes to 'ubuntu'

[Robert Hooker]

 debian/changelog |5 +
 debian/patches/series|3 
 debian/patches/sna-fall-back-to-proc-cpuinfo.patch   |   85 +
 debian/patches/sna-fix-typo-in-computing-box.patch   |   77 
 debian/patches/sna-note-that-borderClip-region.patch |   90 +++
 5 files changed, 260 insertions(+)

New commits:
commit 0f0f30ba9741cc6ba0d3f0d614fd759eb831961c
Author: Robert Hooker sarv...@ubuntu.com
Date:   Fri Jul 19 13:38:13 2013 -0400

Cherry-pick 3 SNA fixes needed for 2.21.12.

diff --git a/debian/changelog b/debian/changelog
index 25a3735..b25ec80 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,14 @@
 xserver-xorg-video-intel (2:2.21.12-1ubuntu1) UNRELEASED; urgency=low
 
+  [ Maarten Lankhorst ]
   * Merge from unreleased debian git (LP: #1198409, #1173557, #1199746, 
#1200766)
 Remaining changes:
 - Use SNA by default.
 
+  [ Robert Hooker ]
+  * Cherry-pick 3 commits from upstream git to fix SNA regressions in 2.21.12
+(34c9b759f, 7f76a2bf3, a764a6e69b)
+
  -- Maarten Lankhorst maarten.lankho...@ubuntu.com  Thu, 18 Jul 2013 
13:51:58 +0200
 
 xserver-xorg-video-intel (2:2.21.12-1) UNRELEASED; urgency=low
diff --git a/debian/patches/series b/debian/patches/series
index 9ed72bb..2c1177d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,4 @@
 # empty for now
+sna-note-that-borderClip-region.patch
+sna-fix-typo-in-computing-box.patch
+sna-fall-back-to-proc-cpuinfo.patch
diff --git a/debian/patches/sna-fall-back-to-proc-cpuinfo.patch 
b/debian/patches/sna-fall-back-to-proc-cpuinfo.patch
new file mode 100644
index 000..0af1a3b
--- /dev/null
+++ b/debian/patches/sna-fall-back-to-proc-cpuinfo.patch
@@ -0,0 +1,85 @@
+From 7f76a2bf319f59d463a1f96974b03d7c651847dd Mon Sep 17 00:00:00 2001
+From: Chris Wilson ch...@chris-wilson.co.uk
+Date: Wed, 17 Jul 2013 09:22:17 +
+Subject: sna: Fall back to /proc/cpuinfo parsing if cpuid cache size probe 
fails
+
+Older hardware does not support cache size probing via cpuid4, so we
+need to implement the older algorithm which requires a table based
+lookup. (And in hindsight, why I thought cache probing via cpuid to be
+quite hairy.) For the moment, just use the value found in /proc/cpuinfo.
+
+Reported-by: Oscar Dario Trujillo Tejada oscard...@gmail.com
+Reported-by: Ferry Toth ft...@telfort.nl
+Signed-off-by: Chris Wilson ch...@chris-wilson.co.uk
+---
+diff --git a/src/sna/kgem.c b/src/sna/kgem.c
+index 605e049..0054cdf 100644
+--- a/src/sna/kgem.c
 b/src/sna/kgem.c
+@@ -698,7 +698,7 @@ total_ram_size(void)
+ }
+ 
+ static unsigned
+-cpu_cache_size(void)
++cpu_cache_size__cpuid4(void)
+ {
+   /* Deterministic Cache Parmaeters (Function 04h):
+*When EAX is initialized to a value of 4, the CPUID instruction
+@@ -740,6 +740,39 @@ cpu_cache_size(void)
+return llc_size;
+ }
+ 
++static unsigned
++cpu_cache_size(void)
++{
++  unsigned size;
++  FILE *file;
++
++  size = cpu_cache_size__cpuid4();
++  if (size)
++  return size;
++
++  file = fopen(/proc/cpuinfo, r);
++  if (file) {
++  size_t len = 0;
++  char *line = NULL;
++  while (getline(line, len, file) != -1) {
++  int kb;
++  if (sscanf(line, cache size : %d KB, kb) == 1) {
++  /* Paranoid check against gargantuan caches */
++  if (kb = 120)
++  size = kb * 1024;
++  break;
++  }
++  }
++  free(line);
++  fclose(file);
++  }
++
++  if (size == 0)
++  size = 64 * 1024;
++
++  return size;
++}
++
+ static int gem_param(struct kgem *kgem, int name)
+ {
+   drm_i915_getparam_t gp;
+@@ -1242,6 +1275,7 @@ void kgem_init(struct kgem *kgem, int fd, struct 
pci_device *dev, unsigned gen)
+   kgem-buffer_size = kgem-half_cpu_cache_pages  12;
+   DBG((%s: buffer size=%d [%d KiB]\n, __FUNCTION__,
+kgem-buffer_size, kgem-buffer_size / 1024));
++  assert(kgem-buffer_size);
+ 
+   kgem-max_object_size = 3 * (kgem-aperture_high  12)  10;
+   kgem-max_gpu_size = kgem-max_object_size;
+@@ -5616,6 +5650,7 @@ struct kgem_bo *kgem_create_buffer(struct kgem *kgem,
+   alloc = ALIGN(size, kgem-buffer_size);
+   if (alloc  MAX_CACHE_SIZE)
+   alloc = PAGE_ALIGN(size);
++  assert(alloc);
+ 
+   if (alloc  kgem-aperture_mappable / 4)
+   flags = ~KGEM_BUFFER_INPLACE;
+--
+cgit v0.9.0.2-2-gbebe
diff --git a/debian/patches/sna-fix-typo-in-computing-box.patch 
b/debian/patches/sna-fix-typo-in-computing-box.patch
new file mode 100644
index 000..f5214f8
--- /dev/null
+++ b/debian/patches/sna-fix-typo-in-computing-box.patch
@@ -0,0 +1,77 @@
+From 

xserver-xorg-video-intel: Changes to 'ubuntu'

[Robert Hooker]

 debian/changelog |8 
 1 file changed, 8 insertions(+)

New commits:
commit 5fcf9659c2702132c26ebddeed65495c24333036
Author: Robert Hooker sarv...@ubuntu.com
Date:   Thu Jul 18 17:10:16 2013 -0400

Bump changelog and mark bug closures

diff --git a/debian/changelog b/debian/changelog
index 1b35f0c..25a3735 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+xserver-xorg-video-intel (2:2.21.12-1ubuntu1) UNRELEASED; urgency=low
+
+  * Merge from unreleased debian git (LP: #1198409, #1173557, #1199746, 
#1200766)
+Remaining changes:
+- Use SNA by default.
+
+ -- Maarten Lankhorst maarten.lankho...@ubuntu.com  Thu, 18 Jul 2013 
13:51:58 +0200
+
 xserver-xorg-video-intel (2:2.21.12-1) UNRELEASED; urgency=low
 
   [ Timo Aaltonen ]


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1uzvt4-0001z4...@vasks.debian.org

xserver-xorg-video-intel: Changes to 'ubuntu'

[Maarten Lankhorst]

 ChangeLog   | 1898 
++
 NEWS|  131 
 configure.ac|   21 
 debian/changelog|   30 
 debian/control  |2 
 debian/patches/0002-Update-manpage-for-new-accelmethod-option.patch |   15 
 debian/patches/series   |3 
 debian/patches/sna-make-sure-the-source-is-coherent.diff|   61 
 debian/rules|8 
 man/intel.man   |   13 
 src/Makefile.am |   63 
 src/intel_device.c  |  325 +
 src/intel_display.c |2 
 src/intel_driver.c  |7 
 src/intel_driver.h  |8 
 src/intel_list.h|2 
 src/intel_module.c  |   59 
 src/intel_options.c |2 
 src/intel_options.h |2 
 src/sna/Makefile.am |2 
 src/sna/blt.c   |  604 ++-
 src/sna/brw/brw_eu.h|2 
 src/sna/brw/brw_eu_debug.c  |   95 
 src/sna/compiler.h  |4 
 src/sna/gen2_render.c   |   40 
 src/sna/gen3_render.c   |   38 
 src/sna/gen4_render.c   |   82 
 src/sna/gen5_render.c   |   89 
 src/sna/gen6_render.c   |   47 
 src/sna/gen7_render.c   |   95 
 src/sna/kgem.c  |  476 +-
 src/sna/kgem.h  |  107 
 src/sna/sna.h   |   16 
 src/sna/sna_accel.c | 1060 
-
 src/sna/sna_blt.c   |  247 -
 src/sna/sna_composite.c |8 
 src/sna/sna_damage.c|   54 
 src/sna/sna_display.c   |  982 
+++--
 src/sna/sna_display_fake.c  |   59 
 src/sna/sna_dri.c   |  174 
 src/sna/sna_driver.c|  160 
 src/sna/sna_glyphs.c|3 
 src/sna/sna_gradient.c  |   13 
 src/sna/sna_io.c|  322 +
 src/sna/sna_render.c|   84 
 src/sna/sna_render.h|6 
 src/sna/sna_tiling.c|  116 
 src/sna/sna_trapezoids.c|7 
 src/sna/sna_video.c |   44 
 src/sna/sna_video.h |3 
 src/sna/sna_video_overlay.c |   10 
 src/sna/sna_video_sprite.c  |5 
 src/sna/sna_video_textured.c|   20 
 test/Makefile.am|2 
 54 files changed, 5911 insertions(+), 1817 deletions(-)

New commits:
commit b8b686d1502fdad83896f86cc2affa46e56e6c5e
Author: Maarten Lankhorst maarten.lankho...@canonical.com
Date:   Wed Jul 17 12:08:28 2013 +0200

bump changelogs, new upstream release

diff --git a/ChangeLog b/ChangeLog
index 9c05cdc..c82650d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,602 @@
+commit e83e7e60f41cb29132d5eef60af16b65b1b3cd4e
+Author: Chris Wilson ch...@chris-wilson.co.uk
+Date:   Sun Jul 14 09:31:39 2013 +0100
+
+2.21.12 release
+
+commit 0230ef72cbb2d3bcf7157548ddd52a71c0c771c5
+Author: Chris Wilson ch...@chris-wilson.co.uk
+Date:   Fri Jul 12 23:57:42 2013 +0100
+
+sna: Skip copying to the intermediate target if we will completely 
overwrite it
+
+Occasionally when forced to use an 

xserver-xorg-video-intel: Changes to 'ubuntu-quantal'

[Maarten Lankhorst]

 debian/changelog |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 486fc738ae5463fc8fcd5eb9324db8826848b95f
Author: Maarten Lankhorst maarten.lankho...@canonical.com
Date:   Wed Jul 10 09:58:02 2013 +0200

released to quantal at one point

diff --git a/debian/changelog b/debian/changelog
index aafe89e..527bb16 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xserver-xorg-video-intel (2:2.20.9-0ubuntu2.2) UNRELEASED; urgency=low
+xserver-xorg-video-intel (2:2.20.9-0ubuntu2.2) quantal-proposed; urgency=low
 
   * Added patches to add/fix Haswell pci-id's (LP: #1175533)
 - add-vlv-ids.diff


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1uwphw-61...@vasks.debian.org

xserver-xorg-video-intel: Changes to 'ubuntu-raring'

[Maarten Lankhorst]

New branch 'ubuntu-raring' 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: http://lists.debian.org/e1upe22-0006em...@vasks.debian.org

xserver-xorg-video-intel: Changes to 'ubuntu-quantal'

[Maarten Lankhorst]

New branch 'ubuntu-quantal' 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: http://lists.debian.org/e1upeae-0006ss...@vasks.debian.org

xserver-xorg-video-intel: Changes to 'ubuntu-quantal'

[Maarten Lankhorst]

 debian/changelog |8 
 debian/xserver-xorg-video-intel.udev |   10 --
 2 files changed, 8 insertions(+), 10 deletions(-)

New commits:
commit 5d05216ce23844b1f0c0b125287236c4d396a260
Author: Bryce Harrington br...@ubuntu.com
Date:   Thu Apr 11 13:24:19 2013 -0700

debian/xserver-xorg-video-intel.udev: Drop udev rule for gpu lockup apport 
hook.

This hook is now provided by the xdiagnose package. (LP: #997470)

diff --git a/debian/changelog b/debian/changelog
index a3a7306..e26 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+xserver-xorg-video-intel (2:2.20.9-0ubuntu2.1) quantal-proposed; urgency=low
+
+  * debian/xserver-xorg-video-intel.udev: Drop udev rule for gpu lockup
+apport hook.  This hook is now provided by the xdiagnose package.
+(LP: #997470)
+
+ -- Bryce Harrington br...@ubuntu.com  Thu, 11 Apr 2013 13:24:19 -0700
+
 xserver-xorg-video-intel (2:2.20.9-0ubuntu2) quantal; urgency=low
 
   [ Maarten Lankhorst ]
diff --git a/debian/xserver-xorg-video-intel.udev 
b/debian/xserver-xorg-video-intel.udev
deleted file mode 100644
index bd0ca5d..000
--- a/debian/xserver-xorg-video-intel.udev
+++ /dev/null
@@ -1,10 +0,0 @@
-# do not edit this file, it will be overwritten on update
-
-# Jesse Barnes on ubuntu-de...@lists.ubuntu.com:
-#   You'll get three events, one when the error is detected, one before the
-#   reset and one after.  Each has a different environment variable set; the
-#   initial error has ERROR=1, the pre-reset event has RESET=1 and the
-#   post-reset event has ERROR=0.
-
-# Disable freeze hook.
-SUBSYSTEM==drm, ACTION==change, ENV{ERROR}==1, 
RUN+=/usr/share/apport/apport-gpu-error-intel.py


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1upeeq-0007rd...@vasks.debian.org

xserver-xorg-video-intel: Changes to 'ubuntu-raring'

[Maarten Lankhorst]

 debian/changelog  |   11 +++
 debian/patches/series |5 +
 2 files changed, 16 insertions(+)

New commits:
commit a7810f2743cafcf6ff4b4ee74280978d89a50637
Author: Maarten Lankhorst maarten.lankho...@canonical.com
Date:   Wed Jun 19 11:14:12 2013 +0200

Added patches to add/fix Haswell pci-id's (LP: #1175533)

add-reserved-hsw-ids.diff
fix-hsw-gt3-names.diff
add-more-reserved-hsw-ids.diff
add-known-hsw-names.diff
add-more-correct-hsw-names.diff

diff --git a/debian/changelog b/debian/changelog
index be1fca2..b016f34 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+xserver-xorg-video-intel (2:2.21.6-0ubuntu4.1) UNRELEASED; urgency=low
+
+  * Added patches to add/fix Haswell pci-id's (LP: #1175533)
+- add-reserved-hsw-ids.diff
+- fix-hsw-gt3-names.diff
+- add-more-reserved-hsw-ids.diff
+- add-known-hsw-names.diff
+- add-more-correct-hsw-names.diff
+
+ -- Maarten Lankhorst maarten.lankho...@ubuntu.com  Wed, 19 Jun 2013 
11:12:48 +0200
+
 xserver-xorg-video-intel (2:2.21.6-0ubuntu4) raring-proposed; urgency=low
 
   [Chris Arges]
diff --git a/debian/patches/series b/debian/patches/series
index df7cb15..f2bcc76 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,7 @@
 0002-Update-manpage-for-new-accelmethod-option.patch
 sna-flush-scanout-cache-after-resizing.patch
+add-reserved-hsw-ids.diff
+fix-hsw-gt3-names.diff
+add-more-reserved-hsw-ids.diff
+add-known-hsw-names.diff
+add-more-correct-hsw-names.diff


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1upet2-ci...@vasks.debian.org

xserver-xorg-video-intel: Changes to 'ubuntu-raring'

[Maarten Lankhorst]

 debian/changelog   |2 
 debian/patches/add-known-hsw-names.diff|   60 ++
 debian/patches/add-more-correct-hsw-names.diff |   73 
 debian/patches/add-more-reserved-hsw-ids.diff  |  204 +++
 debian/patches/add-reserved-hsw-ids.diff   |  107 
 debian/patches/fix-hsw-gt3-names.diff  |  217 +
 6 files changed, 662 insertions(+), 1 deletion(-)

New commits:
commit 3545a63802a367866f3649d68beabd6328140384
Author: Maarten Lankhorst maarten.lankho...@canonical.com
Date:   Wed Jun 19 11:32:07 2013 +0200

not forgetting to git add the patches

diff --git a/debian/patches/add-known-hsw-names.diff 
b/debian/patches/add-known-hsw-names.diff
new file mode 100644
index 000..8c4fecd
--- /dev/null
+++ b/debian/patches/add-known-hsw-names.diff
@@ -0,0 +1,60 @@
+commit b507796679529b14c99e8937870561cd8eebebb9
+Author: Chris Wilson ch...@chris-wilson.co.uk
+Date:   Tue May 28 12:13:02 2013 +0100
+
+Add the known marketing names for the performance Haswell parts
+
+Start filling in the names for the parts that have been announced, the
+Iris branded Haswell GT3 parts.
+
+Signed-off-by: Chris Wilson ch...@chris-wilson.co.uk
+
+diff --git a/src/intel_module.c b/src/intel_module.c
+index 1e402f0..8b3b196 100644
+--- a/src/intel_module.c
 b/src/intel_module.c
+@@ -192,34 +192,34 @@ static const SymTabRec intel_chipsets[] = {
+   {PCI_CHIP_HASWELL_SDV_E_GT3,Haswell SDV (GT3) },
+   {PCI_CHIP_HASWELL_ULT_D_GT1,Haswell ULT Desktop (GT1) },
+   {PCI_CHIP_HASWELL_ULT_D_GT2,Haswell ULT Desktop (GT2) },
+-  {PCI_CHIP_HASWELL_ULT_D_GT3,Haswell ULT Desktop (GT3) },
++  {PCI_CHIP_HASWELL_ULT_D_GT3,Iris(TM) Graphics 5100 },
+   {PCI_CHIP_HASWELL_ULT_M_GT1,Haswell ULT Mobile (GT1) },
+   {PCI_CHIP_HASWELL_ULT_M_GT2,Haswell ULT Mobile (GT2) },
+-  {PCI_CHIP_HASWELL_ULT_M_GT3,Haswell ULT Mobile (GT3) },
++  {PCI_CHIP_HASWELL_ULT_M_GT3,Iris(TM) Graphics 5100 },
+   {PCI_CHIP_HASWELL_ULT_S_GT1,Haswell ULT Server (GT1) },
+   {PCI_CHIP_HASWELL_ULT_S_GT2,Haswell ULT Server (GT2) },
+-  {PCI_CHIP_HASWELL_ULT_S_GT3,Haswell ULT Server (GT3) },
++  {PCI_CHIP_HASWELL_ULT_S_GT3,Iris(TM) Graphics 5100 },
+   {PCI_CHIP_HASWELL_ULT_B_GT1,Haswell ULT (GT1) },
+   {PCI_CHIP_HASWELL_ULT_B_GT2,Haswell ULT (GT2) },
+-  {PCI_CHIP_HASWELL_ULT_B_GT3,Haswell ULT (GT3) },
++  {PCI_CHIP_HASWELL_ULT_B_GT3,Iris(TM) Graphics 5100 },
+   {PCI_CHIP_HASWELL_ULT_E_GT1,Haswell ULT (GT1) },
+   {PCI_CHIP_HASWELL_ULT_E_GT2,Haswell ULT (GT2) },
+-  {PCI_CHIP_HASWELL_ULT_E_GT3,Haswell ULT (GT3) },
++  {PCI_CHIP_HASWELL_ULT_E_GT3,Iris(TM) Graphics 5100 },
+   {PCI_CHIP_HASWELL_CRW_D_GT1,Haswell CRW Desktop (GT1) },
+   {PCI_CHIP_HASWELL_CRW_D_GT2,Haswell CRW Desktop (GT2) },
+-  {PCI_CHIP_HASWELL_CRW_D_GT3,Haswell CRW Desktop (GT3) },
++  {PCI_CHIP_HASWELL_CRW_D_GT3,Iris(TM) Pro Graphics 5200 },
+   {PCI_CHIP_HASWELL_CRW_M_GT1,Haswell CRW Mobile (GT1) },
+   {PCI_CHIP_HASWELL_CRW_M_GT2,Haswell CRW Mobile (GT2) },
+-  {PCI_CHIP_HASWELL_CRW_M_GT3,Haswell CRW Mobile (GT3) },
++  {PCI_CHIP_HASWELL_CRW_M_GT3,Iris(TM) Pro Graphics 5200 },
+   {PCI_CHIP_HASWELL_CRW_S_GT1,Haswell CRW Server (GT1) },
+   {PCI_CHIP_HASWELL_CRW_S_GT2,Haswell CRW Server (GT2) },
+-  {PCI_CHIP_HASWELL_CRW_S_GT3,Haswell CRW Server (GT3) },
++  {PCI_CHIP_HASWELL_CRW_S_GT3,Iris(TM) Pro Graphics 5200 },
+   {PCI_CHIP_HASWELL_CRW_B_GT1,Haswell CRW (GT1) },
+   {PCI_CHIP_HASWELL_CRW_B_GT2,Haswell CRW (GT2) },
+-  {PCI_CHIP_HASWELL_CRW_B_GT3,Haswell CRW (GT3) },
++  {PCI_CHIP_HASWELL_CRW_B_GT3,Iris(TM) Pro Graphics 5200 },
+   {PCI_CHIP_HASWELL_CRW_E_GT1,Haswell CRW (GT1) },
+   {PCI_CHIP_HASWELL_CRW_E_GT2,Haswell CRW (GT2) },
+-  {PCI_CHIP_HASWELL_CRW_E_GT3,Haswell CRW (GT3) },
++  {PCI_CHIP_HASWELL_CRW_E_GT3,Iris(TM) Pro Graphics 5200 },
+   {PCI_CHIP_VALLEYVIEW_PO,ValleyView PO board },
+   {-1,NULL}
+ };
diff --git a/debian/patches/add-more-correct-hsw-names.diff 
b/debian/patches/add-more-correct-hsw-names.diff
new file mode 100644
index 000..acc08ec
--- /dev/null
+++ b/debian/patches/add-more-correct-hsw-names.diff
@@ -0,0 +1,73 @@
+commit 45c09bfe58c37bbf7965af25bdd4fa5c37c0908f
+Author: Rodrigo Vivi rodrigo.v...@gmail.com
+Date:   Wed Jun 5 13:07:13 

xserver-xorg-video-intel: Changes to 'ubuntu-quantal'

[Maarten Lankhorst]

 debian/changelog   |   13 +
 debian/patches/add-known-hsw-names.diff|   60 ++
 debian/patches/add-more-correct-hsw-names.diff |   73 
 debian/patches/add-more-reserved-hsw-ids.diff  |  204 +++
 debian/patches/add-reserved-hsw-ids.diff   |  107 
 debian/patches/add-vlv-ids.diff|   36 
 debian/patches/fix-hsw-crw-ids.diff|   40 
 debian/patches/fix-hsw-gt3-names.diff  |  217 +
 debian/patches/series  |7 
 9 files changed, 757 insertions(+)

New commits:
commit bf78fc9f86e56c6ef58373311d574fc1e377e214
Author: Maarten Lankhorst maarten.lankho...@canonical.com
Date:   Wed Jun 19 11:14:12 2013 +0200

Added patches to add/fix Haswell pci-id's (LP: #1175533)

add-reserved-hsw-ids.diff
fix-hsw-gt3-names.diff
add-more-reserved-hsw-ids.diff
add-known-hsw-names.diff
add-more-correct-hsw-names.diff

(cherry picked from commit a7810f2743cafcf6ff4b4ee74280978d89a50637)

Conflicts:
debian/patches/series

Added:
add-vlv-ids.diff
fix-hsw-crw-ids.diff

diff --git a/debian/changelog b/debian/changelog
index e26..aafe89e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,16 @@
+xserver-xorg-video-intel (2:2.20.9-0ubuntu2.2) UNRELEASED; urgency=low
+
+  * Added patches to add/fix Haswell pci-id's (LP: #1175533)
+- add-vlv-ids.diff
+- fix-hsw-crw-ids.diff
+- add-reserved-hsw-ids.diff
+- fix-hsw-gt3-names.diff
+- add-more-reserved-hsw-ids.diff
+- add-known-hsw-names.diff
+- add-more-correct-hsw-names.diff
+
+ -- Maarten Lankhorst maarten.lankho...@ubuntu.com  Wed, 19 Jun 2013 
11:12:48 +0200
+
 xserver-xorg-video-intel (2:2.20.9-0ubuntu2.1) quantal-proposed; urgency=low
 
   * debian/xserver-xorg-video-intel.udev: Drop udev rule for gpu lockup
diff --git a/debian/patches/add-known-hsw-names.diff 
b/debian/patches/add-known-hsw-names.diff
new file mode 100644
index 000..8c4fecd
--- /dev/null
+++ b/debian/patches/add-known-hsw-names.diff
@@ -0,0 +1,60 @@
+commit b507796679529b14c99e8937870561cd8eebebb9
+Author: Chris Wilson ch...@chris-wilson.co.uk
+Date:   Tue May 28 12:13:02 2013 +0100
+
+Add the known marketing names for the performance Haswell parts
+
+Start filling in the names for the parts that have been announced, the
+Iris branded Haswell GT3 parts.
+
+Signed-off-by: Chris Wilson ch...@chris-wilson.co.uk
+
+diff --git a/src/intel_module.c b/src/intel_module.c
+index 1e402f0..8b3b196 100644
+--- a/src/intel_module.c
 b/src/intel_module.c
+@@ -192,34 +192,34 @@ static const SymTabRec intel_chipsets[] = {
+   {PCI_CHIP_HASWELL_SDV_E_GT3,Haswell SDV (GT3) },
+   {PCI_CHIP_HASWELL_ULT_D_GT1,Haswell ULT Desktop (GT1) },
+   {PCI_CHIP_HASWELL_ULT_D_GT2,Haswell ULT Desktop (GT2) },
+-  {PCI_CHIP_HASWELL_ULT_D_GT3,Haswell ULT Desktop (GT3) },
++  {PCI_CHIP_HASWELL_ULT_D_GT3,Iris(TM) Graphics 5100 },
+   {PCI_CHIP_HASWELL_ULT_M_GT1,Haswell ULT Mobile (GT1) },
+   {PCI_CHIP_HASWELL_ULT_M_GT2,Haswell ULT Mobile (GT2) },
+-  {PCI_CHIP_HASWELL_ULT_M_GT3,Haswell ULT Mobile (GT3) },
++  {PCI_CHIP_HASWELL_ULT_M_GT3,Iris(TM) Graphics 5100 },
+   {PCI_CHIP_HASWELL_ULT_S_GT1,Haswell ULT Server (GT1) },
+   {PCI_CHIP_HASWELL_ULT_S_GT2,Haswell ULT Server (GT2) },
+-  {PCI_CHIP_HASWELL_ULT_S_GT3,Haswell ULT Server (GT3) },
++  {PCI_CHIP_HASWELL_ULT_S_GT3,Iris(TM) Graphics 5100 },
+   {PCI_CHIP_HASWELL_ULT_B_GT1,Haswell ULT (GT1) },
+   {PCI_CHIP_HASWELL_ULT_B_GT2,Haswell ULT (GT2) },
+-  {PCI_CHIP_HASWELL_ULT_B_GT3,Haswell ULT (GT3) },
++  {PCI_CHIP_HASWELL_ULT_B_GT3,Iris(TM) Graphics 5100 },
+   {PCI_CHIP_HASWELL_ULT_E_GT1,Haswell ULT (GT1) },
+   {PCI_CHIP_HASWELL_ULT_E_GT2,Haswell ULT (GT2) },
+-  {PCI_CHIP_HASWELL_ULT_E_GT3,Haswell ULT (GT3) },
++  {PCI_CHIP_HASWELL_ULT_E_GT3,Iris(TM) Graphics 5100 },
+   {PCI_CHIP_HASWELL_CRW_D_GT1,Haswell CRW Desktop (GT1) },
+   {PCI_CHIP_HASWELL_CRW_D_GT2,Haswell CRW Desktop (GT2) },
+-  {PCI_CHIP_HASWELL_CRW_D_GT3,Haswell CRW Desktop (GT3) },
++  {PCI_CHIP_HASWELL_CRW_D_GT3,Iris(TM) Pro Graphics 5200 },
+   {PCI_CHIP_HASWELL_CRW_M_GT1,Haswell CRW Mobile (GT1) },
+   {PCI_CHIP_HASWELL_CRW_M_GT2,Haswell CRW Mobile (GT2) },
+-  {PCI_CHIP_HASWELL_CRW_M_GT3,Haswell CRW Mobile (GT3) },
++  {PCI_CHIP_HASWELL_CRW_M_GT3,Iris(TM) Pro Graphics 5200 },
+   {PCI_CHIP_HASWELL_CRW_S_GT1,Haswell CRW Server (GT1) },
+   

xserver-xorg-video-intel: Changes to 'ubuntu'

[Timo Aaltonen]

 debian/changelog |7 +
 debian/patches/series|1 
 debian/patches/sna-make-sure-the-source-is-coherent.diff |   61 +++
 3 files changed, 69 insertions(+)

New commits:
commit dafde3c2fa205a90ab0a1509dcc835a54f645b45
Author: Timo Aaltonen tjaal...@ubuntu.com
Date:   Tue Jun 11 20:26:15 2013 +0300

sna-make-sure-the-source-is-coherent.diff: Fix corruptions on firefox (LP: 
#1189850)

diff --git a/debian/changelog b/debian/changelog
index 47626dc..0397dcd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xserver-xorg-video-intel (2:2.21.9-0ubuntu2) saucy; urgency=low
+
+  * sna-make-sure-the-source-is-coherent.diff: Fix corruptions on firefox
+(LP: #1189850)
+
+ -- Timo Aaltonen tjaal...@ubuntu.com  Tue, 11 Jun 2013 20:10:33 +0300
+
 xserver-xorg-video-intel (2:2.21.9-0ubuntu1) saucy; urgency=low
 
   * Merge from unreleased debian git, remaining changes:
diff --git a/debian/patches/series b/debian/patches/series
index 23ed8a4..1bb2a98 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 0002-Update-manpage-for-new-accelmethod-option.patch
+sna-make-sure-the-source-is-coherent.diff
diff --git a/debian/patches/sna-make-sure-the-source-is-coherent.diff 
b/debian/patches/sna-make-sure-the-source-is-coherent.diff
new file mode 100644
index 000..eebbab2
--- /dev/null
+++ b/debian/patches/sna-make-sure-the-source-is-coherent.diff
@@ -0,0 +1,61 @@
+commit 7d91051c50210560dbd93a9e36f30d9f74ce9133
+Author: Chris Wilson ch...@chris-wilson.co.uk
+Date:   Tue Jun 11 14:23:57 2013 +0100
+
+sna: Make sure the source is coherent on the CPU before uploading
+
+Makes the presumption that for the upload path the region is stored on
+the CPU explicit.
+
+References: https://bugs.freedesktop.org/show_bug.cgi?id=61628
+Signed-off-by: Chris Wilson ch...@chris-wilson.co.uk
+
+diff --git a/src/sna/sna_accel.c b/src/sna/sna_accel.c
+index 69a151c..1663fe3 100644
+--- a/src/sna/sna_accel.c
 b/src/sna/sna_accel.c
+@@ -4861,6 +4861,22 @@ sna_copy_boxes(DrawablePtr src, DrawablePtr dst, GCPtr 
gc,
+   }
+   }
+ 
++  if (src_priv) {
++  bool ret;
++
++  RegionTranslate(region, src_dx, src_dy);
++  ret = 
sna_drawable_move_region_to_cpu(src_pixmap-drawable,
++region, 
MOVE_READ);
++  RegionTranslate(region, -src_dx, -src_dy);
++  if (!ret)
++  goto fallback;
++
++  assert(!src_priv-mapped);
++  if (src_pixmap-devPrivate.ptr == NULL)
++  /* uninitialised!*/
++  return;
++  }
++
+   if (alu != GXcopy) {
+   PixmapPtr tmp;
+   struct kgem_bo *src_bo;
+@@ -4936,21 +4952,6 @@ sna_copy_boxes(DrawablePtr src, DrawablePtr dst, GCPtr 
gc,
+   DBG((%s: dst is on the GPU, src is on the CPU, 
uploading into dst\n,
+__FUNCTION__));
+ 
+-  if (src_priv) {
+-  /* Fixup the shadow pointer as necessary */
+-  if (src_priv-mapped) {
+-  assert(!src_priv-shm);
+-  src_pixmap-devPrivate.ptr = NULL;
+-  src_priv-mapped = false;
+-  }
+-  if (src_pixmap-devPrivate.ptr == NULL) {
+-  if (!src_priv-ptr) /* uninitialised!*/
+-  return;
+-  src_pixmap-devPrivate.ptr = 
PTR(src_priv-ptr);
+-  src_pixmap-devKind = src_priv-stride;
+-  }
+-  }
+-
+   if (!dst_priv-pinned  replaces) {
+   stride = src_pixmap-devKind;
+   bits = src_pixmap-devPrivate.ptr;


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1umtoz-0003v8...@vasks.debian.org

xserver-xorg-video-intel: Changes to 'ubuntu'

[Maarten Lankhorst]

 ChangeLog|  486 +++
 NEWS |   41 +++
 configure.ac |2 
 debian/changelog |   19 +
 src/compat-api.h |1 
 src/intel_module.c   |   46 ++--
 src/sna/gen2_render.c|4 
 src/sna/gen3_render.c|4 
 src/sna/gen4_render.c|6 
 src/sna/gen5_render.c|6 
 src/sna/gen6_render.c|9 
 src/sna/gen7_render.c|   23 +-
 src/sna/kgem.c   |   28 +-
 src/sna/sna.h|6 
 src/sna/sna_accel.c  |  192 ++--
 src/sna/sna_cpu.c|6 
 src/sna/sna_display.c|  244 +++--
 src/sna/sna_display_fake.c   |   15 -
 src/sna/sna_dri.c|   10 
 src/sna/sna_driver.c |   23 --
 src/sna/sna_glyphs.c |   10 
 src/sna/sna_render.c |3 
 src/sna/sna_render.h |   15 -
 src/sna/sna_video.c  |  162 +-
 src/sna/sna_video.h  |   44 ++-
 src/sna/sna_video_hwmc.c |   64 ++---
 src/sna/sna_video_hwmc.h |2 
 src/sna/sna_video_overlay.c  |  344 +++---
 src/sna/sna_video_sprite.c   |  282 ++--
 src/sna/sna_video_textured.c |  257 +++---
 test/Makefile.am |2 
 test/tearing.mp4 |binary
 32 files changed, 1598 insertions(+), 758 deletions(-)

New commits:
commit bcb08de53f384061c526662496dc06cc4fd9e1a3
Author: Maarten Lankhorst maarten.lankho...@canonical.com
Date:   Thu Jun 6 15:13:26 2013 +0200

release to saucy

diff --git a/debian/changelog b/debian/changelog
index c421951..47626dc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,11 @@
-xserver-xorg-video-intel (2:2.21.9-0ubuntu1) UNRELEASED; urgency=low
+xserver-xorg-video-intel (2:2.21.9-0ubuntu1) saucy; urgency=low
 
   * Merge from unreleased debian git, remaining changes:
 - Use SNA by default.
   * Add support for haswell graphics. (LP: #1175533)
   * Fix crash in xserver when using the unity dash. (LP: #118123)
 
- -- Maarten Lankhorst maarten.lankho...@ubuntu.com  Thu, 23 May 2013 
09:44:44 +0200
+ -- Maarten Lankhorst maarten.lankho...@ubuntu.com  Thu, 06 Jun 2013 
15:05:00 +0200
 
 xserver-xorg-video-intel (2:2.21.9-1) UNRELEASED; urgency=low
 

commit 95929a9bec4f725334d4038a7e1102f97ec73767
Author: Maarten Lankhorst maarten.lankho...@canonical.com
Date:   Thu Jun 6 14:55:53 2013 +0200

Merge from unreleased debian git.

* Merge from unreleased debian git, remaining changes:
  - Use SNA by default.

diff --git a/debian/changelog b/debian/changelog
index 4624a80..c421951 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+xserver-xorg-video-intel (2:2.21.9-0ubuntu1) UNRELEASED; urgency=low
+
+  * Merge from unreleased debian git, remaining changes:
+- Use SNA by default.
+  * Add support for haswell graphics. (LP: #1175533)
+  * Fix crash in xserver when using the unity dash. (LP: #118123)
+
+ -- Maarten Lankhorst maarten.lankho...@ubuntu.com  Thu, 23 May 2013 
09:44:44 +0200
+
 xserver-xorg-video-intel (2:2.21.9-1) UNRELEASED; urgency=low
 
   [ Timo Aaltonen ]

commit 4ea0a2b45127b2b06b8fe83f167d498cc62748af
Author: Maarten Lankhorst maarten.lankho...@canonical.com
Date:   Thu Jun 6 14:53:04 2013 +0200

bump version

diff --git a/ChangeLog b/ChangeLog
index abcd8c4..e61e127 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,489 @@
+commit 2770655371954413c750b030c9a7135baee302d4
+Author: Chris Wilson ch...@chris-wilson.co.uk
+Date:   Thu Jun 6 12:04:23 2013 +0100
+
+2.21.9 release
+
+commit d3345cd269dc75999b35f3286d21059974dcb24b
+Author: Chris Wilson ch...@chris-wilson.co.uk
+Date:   Thu Jun 6 12:18:32 2013 +0100
+
+sna: Only emit an error for terminal mmap failures
+
+If we repeat the mmap, keep quiet. Only emit the ErrorF in case even the
+repeated attempts to mmap the bo fail.
+
+Signed-off-by: Chris Wilson ch...@chris-wilson.co.uk
+
+commit 70fa080d02bff9742523cea52c875d9447a78bfd
+Author: Chris Wilson ch...@chris-wilson.co.uk
+Date:   Wed Jun 5 23:32:01 2013 +0100
+
+sna: Include the GT details in the backend name for a chipset
+
+Signed-off-by: Chris Wilson ch...@chris-wilson.co.uk
+
+commit 45c09bfe58c37bbf7965af25bdd4fa5c37c0908f
+Author: Rodrigo Vivi rodrigo.v...@gmail.com
+Date:   Wed Jun 5 13:07:13 2013 -0300
+
+Add more correct names for Haswell.
+
+As we find out more of the final product names for Haswell chipsets, we
+need to update the user visible identification strings.
+
+Signed-off-by: Rodrigo Vivi rodrigo.v...@gmail.com
+
+commit a9f9fb8e44bb0bdbd004da1fce986585ebcafd28
+Author: Chris Wilson ch...@chris-wilson.co.uk
+Date:   Wed Jun 5 09:48:19 2013 +0100
+
+sna/video: Fix redundant initialisation of video-clip
+
+It will be created before use anyway, but this silences a 

xserver-xorg-video-intel: Changes to 'ubuntu'

[Maarten Lankhorst]

 ChangeLog   |  494 
 Makefile.am |2 
 NEWS|   32 
 configure.ac|7 
 debian/changelog|   32 
 debian/patches/series   |1 
 debian/patches/sna-flush-scanout-cache-after-resizing.patch |  228 -
 debian/rules|2 
 m4/ac_define_dir.m4 |   49 +
 src/intel_dri.c |   15 
 src/intel_driver.h  |   51 -
 src/intel_module.c  |   99 +-
 src/sna/Makefile.am |2 
 src/sna/compiler.h  |2 
 src/sna/gen4_render.c   |   10 
 src/sna/gen4_vertex.c   |6 
 src/sna/gen5_render.c   |7 
 src/sna/gen6_render.c   |2 
 src/sna/gen7_render.c   |   31 
 src/sna/kgem.c  |  144 ++-
 src/sna/kgem.h  |9 
 src/sna/sna.h   |   18 
 src/sna/sna_accel.c |  445 +-
 src/sna/sna_blt.c   |   46 -
 src/sna/sna_composite.c |   20 
 src/sna/sna_display.c   |   23 
 src/sna/sna_dri.c   |   27 
 src/sna/sna_driver.c|   23 
 src/sna/sna_render.c|   13 
 src/sna/sna_trapezoids.c|   85 +-
 src/sna/sna_video.c |   10 
 src/sna/sna_video.h |   19 
 src/sna/sna_video_hwmc.c|   75 -
 src/sna/sna_video_hwmc.h|4 
 src/sna/sna_video_overlay.c |   53 -
 src/sna/sna_video_sprite.c  |   46 -
 src/sna/sna_video_textured.c|   57 -
 37 files changed, 1603 insertions(+), 586 deletions(-)

New commits:
commit 2ce7b7f10c82bee6617e5efb4fc7713cb6d86861
Author: Maarten Lankhorst maarten.lankho...@canonical.com
Date:   Thu May 23 09:45:05 2013 +0200

Release to saucy.

* Merge from unreleased debian git, remaining changes:
  - Use SNA by default.
* rules: Add --enable-valgrind again.
* Drop sna-flush-scanout-cache-after-resizing.patch, upstreamed.

diff --git a/debian/changelog b/debian/changelog
index ab24457..68a7410 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+xserver-xorg-video-intel (2:2.21.7-0ubuntu1) saucy; urgency=low
+
+  * Merge from unreleased debian git, remaining changes:
+- Use SNA by default.
+  * rules: Add --enable-valgrind again.
+  * Drop sna-flush-scanout-cache-after-resizing.patch, upstreamed.
+
+ -- Maarten Lankhorst maarten.lankho...@ubuntu.com  Thu, 23 May 2013 
09:44:44 +0200
+
 xserver-xorg-video-intel (2:2.21.7-1) UNRELEASED; urgency=low
 
   [ Timo Aaltonen ]
@@ -10,12 +19,6 @@ xserver-xorg-video-intel (2:2.21.7-1) UNRELEASED; urgency=low
 
  -- Timo Aaltonen tjaal...@ubuntu.com  Fri, 07 Dec 2012 09:33:39 +0200
 
-xserver-xorg-video-intel (2:2.21.6-0ubuntu5) UNRELEASED; urgency=low
-
-  * rules: Add --enable-valgrind again.
-
- -- Maarten Lankhorst maarten.lankho...@ubuntu.com  Thu, 23 May 2013 
09:24:06 +0200
-
 xserver-xorg-video-intel (2:2.21.6-0ubuntu4) raring-proposed; urgency=low
 
   [Chris Arges]
diff --git a/debian/patches/series b/debian/patches/series
index df7cb15..23ed8a4 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
 0002-Update-manpage-for-new-accelmethod-option.patch
-sna-flush-scanout-cache-after-resizing.patch
diff --git a/debian/patches/sna-flush-scanout-cache-after-resizing.patch 
b/debian/patches/sna-flush-scanout-cache-after-resizing.patch
deleted file mode 100644
index bb4928f..000
--- a/debian/patches/sna-flush-scanout-cache-after-resizing.patch
+++ /dev/null
@@ -1,228 +0,0 @@
-From e083fbdc3f2025f4ccc199070e2488afc5afb2a7 Mon Sep 17 00:00:00 2001
-From: Chris Wilson ch...@chris-wilson.co.uk
-Date: Fri, 12 Apr 2013 11:01:08 +0100
-Subject: [PATCH] sna: Flush the scanout cache after resizing the display
-
-And ensure that any new scanout allocations make the requested size.
-
-Signed-off-by: Chris Wilson ch...@chris-wilson.co.uk
-(cherry picked from commit