xserver-xorg-video-intel: Changes to 'debian-unstable'

[Timo Aaltonen]

 autogen.sh   |   11 +++---
 debian/changelog |6 +++
 src/backlight.c  |   86 +--
 src/i915_pciids.h|   56 +++---
 src/intel_device.c   |2 -
 src/intel_module.c   |   16 +---
 src/sna/gen2_render.c|   12 ++
 src/sna/sna_display.c|   59 +---
 test/dri3-test.c |   11 +-
 tools/backlight_helper.c |4 ++
 10 files changed, 156 insertions(+), 107 deletions(-)

New commits:
commit 52151d10fed1f82ad18ac556fa4bba976447a11e
Author: Timo Aaltonen 
Date:   Thu Mar 9 11:26:14 2017 +0200

update changelog

diff --git a/debian/changelog b/debian/changelog
index d4d2475..60eb93a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-video-intel (2:2.99.917+git20170309-1) UNRELEASED; urgency=medium
+
+  * New upstream snapshot.
+
+ -- Timo Aaltonen   Thu, 09 Mar 2017 11:24:07 +0200
+
 xserver-xorg-video-intel (2:2.99.917+git20161206-1) unstable; urgency=medium
 
   [ Andreas Boll ]

commit 78d7a09b0343829c81257024b164b0b3764392ac
Author: Chris Wilson 
Date:   Tue Feb 28 20:48:43 2017 +

intel: Fix checking xf86LoadKernelModule for success

Originally introduced in

commit f66e25def3431a900068cc1c23a6b1e8322ef046
Author: Chris Wilson 
Date:   Mon Jun 23 16:14:28 2014 +0100

intel: Wait for the DRM device to load

the legacy path was checking the return xf86LoadKernelModule
incorrectly. This error was then copy into the common loader in

commit 6a2dcb388e6b549c3175ccfbcd3f1751e25de40a
Author: Chris Wilson 
Date:   Fri Jul 31 10:40:32 2015 +0100

intel: Refactor i915.ko loading support

xf86LoadKernelModule() returns 1 on success and zero on failure.

Reported-by: David Shao 
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=100011
Signed-off-by: Chris Wilson 

diff --git a/src/intel_device.c b/src/intel_device.c
index 04ad7b6..c4910cd 100644
--- a/src/intel_device.c
+++ b/src/intel_device.c
@@ -233,7 +233,7 @@ static int load_i915_kernel_module(void)
const char **kn;
 
for (kn = kernel_module_names; *kn; kn++)
-   if (xf86LoadKernelModule(*kn) == 0)
+   if (xf86LoadKernelModule(*kn))
return 0;
 
return -1;

commit e9cd8c211dcaba3bad4bc950a0a06b35766962ba
Author: Chris Wilson 
Date:   Mon Feb 27 20:38:22 2017 +

pciids: Update for missing Skylake IDs

Sync with kernel commit ca7a45ba6fb9e7ceca56d10b91db29c2f3451a2e
Author: Michał Winiarski 
Date:   Mon Feb 27 12:22:56 2017 +0100

drm/i915/skl: Add missing SKL ID

Signed-off-by: Chris Wilson 

diff --git a/src/i915_pciids.h b/src/i915_pciids.h
index 0370f83..466c715 100644
--- a/src/i915_pciids.h
+++ b/src/i915_pciids.h
@@ -134,7 +134,7 @@
 #define INTEL_IVB_Q_IDS(info) \
INTEL_QUANTA_VGA_DEVICE(info) /* Quanta transcode */
 
-#define INTEL_HSW_D_IDS(info) \
+#define INTEL_HSW_IDS(info) \
INTEL_VGA_DEVICE(0x0402, info), /* GT1 desktop */ \
INTEL_VGA_DEVICE(0x0412, info), /* GT2 desktop */ \
INTEL_VGA_DEVICE(0x0422, info), /* GT3 desktop */ \
@@ -179,9 +179,7 @@
INTEL_VGA_DEVICE(0x0D2B, info), /* CRW GT3 reserved */ \
INTEL_VGA_DEVICE(0x0D0E, info), /* CRW GT1 reserved */ \
INTEL_VGA_DEVICE(0x0D1E, info), /* CRW GT2 reserved */ \
-   INTEL_VGA_DEVICE(0x0D2E, info)  /* CRW GT3 reserved */ \
-
-#define INTEL_HSW_M_IDS(info) \
+   INTEL_VGA_DEVICE(0x0D2E, info),  /* CRW GT3 reserved */ \
INTEL_VGA_DEVICE(0x0406, info), /* GT1 mobile */ \
INTEL_VGA_DEVICE(0x0416, info), /* GT2 mobile */ \
INTEL_VGA_DEVICE(0x0426, info), /* GT2 mobile */ \
@@ -198,17 +196,15 @@
INTEL_VGA_DEVICE(0x0D16, info), /* CRW GT2 mobile */ \
INTEL_VGA_DEVICE(0x0D26, info)  /* CRW GT3 mobile */
 
-#define INTEL_VLV_M_IDS(info) \
+#define INTEL_VLV_IDS(info) \
INTEL_VGA_DEVICE(0x0f30, info), \
INTEL_VGA_DEVICE(0x0f31, info), \
INTEL_VGA_DEVICE(0x0f32, info), \
INTEL_VGA_DEVICE(0x0f33, info), \
-   INTEL_VGA_DEVICE(0x0157, info)
-
-#define INTEL_VLV_D_IDS(info) \
+   INTEL_VGA_DEVICE(0x0157, info), \
INTEL_VGA_DEVICE(0x0155, info)
 
-#define INTEL_BDW_GT12M_IDS(info)  \
+#define INTEL_BDW_GT12_IDS(info)  \
INTEL_VGA_DEVICE(0x1602, info), /* GT1 ULT */ \
INTEL_VGA_DEVICE(0x1606, info), /* GT1 ULT */ \
INTEL_VGA_DEVICE(0x160B, info), /* GT1 Iris */ \
@@ -216,43 +212,32 @@
INTEL_VGA_DEVICE(0x1612, info), /* GT2 Halo */ \
INTEL_VGA_DEVICE(0x1616, info), 

xserver-xorg-video-intel: Changes to 'debian-unstable'

[Timo Aaltonen]

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

New commits:
commit e37b4972ae54528aba61f2a6606dac668195e098
Author: Timo Aaltonen 
Date:   Wed Dec 14 11:33:11 2016 +0200

release to sid

diff --git a/debian/changelog b/debian/changelog
index a540ff1..d4d2475 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
-xserver-xorg-video-intel (2:2.99.917+git20161206-1) UNRELEASED; urgency=medium
+xserver-xorg-video-intel (2:2.99.917+git20161206-1) unstable; urgency=medium
 
+  [ Andreas Boll ]
   * New upstream snapshot.
 - sna: Add missing NULL check for readdir result in
   has_connector_backlight (Closes: #847073).  Thanks to James Clarke for
@@ -10,7 +11,7 @@ xserver-xorg-video-intel (2:2.99.917+git20161206-1) 
UNRELEASED; urgency=medium
   * debhelper installs to debian/tmp by default, no need to specify it.
   * Update a bunch of URLs in packaging to https.
 
- -- Andreas Boll   Mon, 12 Dec 2016 15:22:52 +0100
+ -- Timo Aaltonen   Wed, 14 Dec 2016 11:33:01 +0200
 
 xserver-xorg-video-intel (2:2.99.917+git20161105-1) unstable; urgency=medium
 

xserver-xorg-video-intel: Changes to 'debian-unstable'

[Andreas Boll]

 README  |6 +-
 debian/changelog|   14 ++
 debian/compat   |2 
 debian/control  |9 +---
 debian/copyright|2 
 debian/rules|   13 +
 debian/source/local-options |1 
 debian/watch|2 
 man/intel.man   |6 +-
 src/backlight.c |   28 ++--
 src/i915_pciids.h   |4 +
 src/intel_module.c  |   39 -
 src/sna/brw/brw_eu_emit.c   |2 
 src/sna/gen9_render.c   |   28 
 src/sna/sna.h   |3 +
 src/sna/sna_accel.c |   32 +++---
 src/sna/sna_display.c   |   96 
 src/sna/sna_display_fake.c  |   10 
 src/sna/sna_driver.c|6 +-
 src/sna/sna_present.c   |4 -
 src/sna/sna_render.h|1 
 src/sna/sna_video_sprite.c  |   28 
 tools/virtual.c |   24 ---
 23 files changed, 252 insertions(+), 108 deletions(-)

New commits:
commit 637232531169bad6241a6fea22bb7ba3b56c90c9
Author: Andreas Boll 
Date:   Mon Dec 12 16:13:12 2016 +0100

Update a bunch of URLs in packaging to https.

diff --git a/debian/changelog b/debian/changelog
index b8de404..a540ff1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,7 @@ xserver-xorg-video-intel (2:2.99.917+git20161206-1) UNRELEASED; 
urgency=medium
   * Stop passing --disable-silent-rules to configure, debhelper does
 that for a while.
   * debhelper installs to debian/tmp by default, no need to specify it.
+  * Update a bunch of URLs in packaging to https.
 
  -- Andreas Boll   Mon, 12 Dec 2016 15:22:52 +0100
 
diff --git a/debian/control b/debian/control
index a72eeb5..2925afc 100644
--- a/debian/control
+++ b/debian/control
@@ -52,9 +52,9 @@ Build-Depends:
 # libcairo2-dev,
 # libpng12-dev,
 Standards-Version: 3.9.8
-Vcs-Git: git://anonscm.debian.org/pkg-xorg/driver/xserver-xorg-video-intel
-Vcs-Browser: 
http://anonscm.debian.org/cgit/pkg-xorg/driver/xserver-xorg-video-intel.git
-Homepage: http://www.x.org/
+Vcs-Git: 
https://anonscm.debian.org/git/pkg-xorg/driver/xserver-xorg-video-intel.git
+Vcs-Browser: 
https://anonscm.debian.org/git/pkg-xorg/driver/xserver-xorg-video-intel.git
+Homepage: https://www.x.org/
 
 Package: xserver-xorg-video-intel
 Architecture: amd64 i386 kfreebsd-amd64 kfreebsd-i386 x32
diff --git a/debian/copyright b/debian/copyright
index 180bc88..8921af5 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,5 +1,5 @@
 This package was downloaded from
-http://xorg.freedesktop.org/releases/individual/driver/
+https://xorg.freedesktop.org/releases/individual/driver/
 
 This copyright file is based on xf86-video-intel 2.3.1.
 
diff --git a/debian/watch b/debian/watch
index 6f65e84..8d80294 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,3 +1,3 @@
 #git=git://anongit.freedesktop.org/xorg/driver/xf86-video-intel
 version=3
-http://xorg.freedesktop.org/releases/individual/driver/ 
xf86-video-intel-(.*)\.tar\.gz
+https://xorg.freedesktop.org/releases/individual/driver/ 
xf86-video-intel-(.*)\.tar\.gz

commit 1b817d14a00c7107618c2ba8a7b790cbae10cffc
Author: Andreas Boll 
Date:   Mon Dec 12 16:09:12 2016 +0100

debhelper installs to debian/tmp by default, no need to specify it.

diff --git a/debian/changelog b/debian/changelog
index f88135f..b8de404 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,7 @@ xserver-xorg-video-intel (2:2.99.917+git20161206-1) UNRELEASED; 
urgency=medium
   * Bump debhelper compat to 10.
   * Stop passing --disable-silent-rules to configure, debhelper does
 that for a while.
+  * debhelper installs to debian/tmp by default, no need to specify it.
 
  -- Andreas Boll   Mon, 12 Dec 2016 15:22:52 +0100
 
diff --git a/debian/rules b/debian/rules
index a94b5c1..600a976 100755
--- a/debian/rules
+++ b/debian/rules
@@ -22,10 +22,6 @@ override_dh_auto_configure:
--with-builderstring="$(SOURCE_NAME) $(SOURCE_VERSION) 
($(BUILDER))" \
$(valgrind)
 
-# Install in debian/tmp to retain control through dh_install:
-override_dh_auto_install:
-   dh_auto_install --destdir=debian/tmp
-
 # Kill *.la files, libxvmc symlinks, and forget no-one:
 override_dh_install:
find debian/tmp -name '*.la' -delete

commit 30b2dcd395ac91bf0ec83805da534e12665faade
Author: Andreas Boll 
Date:   Mon Dec 12 16:08:14 2016 +0100

Stop passing --disable-silent-rules to configure, debhelper does that for a 
while.

diff --git a/debian/changelog b/debian/changelog
index dd44ada..f88135f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,8 @@ xserver-xorg-video-intel (2:2.99.917+git20161206-1) UNRELEASED; 
urgency=medium
   has_connector_backlight (Closes: #847073).  Thanks to James Clarke for
 

xserver-xorg-video-intel: Changes to 'debian-unstable'

[Vincent Cheng]

 debian/changelog|5 +++--
 debian/control  |2 +-
 debian/source/local-options |1 -
 3 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 5ca49a80b2cd1c47aad29f45546e8830dbb92674
Author: Vincent Cheng 
Date:   Sat Nov 26 21:57:13 2016 -0800

import changes from 2:2.99.917+git20161105-1

diff --git a/debian/changelog b/debian/changelog
index 3a8adae..8e7079f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,9 @@
-xserver-xorg-video-intel (2:2.99.917+git20161105-1) UNRELEASED; urgency=medium
+xserver-xorg-video-intel (2:2.99.917+git20161105-1) unstable; urgency=medium
 
   * New upstream snapshot.
+  * control: Bump policy to 3.9.8, no changes.
 
- -- Timo Aaltonen   Wed, 09 Nov 2016 11:55:29 +0200
+ -- Timo Aaltonen   Thu, 17 Nov 2016 12:44:07 +0200
 
 xserver-xorg-video-intel (2:2.99.917+git20160706-1) unstable; urgency=medium
 
diff --git a/debian/control b/debian/control
index 4fa3c27..1be7b4a 100644
--- a/debian/control
+++ b/debian/control
@@ -52,7 +52,7 @@ Build-Depends:
 # tests, benchmarks:
 # libcairo2-dev,
 # libpng12-dev,
-Standards-Version: 3.9.6
+Standards-Version: 3.9.8
 Vcs-Git: git://anonscm.debian.org/pkg-xorg/driver/xserver-xorg-video-intel
 Vcs-Browser: 
http://anonscm.debian.org/cgit/pkg-xorg/driver/xserver-xorg-video-intel.git
 Homepage: http://www.x.org/
diff --git a/debian/source/local-options b/debian/source/local-options
deleted file mode 100644
index 10404f5..000
--- a/debian/source/local-options
+++ /dev/null
@@ -1 +0,0 @@
---extend-diff-ignore=src/render_program/exa_.*.g8a

xserver-xorg-video-intel: Changes to 'debian-unstable'

[Timo Aaltonen]

 configure.ac |2 
 debian/changelog |6 
 src/compat-api.h |   10 
 src/intel_device.c   |   21 
 src/intel_driver.h   |1 
 src/intel_module.c   |   19 
 src/legacy/i810/i810_video.c |   44 +
 src/sna/blt.c| 1258 ---
 src/sna/fb/fbimage.c |   12 
 src/sna/gen2_render.c|  330 ++-
 src/sna/gen9_render.c|   31 -
 src/sna/kgem.c   |   37 -
 src/sna/kgem.h   |   13 
 src/sna/sna.h|   39 +
 src/sna/sna_accel.c  |  183 --
 src/sna/sna_acpi.c   |   11 
 src/sna/sna_blt.c|5 
 src/sna/sna_composite.c  |3 
 src/sna/sna_display.c|  308 +-
 src/sna/sna_dri2.c   |   57 -
 src/sna/sna_dri3.c   |4 
 src/sna/sna_driver.c |   71 ++
 src/sna/sna_present.c|   64 +-
 src/sna/sna_render.c |   10 
 src/sna/sna_video_textured.c |   16 
 src/uxa/intel.h  |2 
 src/uxa/intel_display.c  |   17 
 src/uxa/intel_driver.c   |   27 
 test/Makefile.am |1 
 test/dri2-race.c |   15 
 test/present-speed.c |  414 --
 31 files changed, 2139 insertions(+), 892 deletions(-)

New commits:
commit f90aee9362a6de168344e7f52567bd81f5572211
Author: Timo Aaltonen 
Date:   Wed Nov 9 11:56:37 2016 +0200

update changelog

diff --git a/debian/changelog b/debian/changelog
index 1260292..3a8adae 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-video-intel (2:2.99.917+git20161105-1) UNRELEASED; urgency=medium
+
+  * New upstream snapshot.
+
+ -- Timo Aaltonen   Wed, 09 Nov 2016 11:55:29 +0200
+
 xserver-xorg-video-intel (2:2.99.917+git20160706-1) unstable; urgency=medium
 
   * New upstream snapshot.

commit 6c8fc4434330ee37a290b6cf466af3282d09a8b3
Author: Chris Wilson 
Date:   Sat Nov 5 23:40:28 2016 +

sna: Mark up CPU writes for scanout flush

When we flip to a bo, the kernel will flush it from the CPU write domain
and so afterwards we need to do a new set-domain to mark up a subsequent
CPU write (and flush before another flip).

References: https://bugs.freedesktop.org/show_bug.cgi?id=95414
Signed-off-by: Chris Wilson 

diff --git a/src/sna/kgem.c b/src/sna/kgem.c
index c57624c..f0d171a 100644
--- a/src/sna/kgem.c
+++ b/src/sna/kgem.c
@@ -6179,9 +6179,7 @@ void kgem_scanout_flush(struct kgem *kgem, struct kgem_bo 
*bo)
/* Whatever actually happens, we can regard the GTT write domain
 * as being flushed.
 */
-   bo->gtt_dirty = false;
-   bo->needs_flush = false;
-   bo->domain = DOMAIN_NONE;
+   __kgem_bo_clear_dirty(bo);
 }
 
 inline static bool nearly_idle(struct kgem *kgem)
@@ -7107,6 +7105,7 @@ void kgem_bo_sync__cpu(struct kgem *kgem, struct kgem_bo 
*bo)
bo->needs_flush = false;
kgem_bo_retire(kgem, bo);
bo->domain = DOMAIN_CPU;
+   bo->gtt_dirty = true;
}
 }
 
@@ -7147,10 +7146,11 @@ void kgem_bo_sync__cpu_full(struct kgem *kgem, struct 
kgem_bo *bo, bool write)
DBG(("%s: sync: GPU hang detected\n", __FUNCTION__));
kgem_throttle(kgem);
}
+   bo->needs_flush = false;
if (write) {
-   bo->needs_flush = false;
kgem_bo_retire(kgem, bo);
bo->domain = DOMAIN_CPU;
+   bo->gtt_dirty = true;
} else {
if (bo->exec == NULL)
kgem_bo_maybe_retire(kgem, bo);
diff --git a/src/sna/kgem.h b/src/sna/kgem.h
index ded8f78..08b4eb2 100644
--- a/src/sna/kgem.h
+++ b/src/sna/kgem.h
@@ -638,17 +638,24 @@ static inline void kgem_bo_mark_busy(struct kgem *kgem, 
struct kgem_bo *bo, int
}
 }
 
-inline static void __kgem_bo_clear_busy(struct kgem_bo *bo)
+static inline void __kgem_bo_clear_dirty(struct kgem_bo *bo)
 {
DBG(("%s: handle=%d\n", __FUNCTION__, bo->handle));
-   bo->rq = NULL;
-   list_del(>request);
 
bo->domain = DOMAIN_NONE;
bo->needs_flush = false;
bo->gtt_dirty = false;
 }
 
+inline static void __kgem_bo_clear_busy(struct kgem_bo *bo)
+{
+   DBG(("%s: handle=%d\n", __FUNCTION__, bo->handle));
+   bo->rq = NULL;
+   list_del(>request);
+
+   __kgem_bo_clear_dirty(bo);
+}
+
 static inline bool kgem_bo_is_busy(struct kgem_bo *bo)
 {
DBG(("%s: handle=%d, domain: %d exec? %d, rq? %d\n", __FUNCTION__,
diff --git a/src/sna/sna_display.c b/src/sna/sna_display.c
index 66c3147..59ecfd3 100644
--- a/src/sna/sna_display.c
+++ b/src/sna/sna_display.c
@@ -3037,8 +3037,10 @@ retry: /* Attach per-crtc pixmap or 

xserver-xorg-video-intel: Changes to 'debian-unstable'

[Timo Aaltonen]

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

New commits:
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
 

xserver-xorg-video-intel: Changes to 'debian-unstable'

[Timo Aaltonen]

 debian/changelog |   10 
 debian/patches/fix-fd-leak-when-intel-scrn-create-fails.diff |  117 
 debian/patches/series|3 
 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, 280 insertions(+), 388 deletions(-)

New commits:
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 snapshot.
+  * 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.
 
  -- Timo Aaltonen   Wed, 06 Jul 2016 19:04:32 +0300
 
diff --git a/debian/patches/fix-fd-leak-when-intel-scrn-create-fails.diff 
b/debian/patches/fix-fd-leak-when-intel-scrn-create-fails.diff
deleted file mode 100644
index b4548a5..000
--- a/debian/patches/fix-fd-leak-when-intel-scrn-create-fails.diff
+++ /dev/null
@@ -1,117 +0,0 @@
-Aihe: [PATCH xf86-video-intel] Fix fd (and mem) leak when intel_scrn_create 
fails
-Lähettäjä: Hans de Goede 
-Päiväys: 22.04.2016 21:04
-Vastaanottaja: intel-...@lists.freedesktop.org
-CC: Adam Jackson , Rob Clark , 
tjaal...@ubuntu.com, Hans de Goede 
-
-The probe functions in intel_module.c call intel_open_device() before
-calling intel_scrn_create(), but if the later fails because of e.g.
-an unsupported (new) pci-id they were not cleaning up the resources
-claimed by intel_open_device(), esp. leaking the fd is a problem
-because this breaks the fallback to the modesetting driver.
-
-This commit fixes this by adding a intel_close_device() cleanup
-function and calling that when intel_scrn_create() fails.
-
-Signed-off-by: Hans de Goede 

- src/intel_device.c | 17 +
- src/intel_driver.h |  1 +
- src/intel_module.c | 19 ---
- 3 files changed, 34 

xserver-xorg-video-intel: Changes to 'debian-unstable'

[Timo Aaltonen]

 configure.ac |3 
 debian/changelog |8 
 debian/patches/fix-fd-leak-when-intel-scrn-create-fails.diff |  117 
 debian/patches/series|1 
 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   |4 
 src/sna/kgem.h   |   23 
 src/sna/sna.h|9 
 src/sna/sna_accel.c  |5 
 src/sna/sna_blt.c|   19 
 src/sna/sna_display.c|  295 
 src/sna/sna_dri2.c   |   64 
 src/sna/sna_dri3.c   |1 
 src/sna/sna_present.c|  152 
 src/sna/sna_render.c |   79 
 src/sna/sna_render.h |   58 
 src/sna/sna_video_sprite.c   |   65 
 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  |   29 
 test/Makefile.am |6 
 test/dri2-race.c |   30 
 test/xvidmode.c  |   54 
 34 files changed, 6778 insertions(+), 309 deletions(-)

New commits:
commit a1ca6219097af9cefd7561d7cb20349ac4314d6b
Author: Timo Aaltonen 
Date:   Tue May 24 11:40:18 2016 +0300

upload to unstable

diff --git a/debian/changelog b/debian/changelog
index c3c282b..98ceac2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,10 @@
-xserver-xorg-video-intel (2:2.99.917+git20160325-2) UNRELEASED; urgency=medium
+xserver-xorg-video-intel (2:2.99.917+git20160522-1) unstable; urgency=medium
 
+  * New upstream snapshot. (Closes: #823116)
   * fix-fd-leak-when-intel-scrn-create-fails.diff: Fix a failure falling back
 on another driver when scrn create fails.
 
- -- Timo Aaltonen   Fri, 22 Apr 2016 15:58:10 +0300
+ -- Timo Aaltonen   Tue, 24 May 2016 11:40:02 +0300
 
 xserver-xorg-video-intel (2:2.99.917+git20160325-1) unstable; urgency=medium
 

commit 8477615ae1bd284aca1221185ffefe0630d3f7ab
Author: Chris Wilson 
Date:   Sun May 22 14:18:20 2016 +0100

sna: Allow disconnected outputs to retain state without EDID checks

Signed-off-by: Chris Wilson 

diff --git a/src/sna/sna_display.c b/src/sna/sna_display.c
index 79c660f..4ddb20e 100644
--- a/src/sna/sna_display.c
+++ b/src/sna/sna_display.c
@@ -5056,6 +5056,9 @@ output_check_status(struct sna *sna, struct sna_output 
*output)
if (output->status != status)
return false;
 
+   if (status != XF86OutputStatusConnected)
+   return true;
+
if (output->edid_len == 0)
return false;
 

commit 25d2c2d049a8c9f2b2ef0895d6079c8b273ad121
Author: Chris Wilson 
Date:   Wed May 18 23:26:12 2016 +0100

sna: Confirm the EDID is the same after a hotplug before ignoring

Signed-off-by: Chris Wilson 

diff --git a/src/sna/sna_display.c b/src/sna/sna_display.c
index 16d0321..79c660f 100644
--- a/src/sna/sna_display.c
+++ b/src/sna/sna_display.c
@@ -5021,19 +5021,25 @@ output_check_status(struct sna *sna, struct sna_output 
*output)
 {
union compat_mode_get_connector compat_conn;
struct drm_mode_modeinfo dummy;
+   struct drm_mode_get_blob blob;
xf86OutputStatus status;
+   char *edid;
 
VG_CLEAR(compat_conn);
 
+   compat_conn.conn.connection = -1;
compat_conn.conn.connector_id = output->id;
compat_conn.conn.count_modes = 1; /* skip detect */
compat_conn.conn.modes_ptr = (uintptr_t)

xserver-xorg-video-intel: Changes to 'debian-unstable'

[Timo Aaltonen]

 Makefile.am|4 
 debian/changelog   |6 +
 src/i915_pciids.h  |6 -
 src/sna/kgem.c |   20 +++
 src/sna/kgem.h |1 
 src/sna/sna.h  |2 
 src/sna/sna_accel.c|1 
 src/sna/sna_display.c  |   10 +
 src/sna/sna_display_fake.c |4 
 src/sna/sna_dri2.c |  121 +++-
 src/sna/sna_present.c  |  110 +-
 src/sna/xassert.h  |   21 ++-
 src/uxa/intel_uxa.c|6 -
 test/dri2-race.c   |  264 -
 test/present-speed.c   |   54 +
 test/present-test.c|  255 +--
 tools/cursor.c |   16 ++
 17 files changed, 759 insertions(+), 142 deletions(-)

New commits:
commit 8dee4e4b8ad76371fd754bd24a9d3467d8d8f326
Author: Timo Aaltonen 
Date:   Tue Mar 29 10:54:53 2016 +0300

release to unstable

diff --git a/debian/changelog b/debian/changelog
index f620743..ddbc0e7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-video-intel (2:2.99.917+git20160325-1) unstable; urgency=medium
+
+  * New upstream snapshot.
+
+ -- Timo Aaltonen   Tue, 29 Mar 2016 10:29:35 +0300
+
 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 094924f7f882da1f32395d4c982db6ad8e0f609f
Author: Chris Wilson 
Date:   Fri Mar 25 20:59:48 2016 +

tools/cursor: Print an ASCII representation as well

Show the ASCII outline of the cursor as well as the image stored in the
PNG.

Signed-off-by: Chris Wilson 

diff --git a/tools/cursor.c b/tools/cursor.c
index 6f4e3f8..6a2438a 100644
--- a/tools/cursor.c
+++ b/tools/cursor.c
@@ -61,6 +61,22 @@ int main(int argc, char **argv)
   cur->width, cur->height,
   cur->xhot, cur->yhot);
 
+   if (1) {
+   int x, y;
+
+   src = cur->pixels;
+   for (y = 0; y < cur->height; y++) {
+   for (x = 0; x < cur->width; x++) {
+   if (x == cur->xhot && y == cur->yhot)
+   printf("+");
+   else
+   printf("%c", *src ? *src >> 24 >= 127 ? 
'x' : '.' : ' ');
+   src++;
+   }
+   printf("\n");
+   }
+   }
+
file = fopen("cursor.png", "wb");
if (file == NULL)
return 2;

commit 39fbae3c61cc2d78ac5e7c5c471d161fafd53400
Author: Chris Wilson 
Date:   Thu Mar 24 22:09:48 2016 +

Update i915_pciids.h

Sync with kernel commit 7157bb27e79875db5603aa1e30f56e873a8300f9
Author: Michał Winiarski 
Date:   Fri Feb 5 13:21:42 2016 +0100

drm/i915/skl: Add missing SKL ids

Signed-off-by: Chris Wilson 

diff --git a/src/i915_pciids.h b/src/i915_pciids.h
index f970209..9094599 100644
--- a/src/i915_pciids.h
+++ b/src/i915_pciids.h
@@ -277,7 +277,9 @@
INTEL_VGA_DEVICE(0x191D, info)  /* WKS GT2 */
 
 #define INTEL_SKL_GT3_IDS(info) \
+   INTEL_VGA_DEVICE(0x1923, info), /* ULT GT3 */ \
INTEL_VGA_DEVICE(0x1926, info), /* ULT GT3 */ \
+   INTEL_VGA_DEVICE(0x1927, info), /* ULT GT3 */ \
INTEL_VGA_DEVICE(0x192B, info), /* Halo GT3 */ \
INTEL_VGA_DEVICE(0x192A, info)  /* SRV GT3 */
 
@@ -296,7 +298,9 @@
 #define INTEL_BXT_IDS(info) \
INTEL_VGA_DEVICE(0x0A84, info), \
INTEL_VGA_DEVICE(0x1A84, info), \
-   INTEL_VGA_DEVICE(0x5A84, info)
+   INTEL_VGA_DEVICE(0x1A85, info), \
+   INTEL_VGA_DEVICE(0x5A84, info), /* APL HD Graphics 505 */ \
+   INTEL_VGA_DEVICE(0x5A85, info)  /* APL HD Graphics 500 */
 
 #define INTEL_KBL_GT1_IDS(info)\
INTEL_VGA_DEVICE(0x5913, info), /* ULT GT1.5 */ \

commit 03bed1c7ba838af9aa6ab722aeaa070aa4cc70e3
Author: Lyude 
Date:   Wed Mar 23 15:44:37 2016 -0400

uxa: Restore old bo on failure

When we fail to do a modeset, we need to make sure that we restore the
previous bo in the event that it's changed. Otherwise we'll crash the X
server the next time we do a pageflip.

This fixes an issue with panning crashing the X server if a user tries
to set a large panning resolution such as 5200x3200, and the GPU doesn't
have enough memory to handle the bo due to being in UXA mode.

Signed-off-by: Lyude 
Reviewed-by: Chris Wilson 

diff --git a/src/uxa/intel_uxa.c b/src/uxa/intel_uxa.c
index 590ff5d..830f094 100644
--- a/src/uxa/intel_uxa.c
+++ b/src/uxa/intel_uxa.c
@@ -1068,7 

xserver-xorg-video-intel: Changes to 'debian-unstable'

[Timo Aaltonen]

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

New commits:
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

xserver-xorg-video-intel: Changes to 'debian-unstable'

[Timo Aaltonen]

 debian/changelog   |9 +++--
 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 ++--
 5 files changed, 17 insertions(+), 9 deletions(-)

New commits:
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 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 debian/upstream.changelog
 
 %:
-   dh $@ --with quilt,autoreconf,xsf --builddirectory=build/
+   dh $@ --parallel --with quilt,autoreconf,xsf --builddirectory=build/
 
 # Snapshots should only target experimental:
 generate-snapshot: UPSTREAM_VERSION = $(shell echo $(SOURCE_VERSION) | sed 
's/^[0-9]*://;s/-.*$$//')

commit 951719b29a5a849358b39c505d2f8b8af8cc73f3
Author: Timo Aaltonen 
Date:   Tue Mar 8 15:18:47 2016 +0200

Move the shared libraries into multiarch libdir.

diff --git a/debian/changelog b/debian/changelog
index 91d3321..238588b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,15 @@
 xserver-xorg-video-intel (2:2.99.917+git20160307-1) UNRELEASED; urgency=medium
 
+  [ Timo Aaltonen ]
   * New upstream snapshot.
   * control: Update the description, older hw likely still wants this
 driver.
   * sna-let-modesetting-handle-gen9+.diff: Use modesetting+glamor on
 Skylake and up.
 
+  [ Matthias Klose ]
+  * Move the shared libraries into multiarch libdir.
+
  -- Timo Aaltonen   Mon, 07 Mar 2016 15:20:56 +0200
 
 xserver-xorg-video-intel (2:2.99.917+git20160218-1) unstable; urgency=medium
diff --git a/debian/rules b/debian/rules
index 9b5efd9..8e907f5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -34,6 +34,9 @@ override_dh_install:
find debian/tmp -name '*.la' -delete
rm -f debian/tmp/usr/lib/libI810XvMC.so
rm -f debian/tmp/usr/lib/libIntelXvMC.so
+   mkdir -p debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)
+   mv debian/tmp/usr/lib/libI810XvMC.so.* 
debian/tmp/usr/lib/libIntelXvMC.so.* \
+   debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/.
dh_install --fail-missing
 
 # Debug package:
diff --git a/debian/xserver-xorg-video-intel.install 
b/debian/xserver-xorg-video-intel.install
index b603516..9508a54 100644
--- a/debian/xserver-xorg-video-intel.install
+++ b/debian/xserver-xorg-video-intel.install
@@ -1,7 +1,7 @@
 usr/bin/intel-virtual-output
 usr/lib/xorg/modules/drivers/*.so
-usr/lib/libI810XvMC.so*
-usr/lib/libIntelXvMC.so*
+usr/lib/*/libI810XvMC.so*
+usr/lib/*/libIntelXvMC.so*
 usr/lib/xserver-xorg-video-intel/xf86-video-intel-backlight-helper
 usr/share/polkit-1/actions/org.x.xf86-video-intel.backlight-helper.policy
 usr/share/man
diff --git a/debian/xserver-xorg-video-intel.install.kfreebsd-amd64 
b/debian/xserver-xorg-video-intel.install.kfreebsd-amd64
index 48c5ed0..800b416 100644
--- a/debian/xserver-xorg-video-intel.install.kfreebsd-amd64
+++ b/debian/xserver-xorg-video-intel.install.kfreebsd-amd64
@@ -1,4 +1,4 @@
 usr/lib/xorg/modules/drivers/*.so
-usr/lib/libI810XvMC.so*
-usr/lib/libIntelXvMC.so*
+usr/lib/*/libI810XvMC.so*
+usr/lib/*/libIntelXvMC.so*
 usr/share/man
diff --git a/debian/xserver-xorg-video-intel.install.kfreebsd-i386 
b/debian/xserver-xorg-video-intel.install.kfreebsd-i386
index 

xserver-xorg-video-intel: Changes to 'debian-unstable'

[Timo Aaltonen]

 debian/changelog |   10 
 debian/control   |5 
 debian/patches/series|2 
 debian/patches/sna-let-modesetting-handle-gen9+.diff |   40 +++
 src/sna/kgem.h   |1 
 src/sna/sna_display.c|   22 +
 src/sna/sna_dri2.c   |  212 ---
 7 files changed, 209 insertions(+), 83 deletions(-)

New commits:
commit e43d5b2191c5d9695e29ad2f5ac16c15dc1d9543
Author: Timo Aaltonen 
Date:   Mon Mar 7 17:44:23 2016 +0200

sna-let-modesetting-handle-gen9+.diff: Use modesetting+glamor on Skylake 
and up.

diff --git a/debian/changelog b/debian/changelog
index cf9a229..91d3321 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ xserver-xorg-video-intel (2:2.99.917+git20160307-1) UNRELEASED; 
urgency=medium
   * New upstream snapshot.
   * control: Update the description, older hw likely still wants this
 driver.
+  * sna-let-modesetting-handle-gen9+.diff: Use modesetting+glamor on
+Skylake and up.
 
  -- Timo Aaltonen   Mon, 07 Mar 2016 15:20:56 +0200
 
diff --git a/debian/patches/series b/debian/patches/series
index a82d1b4..aa08141 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1 @@
-#placeholder
+sna-let-modesetting-handle-gen9+.diff
diff --git a/debian/patches/sna-let-modesetting-handle-gen9+.diff 
b/debian/patches/sna-let-modesetting-handle-gen9+.diff
new file mode 100644
index 000..00b6cdb
--- /dev/null
+++ b/debian/patches/sna-let-modesetting-handle-gen9+.diff
@@ -0,0 +1,40 @@
+Aihe: [Intel-gfx] [RFC/PATCH xf86-video-intel] sna: Let modestting + glamor 
handle gen9+
+Lähettäjä: Hans de Goede 
+Päiväys: 29.02.2016 16:47
+Vastaanottaja: intel-...@lists.freedesktop.org
+CC: Hans de Goede , Rob Clark , Adam 
Jackson 
+
+sna has no meaningfull accel for gen9+, this causes problems with i.e.
+apps using XVideo since the sprite XVideo support does not work well
+for many apps.
+
+Therefor it is better to just let the xserver fall back to modesetting +
+glamor. This is implemented by returning FALSE from the probe methods,
+just like how nouveau handles falling back to modesetting for newer cards.
+
+BugLink: https://bugzilla.redhat.com/show_bug.cgi?id=1305369
+Signed-off-by: Hans de Goede 
+---
+ src/intel_module.c | 7 +++
+ 1 file changed, 7 insertions(+)
+
+diff --git a/src/intel_module.c b/src/intel_module.c
+index 60835b9..5979cb9 100644
+--- a/src/intel_module.c
 b/src/intel_module.c
+@@ -571,6 +571,13 @@ intel_scrn_create(DriverPtr   driver,
+   return FALSE;
+   }
+ 
++  /*
++   * We've no accel support for these, so let modesetting + glamor
++   * handle them.
++   */
++  if ((unsigned)((struct intel_device_info *)match_data)->gen >= 0110)
++  return FALSE;
++
+   scrn = xf86AllocateScreen(driver, flags);
+   if (scrn == NULL)
+   return FALSE;
+-- 2.7.2 ___ Intel-gfx mailing 
list intel-...@lists.freedesktop.org 
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
+

commit 38022bf64b442279cd271c5c9abf7dcb5ebe57ca
Author: Timo Aaltonen 
Date:   Mon Mar 7 17:40:23 2016 +0200

control: Update the description, older hw likely still wants this driver.

diff --git a/debian/changelog b/debian/changelog
index 7f3362b..cf9a229 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+xserver-xorg-video-intel (2:2.99.917+git20160307-1) UNRELEASED; urgency=medium
+
+  * New upstream snapshot.
+  * control: Update the description, older hw likely still wants this
+driver.
+
+ -- Timo Aaltonen   Mon, 07 Mar 2016 15:20:56 +0200
+
 xserver-xorg-video-intel (2:2.99.917+git20160218-1) unstable; urgency=medium
 
   * New upstream snapshot.
diff --git a/debian/control b/debian/control
index 5506f73..4fa3c27 100644
--- a/debian/control
+++ b/debian/control
@@ -75,8 +75,9 @@ Description: X.Org X server -- Intel i8xx, i9xx display driver
  .
  This package is built from the X.org xf86-video-intel driver module.
  .
- This driver is deprecated in favor of the server builtin modesetting
- driver.
+ The use of this driver is discouraged if your hw is new enough (ca.
+ 2007 and newer). You can try uninstalling this driver and let the
+ server use it's builtin modesetting driver instead.
 
 Package: xserver-xorg-video-intel-dbg
 Architecture: amd64 i386 kfreebsd-amd64 kfreebsd-i386 x32

commit 0204e55b618af285eb31c6eecc3c57b54319a0f4
Author: Ville Syrjälä 
Date:   Mon Mar 7 09:27:50 2016 +

sna: Restrict reflected rotations to be rotations

After rolling the bits to the left 

xserver-xorg-video-intel: Changes to 'debian-unstable'

[Timo Aaltonen]

 debian/changelog   |6 
 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, 1224 insertions(+), 313 deletions(-)

New commits:
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,
+  DRM_IOCTL_MODE_DIRTYFB,
+  ) == 0;
+
+   /* XXX There may be multiple levels of DIRTYFB, depending on
+* whether the kernel thinks tracking dirty regions is
+* beneficial vs flagging the whole fb as dirty.
+*/
+
+   drmIoctl(kgem->fd,
+DRM_IOCTL_MODE_RMFB,
+_id);
+   }
+   gem_close(kgem->fd, create.handle);
+
+   return ret;
+}
+
 static bool test_has_secure_batches(struct kgem *kgem)
 {
if 

xserver-xorg-video-intel: Changes to 'debian-unstable'

[Timo Aaltonen]

 Makefile.am  |2 
 NEWS |   14 
 benchmarks/.gitignore|2 
 benchmarks/Makefile.am   |   14 
 benchmarks/dri2-swap.c   |  588 +++
 benchmarks/dri3-swap.c   |  595 +++
 configure.ac |  112 
 debian/changelog |   28 
 debian/control   |9 
 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 |   51 
 debian/patches/series|4 
 debian/rules |2 
 libobj/alloca.c  |4 
 man/intel.man|   53 
 src/backlight.c  |   70 
 src/backlight.h  |2 
 src/compat-api.h |   27 
 src/i915_pciids.h|  124 
 src/intel_device.c   |   53 
 src/intel_driver.h   |1 
 src/intel_list.h |   38 
 src/intel_module.c   |   79 
 src/intel_options.c  |   91 
 src/intel_options.h  |7 
 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|  123 
 src/sna/gen4_render.c|   60 
 src/sna/gen5_render.c|   55 
 src/sna/gen6_common.h|  127 
 src/sna/gen6_render.c|  133 
 src/sna/gen7_render.c|  152 
 src/sna/gen8_render.c|  183 
 src/sna/kgem.c   | 1527 +---
 src/sna/kgem.h   |   62 
 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|  129 
 src/sna/sna_accel.c  |  706 ++-
 src/sna/sna_blt.c|  206 -
 src/sna/sna_composite.c  |  104 
 src/sna/sna_damage.h |5 
 src/sna/sna_display.c| 2805 +++
 src/sna/sna_display_fake.c   |3 
 src/sna/sna_dri2.c   | 1966 ++
 src/sna/sna_dri3.c   |   13 
 src/sna/sna_driver.c |  330 -
 src/sna/sna_glyphs.c |   94 
 src/sna/sna_io.c |   31 
 src/sna/sna_present.c|  510 ++
 src/sna/sna_render.c |   26 
 src/sna/sna_render.h |9 
 src/sna/sna_render_inline.h  |6 
 src/sna/sna_tiling.c |4 
 src/sna/sna_trapezoids_boxes.c   |4 
 src/sna/sna_trapezoids_imprecise.c   |  344 -
 src/sna/sna_trapezoids_mono.c|  125 
 src/sna/sna_trapezoids_precise.c |  344 -
 src/sna/sna_video.c  |   66 
 src/sna/sna_video.h  |   

xserver-xorg-video-intel: Changes to 'debian-unstable'

[Vincent Cheng]

 debian/changelog |3 +++
 debian/control   |4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)

New commits:
commit e21dfae4059599d5dd033434d0ce380f06f2b739
Author: Vincent Cheng vch...@debian.org
Date:   Thu Jul 16 01:29:13 2015 -0700

Add x32 to the list of architectures

diff --git a/debian/changelog b/debian/changelog
index b59a434..0ad759f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,6 +16,9 @@ xserver-xorg-video-intel (2:2.99.917-2) UNRELEASED; 
urgency=medium
 which are real files on the tarball, and add a command to clean
 those before source build (copied from libdrm).
 
+  [ Adam Borowski ]
+  * Add x32 to the list of architectures. (Closes: #775200)
+
  -- Vincent Cheng vch...@debian.org  Thu, 16 Jul 2015 01:00:41 -0700
 
 xserver-xorg-video-intel (2:2.99.917-1) unstable; urgency=medium
diff --git a/debian/control b/debian/control
index 8ec8270..57cd3f9 100644
--- a/debian/control
+++ b/debian/control
@@ -52,7 +52,7 @@ Vcs-Browser: 
http://anonscm.debian.org/gitweb/?p=pkg-xorg/driver/xserver-xorg-vi
 Homepage: http://www.x.org/
 
 Package: xserver-xorg-video-intel
-Architecture: amd64 i386 kfreebsd-amd64 kfreebsd-i386
+Architecture: amd64 i386 kfreebsd-amd64 kfreebsd-i386 x32
 Depends:
  ${shlibs:Depends},
  ${misc:Depends},
@@ -70,7 +70,7 @@ Description: X.Org X server -- Intel i8xx, i9xx display driver
  This package is built from the X.org xf86-video-intel driver module.
 
 Package: xserver-xorg-video-intel-dbg
-Architecture: amd64 i386 kfreebsd-amd64 kfreebsd-i386
+Architecture: amd64 i386 kfreebsd-amd64 kfreebsd-i386 x32
 Depends:
  xserver-xorg-video-intel (= ${binary:Version}),
  ${shlibs:Depends},


-- 
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/e1zfexf-so...@moszumanska.debian.org

xserver-xorg-video-intel: Changes to 'debian-unstable'

[Vincent Cheng]

 debian/changelog |6 +-
 debian/control   |4 ++--
 debian/source/format |1 +
 3 files changed, 8 insertions(+), 3 deletions(-)

New commits:
commit f772b2a213782311a52f079a373495970a0d27ba
Author: Vincent Cheng vch...@debian.org
Date:   Thu Jul 16 01:39:25 2015 -0700

finalize changelog

diff --git a/debian/changelog b/debian/changelog
index fb14ff3..0a7c146 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xserver-xorg-video-intel (2:2.99.917-2) UNRELEASED; urgency=medium
+xserver-xorg-video-intel (2:2.99.917-2) unstable; urgency=medium
 
   [ Robert Ancell ]
   * debian/patches/fix-sna-fstat-include.patch:

commit 7823c23112c2e730a36eb14ea8b601a1ed7a24e8
Author: Vincent Cheng vch...@debian.org
Date:   Thu Jul 16 01:37:43 2015 -0700

update Vcs-Browser to point to cgit instead of gitweb

diff --git a/debian/control b/debian/control
index 033e51e..b71be56 100644
--- a/debian/control
+++ b/debian/control
@@ -48,7 +48,7 @@ Build-Depends:
  libpixman-1-dev,
 Standards-Version: 3.9.6
 Vcs-Git: git://anonscm.debian.org/pkg-xorg/driver/xserver-xorg-video-intel
-Vcs-Browser: 
http://anonscm.debian.org/gitweb/?p=pkg-xorg/driver/xserver-xorg-video-intel.git
+Vcs-Browser: 
http://anonscm.debian.org/cgit/pkg-xorg/driver/xserver-xorg-video-intel.git
 Homepage: http://www.x.org/
 
 Package: xserver-xorg-video-intel

commit 6411bae4d5fcde9c4d7e8ef10235db16c6b01ef2
Author: Vincent Cheng vch...@debian.org
Date:   Thu Jul 16 01:36:57 2015 -0700

Update valgrind build-dependency architecture list

diff --git a/debian/changelog b/debian/changelog
index 074906e..fb14ff3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -21,6 +21,7 @@ xserver-xorg-video-intel (2:2.99.917-2) UNRELEASED; 
urgency=medium
 
   [ Vincent Cheng ]
   * Explicitly declare source format 1.0.
+  * Update valgrind build-dependency architecture list.
 
  -- Vincent Cheng vch...@debian.org  Thu, 16 Jul 2015 01:00:41 -0700
 
diff --git a/debian/control b/debian/control
index 57cd3f9..033e51e 100644
--- a/debian/control
+++ b/debian/control
@@ -37,7 +37,7 @@ Build-Depends:
  libudev-dev [linux-any],
  quilt,
  xutils-dev (= 1:7.5+4),
- valgrind [amd64 armel armhf i386 mips mipsel powerpc s390x],
+ valgrind [amd64 arm64 armhf i386 mips mipsel mips64 mips64el powerpc ppc64 
ppc64el s390x x32],
 # intel-virtual-output:
  libxinerama-dev,
  libxrandr-dev,

commit f6d8694af8db627759f0e5dff74590cef9f66dbd
Author: Vincent Cheng vch...@debian.org
Date:   Thu Jul 16 01:30:27 2015 -0700

explicitly declare source format 1.0

diff --git a/debian/changelog b/debian/changelog
index 0ad759f..074906e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -19,6 +19,9 @@ xserver-xorg-video-intel (2:2.99.917-2) UNRELEASED; 
urgency=medium
   [ Adam Borowski ]
   * Add x32 to the list of architectures. (Closes: #775200)
 
+  [ Vincent Cheng ]
+  * Explicitly declare source format 1.0.
+
  -- Vincent Cheng vch...@debian.org  Thu, 16 Jul 2015 01:00:41 -0700
 
 xserver-xorg-video-intel (2:2.99.917-1) unstable; urgency=medium
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 000..d3827e7
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+1.0


-- 
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/e1zfehz-0005gw...@moszumanska.debian.org

xserver-xorg-video-intel: Changes to 'debian-unstable'

[Vincent Cheng]

 debian/README.source |6 +
 debian/changelog |   19 +
 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 |   51 +
 debian/patches/series|4 -
 debian/rules |4 -
 7 files changed, 161 insertions(+), 3 deletions(-)

New commits:
commit f09c2cf695635cf87173dacd233d0994646254db
Author: Timo Aaltonen tjaal...@debian.org
Date:   Wed Jan 28 18:24:31 2015 +0200

README.source: Mention that dpkg-source complains about symlinks which are 
real files on the tarball, and add a command to clean those before source build 
(copied from libdrm).

diff --git a/debian/README.source b/debian/README.source
index 4ecd5e6..f9bb7c6 100644
--- a/debian/README.source
+++ b/debian/README.source
@@ -14,6 +14,12 @@ Quick Guide To Patching This Package For The Impatient
 Alternatively, instead of using quilt directly, you can drop the patch in to 
 debian/patches and add the name of the patch to debian/patches/series.
 
+While building from git, dpkg-source can complain about symlinks vs.
+normal files mismatches. To work around this issue, before uploading,
+and without committing:
+
+  find -type l | while read dest; do src=$(readlink -f $dest); rm $dest; cp 
$src $dest; done
+
 
 Guide To The X Strike Force Packages
 
diff --git a/debian/changelog b/debian/changelog
index afd2683..25e331c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,9 @@ xserver-xorg-video-intel (2:2.99.917-2) UNRELEASED; 
urgency=medium
 
   [ Timo Aaltonen ]
   * rules: Fix valgrind-enabling check.
+  * README.source: Mention that dpkg-source complains about symlinks
+which are real files on the tarball, and add a command to clean
+those before source build (copied from libdrm).
 
  -- Vincent Cheng vch...@debian.org  Thu, 16 Jul 2015 01:00:41 -0700
 

commit 53b8d09453821f4f41316ab60e83cd8798606746
Author: Timo Aaltonen tjaal...@debian.org
Date:   Tue Jan 13 12:34:40 2015 +0200

rules: Fix valgrind-enabling check.

Conflicts:
debian/changelog

diff --git a/debian/changelog b/debian/changelog
index c2d54db..afd2683 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,9 @@ xserver-xorg-video-intel (2:2.99.917-2) UNRELEASED; 
urgency=medium
   * fix-yuv-to-rgb-shared-on-intel-gen8.patch: Fix faulty yuv2rgb translation
 on Intel Generation 8 Graphics. (LP: #1449892, Closes: #787142)
 
+  [ Timo Aaltonen ]
+  * rules: Fix valgrind-enabling check.
+
  -- Vincent Cheng vch...@debian.org  Thu, 16 Jul 2015 01:00:41 -0700
 
 xserver-xorg-video-intel (2:2.99.917-1) unstable; urgency=medium
diff --git a/debian/rules b/debian/rules
index e2161e2..318c14d 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

commit 9c0699c089a1b24e15960e2a840156e95ecb4d52
Author: Vincent Cheng vch...@debian.org
Date:   Thu Jul 16 01:16:18 2015 -0700

Fix faulty yuv2rgb translation on Intel Generation 8 Graphics

diff --git a/debian/changelog b/debian/changelog
index 8694f2f..c2d54db 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,10 @@ xserver-xorg-video-intel (2:2.99.917-2) UNRELEASED; 
urgency=medium
   * debian/patches/fix-uxa-fstat-include.patch:
 - Fix missing include for fstat (Closes: #790911)
 
+  [ Alessio Treglia ]
+  * fix-yuv-to-rgb-shared-on-intel-gen8.patch: Fix faulty yuv2rgb translation
+on Intel Generation 8 Graphics. (LP: #1449892, Closes: #787142)
+
  -- Vincent Cheng vch...@debian.org  Thu, 16 Jul 2015 01:00:41 -0700
 
 xserver-xorg-video-intel (2:2.99.917-1) unstable; urgency=medium
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
+---

xserver-xorg-video-intel: Changes to 'debian-unstable'

[Vincent Cheng]

 debian/changelog|1 +
 debian/source/local-options |1 +
 2 files changed, 2 insertions(+)

New commits:
commit 0e45c441be4500254d3fe01e2e0aa7f7d9c4b67d
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.

Conflicts:
debian/changelog

diff --git a/debian/changelog b/debian/changelog
index 25e331c..b59a434 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,7 @@ xserver-xorg-video-intel (2:2.99.917-2) UNRELEASED; 
urgency=medium
 
   [ Timo Aaltonen ]
   * rules: Fix valgrind-enabling check.
+  * source: Add extend-diff-ignore to not complain about symlinks.
   * README.source: Mention that dpkg-source complains about symlinks
 which are real files on the tarball, and add a command to clean
 those before source build (copied from libdrm).
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


-- 
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/e1zferq-bn...@moszumanska.debian.org

xserver-xorg-video-intel: Changes to 'debian-unstable'

[Vincent Cheng]

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

New commits:
commit 62bc0e26a6470b42bf5cc882553fcb96f9b23ead
Author: Vincent Cheng vch...@debian.org
Date:   Thu May 7 00:46:42 2015 -0700

upload to unstable

diff --git a/debian/changelog b/debian/changelog
index 2db9ab1..1593856 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+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~exp1) experimental; urgency=medium
 
   * New upstream prerelease 2.99.917.


-- 
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/e1yqgwc-0005lv...@moszumanska.debian.org

xserver-xorg-video-intel: Changes to 'debian-unstable'

[Vincent Cheng]

 AUTHORS |2 
 Makefile.am |2 
 NEWS|  621 
 README  |9 
 configure.ac|  806 
 debian/changelog|   84 
 debian/control  |   16 
 debian/copyright|  360 
 debian/patches/series   |1 
 debian/rules|1 
 debian/upstream.changelog   |17470 
 debian/xserver-xorg-video-intel.install |3 
 debian/xserver-xorg-video-intel.install.kfreebsd-amd64  |4 
 debian/xserver-xorg-video-intel.install.kfreebsd-i386   |4 
 debian/xserver-xorg-video-intel.maintscript |1 
 libobj/Makefile.am  |3 
 libobj/getline.c|   51 
 libobj/ignore.c |6 
 man/intel.man   |   80 
 src/Makefile.am |   18 
 src/backlight.c |  559 
 src/backlight.h |   60 
 src/compat-api.h|   61 
 src/fd.c|   93 
 src/fd.h|   34 
 src/i915_pciids.h   |   72 
 src/intel_device.c  |  634 
 src/intel_driver.h  |   38 
 src/intel_list.h|5 
 src/intel_module.c  |  194 
 src/intel_options.c |7 
 src/intel_options.h |6 
 src/legacy/Makefile.am  |2 
 src/legacy/i810/Makefile.am |3 
 src/legacy/i810/i810_accel.c|1 
 src/legacy/i810/i810_common.h   |4 
 src/legacy/i810/i810_cursor.c   |5 
 src/legacy/i810/i810_dga.c  |1 
 src/legacy/i810/i810_dri.c  |1 
 src/legacy/i810/i810_driver.c   |5 
 src/legacy/i810/i810_hwmc.c |1 
 src/legacy/i810/i810_memory.c   |3 
 src/legacy/i810/i810_ring.h |2 
 src/legacy/i810/i810_video.c|1 
 src/legacy/i810/i810_wmark.c|1 
 src/legacy/i810/i810_xaa.c  |1 
 src/legacy/i810/xvmc/Makefile.am|4 
 src/render_program/Makefile.am  |   32 
 src/render_program/exa_wm_src_affine.g8a|1 
 src/render_program/exa_wm_src_affine.g8b|4 
 src/render_program/exa_wm_src_sample_argb.g8a   |1 
 src/render_program/exa_wm_src_sample_argb.g8b   |3 
 src/render_program/exa_wm_src_sample_planar.g8a |1 
 src/render_program/exa_wm_src_sample_planar.g8b |5 
 src/render_program/exa_wm_write.g8a |1 
 src/render_program/exa_wm_write.g8b |   17 
 src/render_program/exa_wm_yuv_rgb.g8a   |  105 
 src/render_program/exa_wm_yuv_rgb.g8b   |   19 
 src/sna/Makefile.am |   47 
 src/sna/blt.c   |  184 
 src/sna/brw/Makefile.am |3 
 src/sna/brw/brw_eu.c|4 
 src/sna/brw/brw_eu.h|2 
 src/sna/brw/brw_eu_emit.c   |7 
 src/sna/brw/brw_eu_util.c   |  126 
 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|   20 
 src/sna/debug.h |   44 
 src/sna/fb/fb.h |7 
 src/sna/fb/fbbitmap.c   |4 
 src/sna/fb/fbclip.c |2 
 src/sna/fb/fbgc.c   |1 
 src/sna/fb/fbline.c |   14 
 src/sna/fb/fblinebits.h   

xserver-xorg-video-intel: Changes to 'debian-unstable'

[Julien Cristau]

 debian/changelog |   10 ++
 src/compat-api.h |4 
 2 files changed, 14 insertions(+)

New commits:
commit 8b89b0ab833d2752731e0862364d47ee72e411af
Author: Julien Cristau jcris...@debian.org
Date:   Tue Feb 4 15:24:41 2014 +0100

Upload to unstable

diff --git a/debian/changelog b/debian/changelog
index e598318..99d82ee 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+xserver-xorg-video-intel (2:2.21.15-2) unstable; urgency=medium
+
+  [ Michael Stapelberg ]
+  * Revert back to 1.0 source format.
+
+  [ Julien Cristau ]
+  * Cherry-pick upstream build fix for xserver 1.15 (closes: #736980).
+
+ -- Julien Cristau jcris...@debian.org  Tue, 04 Feb 2014 15:24:32 +0100
+
 xserver-xorg-video-intel (2:2.21.15-1) unstable; urgency=low
 
   * New upstream release.

commit 9fe518d9f4d866a8cca91bf47730379ba5541713
Author: Chris Wilson ch...@chris-wilson.co.uk
Date:   Sat Oct 5 18:42:24 2013 +0100

compat-api: Map changes of DamageUnregister API in 1.14.99.2

Reported-by: Emmanuel Benisty benist...@gmail.com
Signed-off-by: Chris Wilson ch...@chris-wilson.co.uk
(cherry picked from commit 524a45da56e2a052ffafa3887891caa90ba39f76)

diff --git a/src/compat-api.h b/src/compat-api.h
index d80b7fe..271c7d6 100644
--- a/src/compat-api.h
+++ b/src/compat-api.h
@@ -158,4 +158,8 @@ static inline void FreePixmap(PixmapPtr pixmap)
if ((d)-pScreen-SourceValidate) (d)-pScreen-SourceValidate(d, x, y, 
w, h)
 #endif
 
+#if XORG_VERSION_CURRENT = XORG_VERSION_NUMERIC(1,14,99,2,0)
+#define DamageUnregister(d, dd) DamageUnregister(dd)
+#endif
+
 #endif


-- 
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/e1wahgv-0007uf...@moszumanska.debian.org

xserver-xorg-video-intel: Changes to 'debian-unstable'

[Michael Stapelberg]

 debian/source/format |1 -
 1 file changed, 1 deletion(-)

New commits:
commit 9bda522369888228929592f3c4818b4f38c45fa4
Author: Michael Stapelberg stapelb...@debian.org
Date:   Tue Oct 1 18:25:56 2013 +0200

Revert specify '3.0 (quilt)' source format

This reverts commit 34fa27e8d6282aee1e2134b07bdae0f6930c5ee8.

Turns out that debian-x is in two worlds at the same time:

We use the orig tarball to build the package,
but we directly track upstream in git in the packaging.

source format 1.0 is better than 3.0 (quilt) for that workflow. With
3.0 (quilt), as an example, the following fails when upstream has
differences between the git repository and the released tarball (and
upstream does, in our case):

git clone git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-video-intel
cd xserver-xorg-video-intel
uscan --download-current-version
debuild -S

diff --git a/debian/source/format b/debian/source/format
deleted file mode 100644
index 163aaf8..000
--- a/debian/source/format
+++ /dev/null
@@ -1 +0,0 @@
-3.0 (quilt)


-- 
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/e1vr2oc-0002kk...@vasks.debian.org

xserver-xorg-video-intel: Changes to 'debian-unstable'

[Julien Cristau]

 debian/changelog |6 ++
 debian/rules |   18 +++---
 2 files changed, 21 insertions(+), 3 deletions(-)

New commits:
commit 8c0a700d6ed7699c43845e8b1452650de2d8e618
Author: Julien Cristau jcris...@debian.org
Date:   Mon Aug 12 10:13:49 2013 +0200

Upload to unstable

diff --git a/debian/changelog b/debian/changelog
index 258a8b8..d5bcbc5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,8 @@
-xserver-xorg-video-intel (2:2.21.14-2) UNRELEASED; urgency=low
+xserver-xorg-video-intel (2:2.21.14-2) unstable; urgency=low
 
   * Don't enable valgrind on kfreebsd.
 
- -- Julien Cristau jcris...@debian.org  Mon, 12 Aug 2013 10:09:06 +0200
+ -- Julien Cristau jcris...@debian.org  Mon, 12 Aug 2013 10:09:25 +0200
 
 xserver-xorg-video-intel (2:2.21.14-1) unstable; urgency=low
 

commit 4d040d1c23867a3f7c25e6a30b769c33aab1bf0e
Author: Julien Cristau jcris...@debian.org
Date:   Mon Aug 12 10:09:24 2013 +0200

Don't enable valgrind on kfreebsd.

diff --git a/debian/changelog b/debian/changelog
index 20945cb..258a8b8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-video-intel (2:2.21.14-2) UNRELEASED; urgency=low
+
+  * Don't enable valgrind on kfreebsd.
+
+ -- Julien Cristau jcris...@debian.org  Mon, 12 Aug 2013 10:09:06 +0200
+
 xserver-xorg-video-intel (2:2.21.14-1) unstable; urgency=low
 
   * New upstream release (closes: #697336).
diff --git a/debian/rules b/debian/rules
index 437f5eb..dcca05a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -8,11 +8,23 @@ 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)
+
+ifeq ($(DEB_HOST_ARCH), linux)
+valgrind = --enable-valgrind
+else
+valgrind = --disable-valgrind
+endif
+
 # Enable SNA, pass builderstring:
 override_dh_auto_configure:
-   dh_auto_configure -- --enable-sna --enable-uxa --with-default-accel=uxa 
\
---with-builderstring=$(SOURCE_NAME) 
$(SOURCE_VERSION) ($(BUILDER)) \
---disable-silent-rules --enable-valgrind
+   dh_auto_configure -- \
+   --enable-sna \
+   --enable-uxa \
+   --with-default-accel=uxa \
+   --with-builderstring=$(SOURCE_NAME) $(SOURCE_VERSION) 
($(BUILDER)) \
+   --disable-silent-rules \
+   $(valgrind)
 
 # Install in debian/tmp to retain control through dh_install:
 override_dh_auto_install:


-- 
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/e1v8nhl-0003ur...@vasks.debian.org

xserver-xorg-video-intel: Changes to 'debian-unstable'

[Julien Cristau]

 debian/changelog   |7 +
 debian/patches/Check-for-struct-sysinfo-as-well-as-sys-sysinfo.h.patch |   51 
++
 debian/patches/series  |2 
 3 files changed, 59 insertions(+), 1 deletion(-)

New commits:
commit ebf161f3c0f4df4e54bf453e058bf1b1e3fb9e00
Author: Julien Cristau jcris...@debian.org
Date:   Mon Aug 12 15:31:40 2013 +0200

Upload to unstable

diff --git a/debian/changelog b/debian/changelog
index fe193cf..dd638b3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
-xserver-xorg-video-intel (2:2.21.14-3) UNRELEASED; urgency=low
+xserver-xorg-video-intel (2:2.21.14-3) unstable; urgency=low
 
   * Add patch to deal with missing 'struct sysinfo' in kfreebsd's
 sys/sysinfo.h.
 
- -- Julien Cristau jcris...@debian.org  Mon, 12 Aug 2013 15:30:20 +0200
+ -- Julien Cristau jcris...@debian.org  Mon, 12 Aug 2013 15:31:14 +0200
 
 xserver-xorg-video-intel (2:2.21.14-2) unstable; urgency=low
 

commit 81c096e2887ece4bb1ec711b07b0a26366e2529c
Author: Julien Cristau jcris...@debian.org
Date:   Mon Aug 12 15:30:56 2013 +0200

Add patch to deal with missing 'struct sysinfo' in kfreebsd's 
sys/sysinfo.h.

diff --git a/debian/changelog b/debian/changelog
index d5bcbc5..fe193cf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xserver-xorg-video-intel (2:2.21.14-3) UNRELEASED; urgency=low
+
+  * Add patch to deal with missing 'struct sysinfo' in kfreebsd's
+sys/sysinfo.h.
+
+ -- Julien Cristau jcris...@debian.org  Mon, 12 Aug 2013 15:30:20 +0200
+
 xserver-xorg-video-intel (2:2.21.14-2) unstable; urgency=low
 
   * Don't enable valgrind on kfreebsd.
diff --git 
a/debian/patches/Check-for-struct-sysinfo-as-well-as-sys-sysinfo.h.patch 
b/debian/patches/Check-for-struct-sysinfo-as-well-as-sys-sysinfo.h.patch
new file mode 100644
index 000..ff4c0bd
--- /dev/null
+++ b/debian/patches/Check-for-struct-sysinfo-as-well-as-sys-sysinfo.h.patch
@@ -0,0 +1,51 @@
+From 73afe87de5d5cab04680c5954dad1f2ee9e2e5f4 Mon Sep 17 00:00:00 2001
+From: Julien Cristau jcris...@debian.org
+Date: Mon, 12 Aug 2013 14:38:22 +0200
+Subject: [PATCH 1/2] Check for struct sysinfo as well as sys/sysinfo.h
+
+Non-linux glibc systems have the latter but not the former.
+
+Signed-off-by: Julien Cristau jcris...@debian.org
+---
+ configure.ac   |2 +-
+ src/sna/kgem.c |4 ++--
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 7235bde..aa98966 100644
+--- a/configure.ac
 b/configure.ac
+@@ -211,7 +211,7 @@ AC_ARG_ENABLE(sna,
+ 
+ if test x$SNA != xno; then
+   AC_DEFINE(USE_SNA, 1, [Enable SNA support])
+-  AC_CHECK_HEADERS([sys/sysinfo.h])
++  AC_CHECK_HEADERS([sys/sysinfo.h], AC_CHECK_MEMBERS([struct 
sysinfo.totalram], [], [], [[#include sys/sysinfo.h]]))
+ fi
+ AC_MSG_CHECKING([whether to include SNA support])
+ AM_CONDITIONAL(SNA, test x$SNA != xno)
+diff --git a/src/sna/kgem.c b/src/sna/kgem.c
+index 5afe05f..98e801a 100644
+--- a/src/sna/kgem.c
 b/src/sna/kgem.c
+@@ -46,7 +46,7 @@
+ #include memcheck.h
+ #endif
+ 
+-#if HAVE_SYS_SYSINFO_H
++#ifdef HAVE_STRUCT_SYSINFO_TOTALRAM
+ #include sys/sysinfo.h
+ #endif
+ 
+@@ -694,7 +694,7 @@ agp_aperture_size(struct pci_device *dev, unsigned gen)
+ static size_t
+ total_ram_size(void)
+ {
+-#if HAVE_SYS_SYSINFO_H
++#ifdef HAVE_STRUCT_SYSINFO_TOTALRAM
+   struct sysinfo info;
+   if (sysinfo(info) == 0)
+   return info.totalram * info.mem_unit;
+-- 
+1.7.10.4
+
diff --git a/debian/patches/series b/debian/patches/series
index 9ed72bb..8a2257c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1 @@
-# empty for now
+Check-for-struct-sysinfo-as-well-as-sys-sysinfo.h.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/e1v8srf-0002zy...@vasks.debian.org

xserver-xorg-video-intel: Changes to 'debian-unstable'

[Julien Cristau]

 debian/changelog|7 +++
 debian/patches/Link-the-driver-against-pixman.patch |   38 
 debian/patches/series   |1 
 3 files changed, 46 insertions(+)

New commits:
commit 7ec16ddfc59db873f4d5919bf4e300969ef9d89e
Author: Julien Cristau jcris...@debian.org
Date:   Mon Aug 12 19:48:48 2013 +0200

Upload to unstable

diff --git a/debian/changelog b/debian/changelog
index 1868d4a..99835f1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
-xserver-xorg-video-intel (2:2.21.14-4) UNRELEASED; urgency=low
+xserver-xorg-video-intel (2:2.21.14-4) unstable; urgency=low
 
   * Link the driver against pixman to get correct dependency (closes: #719518).
 Thanks to Martin Perazzo for the report!
 
- -- Julien Cristau jcris...@debian.org  Mon, 12 Aug 2013 19:36:46 +0200
+ -- Julien Cristau jcris...@debian.org  Mon, 12 Aug 2013 19:48:43 +0200
 
 xserver-xorg-video-intel (2:2.21.14-3) unstable; urgency=low
 

commit 55f8f83a0cb6857b2ed4ca09f63522700ed61cb7
Author: Julien Cristau jcris...@debian.org
Date:   Mon Aug 12 19:37:28 2013 +0200

Link the driver against pixman to get correct dependency (closes: #719518).

Thanks to Martin Perazzo for the report!

diff --git a/debian/changelog b/debian/changelog
index dd638b3..1868d4a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xserver-xorg-video-intel (2:2.21.14-4) UNRELEASED; urgency=low
+
+  * Link the driver against pixman to get correct dependency (closes: #719518).
+Thanks to Martin Perazzo for the report!
+
+ -- Julien Cristau jcris...@debian.org  Mon, 12 Aug 2013 19:36:46 +0200
+
 xserver-xorg-video-intel (2:2.21.14-3) unstable; urgency=low
 
   * Add patch to deal with missing 'struct sysinfo' in kfreebsd's
diff --git a/debian/patches/Link-the-driver-against-pixman.patch 
b/debian/patches/Link-the-driver-against-pixman.patch
new file mode 100644
index 000..203552f
--- /dev/null
+++ b/debian/patches/Link-the-driver-against-pixman.patch
@@ -0,0 +1,38 @@
+From 666b4e7005b1b538c0320fbf4117e4477a61f951 Mon Sep 17 00:00:00 2001
+From: Julien Cristau jcris...@debian.org
+Date: Mon, 12 Aug 2013 19:31:53 +0200
+Subject: [PATCH 1/2] Link the driver against pixman
+
+---
+ configure.ac|1 +
+ src/Makefile.am |2 +-
+ 2 files changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index 104113e..bd5ce9d 100644
+--- a/configure.ac
 b/configure.ac
+@@ -392,6 +392,7 @@ XORG_DRIVER_CHECK_EXT(DPMSExtension, xextproto)
+ # Obtain compiler/linker options for the driver dependencies
+ PKG_CHECK_MODULES(DRM, [libdrm = 2.4.20]) # libdrm_intel is checked 
separately
+ PKG_CHECK_MODULES(PCIACCESS, [pciaccess = 0.10])
++PKG_CHECK_MODULES(PIXMAN, [pixman-1])
+ 
+ LIBS=
+ AC_SEARCH_LIBS(clock_gettime, rt, [CLOCK_GETTIME_LIBS=$LIBS])
+diff --git a/src/Makefile.am b/src/Makefile.am
+index 16b6967..8810b74 100644
+--- a/src/Makefile.am
 b/src/Makefile.am
+@@ -37,7 +37,7 @@ AM_CFLAGS = \
+ intel_drv_la_LTLIBRARIES = intel_drv.la
+ intel_drv_la_LDFLAGS = -module -avoid-version
+ intel_drv_ladir = @moduledir@/drivers
+-intel_drv_la_LIBADD = legacy/liblegacy.la @PCIACCESS_LIBS@
++intel_drv_la_LIBADD = legacy/liblegacy.la @PCIACCESS_LIBS@ $(PIXMAN_LIBS)
+ 
+ if SNA
+ SUBDIRS += sna
+-- 
+1.7.10.4
+
diff --git a/debian/patches/series b/debian/patches/series
index 8a2257c..25dca33 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 Check-for-struct-sysinfo-as-well-as-sys-sysinfo.h.patch
+Link-the-driver-against-pixman.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/e1v8wje-0005c5...@vasks.debian.org

xserver-xorg-video-intel: Changes to 'debian-unstable'

[Julien Cristau]

 debian/changelog|7 +++
 debian/i915-kms.conf|1 -
 debian/xserver-xorg-video-intel.install |2 --
 3 files changed, 7 insertions(+), 3 deletions(-)

New commits:
commit 8ab872522ae0891b8fb52fbb31db52d581c3efa3
Author: Julien Cristau jcris...@debian.org
Date:   Sun Sep 16 20:47:05 2012 +0200

Upload to unstable

diff --git a/debian/changelog b/debian/changelog
index ca83969..db887a2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
-xserver-xorg-video-intel (2:2.19.0-6) UNRELEASED; urgency=low
+xserver-xorg-video-intel (2:2.19.0-6) unstable; urgency=low
 
   * Stop installing i915-kms.conf.  It's not necessary with the wheezy kernel.
 Keep it around on upgrade, though, to allow booting on the squeeze kernel.
 
- -- Julien Cristau jcris...@debian.org  Sun, 16 Sep 2012 20:38:36 +0200
+ -- Julien Cristau jcris...@debian.org  Sun, 16 Sep 2012 20:46:52 +0200
 
 xserver-xorg-video-intel (2:2.19.0-5) unstable; urgency=high
 

commit 962f04f8fe455d093a52370ff7349f776b947ee9
Author: Julien Cristau jcris...@debian.org
Date:   Sun Sep 16 20:40:00 2012 +0200

Stop installing i915-kms.conf.

It's not necessary with the wheezy kernel. Keep it around on upgrade,
though, to allow booting on the squeeze kernel.

diff --git a/debian/changelog b/debian/changelog
index 31df6c9..ca83969 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xserver-xorg-video-intel (2:2.19.0-6) UNRELEASED; urgency=low
+
+  * Stop installing i915-kms.conf.  It's not necessary with the wheezy kernel.
+Keep it around on upgrade, though, to allow booting on the squeeze kernel.
+
+ -- Julien Cristau jcris...@debian.org  Sun, 16 Sep 2012 20:38:36 +0200
+
 xserver-xorg-video-intel (2:2.19.0-5) unstable; urgency=high
 
   * Reduce maximum thread count for IVB GT1 to avoid spontaneous combustion
diff --git a/debian/i915-kms.conf b/debian/i915-kms.conf
deleted file mode 100644
index 597ac60..000
--- a/debian/i915-kms.conf
+++ /dev/null
@@ -1 +0,0 @@
-options i915 modeset=1
diff --git a/debian/xserver-xorg-video-intel.install 
b/debian/xserver-xorg-video-intel.install
index b6b04ff..48c5ed0 100644
--- a/debian/xserver-xorg-video-intel.install
+++ b/debian/xserver-xorg-video-intel.install
@@ -2,5 +2,3 @@ usr/lib/xorg/modules/drivers/*.so
 usr/lib/libI810XvMC.so*
 usr/lib/libIntelXvMC.so*
 usr/share/man
-
-../i915-kms.conf /etc/modprobe.d


-- 
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/e1tdkof-00064j...@vasks.debian.org

xserver-xorg-video-intel: Changes to 'debian-unstable'

[Julien Cristau]

 debian/changelog  |6 ++
 src/i965_render.c |2 +-
 src/i965_video.c  |2 +-
 3 files changed, 8 insertions(+), 2 deletions(-)

New commits:
commit 29c1e5fe54d3c282448d706b6cefbabb36e77e61
Author: Julien Cristau jcris...@debian.org
Date:   Fri Jul 27 10:54:39 2012 +0200

Upload to unstable

diff --git a/debian/changelog b/debian/changelog
index 9c97d52..31df6c9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-video-intel (2:2.19.0-5) unstable; urgency=high
+
+  * Reduce maximum thread count for IVB GT1 to avoid spontaneous combustion
+
+ -- Julien Cristau jcris...@debian.org  Fri, 27 Jul 2012 10:54:27 +0200
+
 xserver-xorg-video-intel (2:2.19.0-4) unstable; urgency=medium
 
   [ Julien Cristau ]

commit b45db236c2ce520d356efe9530e66b07568d8c78
Author: Chris Wilson ch...@chris-wilson.co.uk
Date:   Thu Jul 26 10:50:31 2012 +0100

Reduce maximum thread count for IVB GT1 to avoid spontaneous combustion

Somewhere along the way it seems that IVB GT1 was reduced to only allow
a maximum of 48 threads, as revealed in the lastest bspecs.

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=52473
Signed-off-by: Chris Wilson ch...@chris-wilson.co.uk
(cherry picked from commit 1ced4f1ddcf30b518e1760c7aa4a5ed4f934b9f5)

Conflicts:
src/sna/gen7_render.c

diff --git a/src/i965_render.c b/src/i965_render.c
index b981ecc..2faf085 100644
--- a/src/i965_render.c
+++ b/src/i965_render.c
@@ -2644,7 +2644,7 @@ gen7_composite_wm_state(intel_screen_private *intel,
OUT_BATCH((1  GEN7_PS_SAMPLER_COUNT_SHIFT) |
  (num_surfaces  GEN7_PS_BINDING_TABLE_ENTRY_COUNT_SHIFT));
OUT_BATCH(0); /* scratch space base offset */
-   OUT_BATCH(((86 - 1)  GEN7_PS_MAX_THREADS_SHIFT) |
+   OUT_BATCH(((48 - 1)  GEN7_PS_MAX_THREADS_SHIFT) |
  GEN7_PS_ATTRIBUTE_ENABLE |
  GEN7_PS_16_DISPATCH_ENABLE);
OUT_BATCH((6  GEN7_PS_DISPATCH_START_GRF_SHIFT_0));
diff --git a/src/i965_video.c b/src/i965_video.c
index c94f530..f56bef4 100644
--- a/src/i965_video.c
+++ b/src/i965_video.c
@@ -1656,7 +1656,7 @@ gen7_upload_wm_state(ScrnInfoPtr scrn, Bool is_packed)
 
OUT_BATCH(0); /* scratch space base offset */
OUT_BATCH(
-   ((86 - 1)  GEN7_PS_MAX_THREADS_SHIFT) |
+   ((48 - 1)  GEN7_PS_MAX_THREADS_SHIFT) |
GEN7_PS_ATTRIBUTE_ENABLE |
GEN7_PS_16_DISPATCH_ENABLE);
OUT_BATCH(


-- 
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/e1sugpy-0008c6...@vasks.debian.org

xserver-xorg-video-intel: Changes to 'debian-unstable'

[Julien Cristau]

 debian/changelog|8 
 src/intel_display.c |   15 +++
 2 files changed, 23 insertions(+)

New commits:
commit ab4c2c4dd666d7506829e1840b812d66af1d122c
Author: Julien Cristau jcris...@debian.org
Date:   Sat Jun 23 19:17:42 2012 +0200

Upload to unstable

diff --git a/debian/changelog b/debian/changelog
index 5bc9fe1..f23fe06 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+xserver-xorg-video-intel (2:2.19.0-4) unstable; urgency=medium
+
+  * uxa: Check for DPMS off before scheduling a WAIT_ON_EVENT.  Fixes
+regression from a cherry-pick in 2:2.19.0-2.  Thanks to Julian Andres
+Klode for tracking this down.
+
+ -- Julien Cristau jcris...@debian.org  Sat, 23 Jun 2012 19:16:28 +0200
+
 xserver-xorg-video-intel (2:2.19.0-3) unstable; urgency=low
 
   * Add patch to avoid X segfaults with Driver-less Device sections in

commit 9b92aefec37b34044a9e12d01ccdadeb7e9853de
Author: Chris Wilson ch...@chris-wilson.co.uk
Date:   Tue Jun 5 16:04:16 2012 +0100

uxa: Check for DPMS off before scheduling a WAIT_ON_EVENT

Regression from commit 3f3bde4f0c72f6f31aae322bcdc20b95eade6631
Author: Chris Wilson ch...@chris-wilson.co.uk
Date:   Thu May 24 11:58:46 2012 +0100

uxa: Only consider an output valid if the kernel reports it attached

When backporting from SNA, a key difference that UXA does not track DPMS
state in its enabled flag and that a DPMS off CRTC is still bound to the
fb. So we do need to rescan the outputs and check that we have a
connector enabled *and* the pipe is running prior to emitting a scanline
wait.

References: https://bugs.freedesktop.org/show_bug.cgi?id=50668
Signed-off-by: Chris Wilson ch...@chris-wilson.co.uk
(cherry picked from commit c4eb5528a456b65c673f7c984d14a622ac67cdca)

diff --git a/src/intel_display.c b/src/intel_display.c
index 89f7259..75d4998 100644
--- a/src/intel_display.c
+++ b/src/intel_display.c
@@ -1703,13 +1703,28 @@ int intel_crtc_to_pipe(xf86CrtcPtr crtc)
 Bool intel_crtc_on(xf86CrtcPtr crtc)
 {
struct intel_crtc *intel_crtc = crtc-driver_private;
+   xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(crtc-scrn);
drmModeCrtcPtr drm_crtc;
Bool ret;
+   int i;
 
if (!crtc-enabled)
return FALSE;
 
/* Kernel manages CRTC status based on output config */
+   ret = FALSE;
+   for (i = 0; i  xf86_config-num_output; i++) {
+   xf86OutputPtr output = xf86_config-output[i];
+   if (output-crtc == crtc 
+   intel_output_dpms_status(output) == DPMSModeOn) {
+   ret = TRUE;
+   break;
+   }
+   }
+   if (!ret)
+   return FALSE;
+
+   /* And finally check with the kernel that the fb is bound */
drm_crtc = drmModeGetCrtc(intel_crtc-mode-fd, crtc_id(intel_crtc));
if (drm_crtc == NULL)
return FALSE;


-- 
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/e1siu2y-un...@vasks.debian.org

xserver-xorg-video-intel: Changes to 'debian-unstable'

[Cyril Brulebois]

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

New commits:
commit 6f0873ac6f94e72aa93a2de15172e9f272c28133
Author: Cyril Brulebois k...@debian.org
Date:   Sat Jun 23 21:08:17 2012 +0200

Add bug closure, and really upload to unstable.

diff --git a/debian/changelog b/debian/changelog
index f23fe06..9c97d52 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,11 @@
 xserver-xorg-video-intel (2:2.19.0-4) unstable; urgency=medium
 
+  [ Julien Cristau ]
   * uxa: Check for DPMS off before scheduling a WAIT_ON_EVENT.  Fixes
-regression from a cherry-pick in 2:2.19.0-2.  Thanks to Julian Andres
-Klode for tracking this down.
+regression from a cherry-pick in 2:2.19.0-2 (Closes: #677466).
+Thanks to Julian Andres Klode for tracking this down.
 
- -- Julien Cristau jcris...@debian.org  Sat, 23 Jun 2012 19:16:28 +0200
+ -- Cyril Brulebois k...@debian.org  Sat, 23 Jun 2012 21:06:26 +0200
 
 xserver-xorg-video-intel (2:2.19.0-3) unstable; 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/e1sivv8-0007tf...@vasks.debian.org

xserver-xorg-video-intel: Changes to 'debian-unstable'

[Cyril Brulebois]

 debian/changelog|  
  8 ++
 debian/patches/0003-Avoid-calling-xf86nameCompare-with-a-NULL-pointer.patch |  
 32 ++
 debian/patches/series   |  
  1 
 3 files changed, 41 insertions(+)

New commits:
commit 79ad994a10f3342cf2d33e44c4cc9b2c8cd7d0d3
Author: Cyril Brulebois k...@debian.org
Date:   Tue Jun 12 20:30:56 2012 +0200

Upload to unstable.

diff --git a/debian/changelog b/debian/changelog
index 3d41440..5bc9fe1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,10 @@
-xserver-xorg-video-intel (2:2.19.0-3) UNRELEASED; urgency=low
+xserver-xorg-video-intel (2:2.19.0-3) unstable; urgency=low
 
   * Add patch to avoid X segfaults with Driver-less Device sections in
 xorg.conf (Closes: #677206):
 - 0003-Avoid-calling-xf86nameCompare-with-a-NULL-pointer.patch
 
- -- Cyril Brulebois k...@debian.org  Tue, 12 Jun 2012 20:27:54 +0200
+ -- Cyril Brulebois k...@debian.org  Tue, 12 Jun 2012 20:30:51 +0200
 
 xserver-xorg-video-intel (2:2.19.0-2) unstable; urgency=low
 

commit 621e048094f2b76ce70c7a1999147644d2437005
Author: Cyril Brulebois k...@debian.org
Date:   Tue Jun 12 20:30:40 2012 +0200

Avoid X segfaults with Driver-less Device sections in xorg.conf (Closes: 
#677206).

diff --git a/debian/changelog b/debian/changelog
index 3b45678..3d41440 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+xserver-xorg-video-intel (2:2.19.0-3) UNRELEASED; urgency=low
+
+  * Add patch to avoid X segfaults with Driver-less Device sections in
+xorg.conf (Closes: #677206):
+- 0003-Avoid-calling-xf86nameCompare-with-a-NULL-pointer.patch
+
+ -- Cyril Brulebois k...@debian.org  Tue, 12 Jun 2012 20:27:54 +0200
+
 xserver-xorg-video-intel (2:2.19.0-2) unstable; urgency=low
 
   * Cherry-pick the following commits to make it possible to build both
diff --git 
a/debian/patches/0003-Avoid-calling-xf86nameCompare-with-a-NULL-pointer.patch 
b/debian/patches/0003-Avoid-calling-xf86nameCompare-with-a-NULL-pointer.patch
new file mode 100644
index 000..1b9ca47
--- /dev/null
+++ 
b/debian/patches/0003-Avoid-calling-xf86nameCompare-with-a-NULL-pointer.patch
@@ -0,0 +1,32 @@
+From 0de44dd7d7cbd5307afce2245ffbdc748e868223 Mon Sep 17 00:00:00 2001
+From: Cyril Brulebois k...@debian.org
+Date: Tue, 12 Jun 2012 20:00:10 +0200
+Subject: [PATCH] Avoid calling xf86nameCompare() with a NULL pointer.
+
+Device sections without a Driver property would lead to a server
+segfault because of a NULL pointer's being passed as the second
+argument of xf86nameCompare().
+
+Debian bug #677206 http://bugs.debian.org/677206
+
+Signed-off-by: Cyril Brulebois k...@debian.org
+---
+ src/intel_module.c |2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/intel_module.c b/src/intel_module.c
+index 4430ac6..fa78b59 100644
+--- a/src/intel_module.c
 b/src/intel_module.c
+@@ -299,7 +299,7 @@ static XF86ConfDevicePtr
+ _xf86findDriver(const char *ident, XF86ConfDevicePtr p)
+ {
+   while (p) {
+-  if (xf86nameCompare(ident, p-dev_driver) == 0)
++  if (p-dev_driver  xf86nameCompare(ident, p-dev_driver) == 0)
+   return p;
+ 
+   p = p-list.next;
+-- 
+1.7.10
+
diff --git a/debian/patches/series b/debian/patches/series
index 340efc7..3a9b06b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 0001-Fix-build-failure-when-passing-with-builderstring.patch
 0002-Update-manpage-for-new-accelmethod-option.patch
+0003-Avoid-calling-xf86nameCompare-with-a-NULL-pointer.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/e1sewlc-pv...@vasks.debian.org

xserver-xorg-video-intel: Changes to 'debian-unstable'

[Cyril Brulebois]

 configure.ac|   59 
++
 debian/changelog|   19 ++
 debian/patches/0002-Update-manpage-for-new-accelmethod-option.patch |   15 +
 debian/patches/series   |1 
 debian/rules|2 
 src/Makefile.am |1 
 src/common.h|2 
 src/intel_display.c |   21 ++
 src/intel_driver.c  |   86 
-
 src/intel_driver.h  |2 
 src/intel_glamor.c  |   15 +
 src/intel_module.c  |   90 
++
 src/intel_options.h |   75 

 src/legacy/i810/i810_driver.c   |3 
 src/legacy/legacy.h |2 
 src/sna/sna.h   |   15 -
 src/sna/sna_display.c   |2 
 src/sna/sna_dri.c   |6 
 src/sna/sna_driver.c|   32 +--
 src/sna/sna_module.h|4 
 src/sna/sna_video.c |2 
 src/sna/sna_video_overlay.c |2 
 src/sna/sna_video_sprite.c  |2 
 23 files changed, 297 insertions(+), 161 deletions(-)

New commits:
commit d76d28952241dd22f7252fbf28f3f0049965f201
Author: Cyril Brulebois k...@debian.org
Date:   Mon Jun 11 22:22:04 2012 +

Upload to unstable.

diff --git a/debian/changelog b/debian/changelog
index e203e41..3b45678 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xserver-xorg-video-intel (2:2.19.0-2) UNRELEASED; urgency=low
+xserver-xorg-video-intel (2:2.19.0-2) unstable; urgency=low
 
   * Cherry-pick the following commits to make it possible to build both
 uxa (legacy acceleration method) and sna (experimental acceleration
@@ -15,7 +15,7 @@ xserver-xorg-video-intel (2:2.19.0-2) UNRELEASED; urgency=low
   * Add patch to document the new AccelMethod option accordingly:
 - 0002-Update-manpage-for-new-accelmethod-option.patch
 
- -- Cyril Brulebois k...@debian.org  Mon, 11 Jun 2012 21:55:45 +
+ -- Cyril Brulebois k...@debian.org  Mon, 11 Jun 2012 22:22:00 +
 
 xserver-xorg-video-intel (2:2.19.0-1) unstable; urgency=low
 

commit 28febcb6451e8cc9eb4fd5b05c6176529b54aef3
Author: Cyril Brulebois k...@debian.org
Date:   Mon Jun 11 22:21:38 2012 +

Add patch to document the new AccelMethod option accordingly: 
0002-Update-manpage-for-new-accelmethod-option.patch

diff --git a/debian/changelog b/debian/changelog
index 22ced2a..e203e41 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,8 @@ xserver-xorg-video-intel (2:2.19.0-2) UNRELEASED; urgency=low
   * rules: Enable sna and uxa accel methods, default to uxa. The switch
 to sna can be achieved through a minimal xorg.conf (look for “AccelMethod”
 in: man intel).
+  * Add patch to document the new AccelMethod option accordingly:
+- 0002-Update-manpage-for-new-accelmethod-option.patch
 
  -- Cyril Brulebois k...@debian.org  Mon, 11 Jun 2012 21:55:45 +
 
diff --git 
a/debian/patches/0002-Update-manpage-for-new-accelmethod-option.patch 
b/debian/patches/0002-Update-manpage-for-new-accelmethod-option.patch
new file mode 100644
index 000..11fd542
--- /dev/null
+++ b/debian/patches/0002-Update-manpage-for-new-accelmethod-option.patch
@@ -0,0 +1,15 @@
+--- a/man/intel.man
 b/man/intel.man
+@@ -57,6 +57,12 @@ The following driver
+ .B Options
+ are supported
+ .TP
++.BI Option \*qAccelMethod\*q \*q string \*q
++This sets the acceleration method. The legacy method is uxa, the experimental
++one is sna.
++.IP
++Default: uxa.
++.TP
+ .BI Option \*qColorKey\*q \*q integer \*q
+ This sets the default pixel value for the YUV video overlay key.
+ .IP
diff --git a/debian/patches/series b/debian/patches/series
index 3569ab4..340efc7 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 0001-Fix-build-failure-when-passing-with-builderstring.patch
+0002-Update-manpage-for-new-accelmethod-option.patch

commit 63bc77e1c5906e7ccc1820e560cbd080299de64e
Author: Cyril Brulebois k...@debian.org
Date:   Mon Jun 11 22:01:37 2012 +

rules: Enable sna and uxa accel methods, default to uxa.

diff --git a/debian/changelog b/debian/changelog
index 996b253..22ced2a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ 

xserver-xorg-video-intel: Changes to 'debian-unstable'

[Julien Cristau]

 ChangeLog | 2437 ++
 NEWS  |   26 
 configure.ac  |   16 
 debian/changelog  |6 
 src/i830_render.c |3 
 src/i915_render.c |  420 ++-
 src/i965_render.c |3 
 src/intel.h   |   12 
 src/intel_batchbuffer.c   |   39 
 src/intel_batchbuffer.h   |5 
 src/intel_display.c   |  104 -
 src/intel_dri.c   |3 
 src/intel_driver.c|   15 
 src/intel_driver.h|1 
 src/intel_list.h  |   19 
 src/intel_module.c|2 
 src/intel_uxa.c   |   79 -
 src/intel_video.c |2 
 src/legacy/i810/Makefile.am   |2 
 src/legacy/i810/i810.h|6 
 src/legacy/i810/i810_accel.c  |4 
 src/legacy/i810/i810_driver.c |   36 
 src/sna/Makefile.am   |1 
 src/sna/gen2_render.c |  172 +-
 src/sna/gen3_render.c |  465 +---
 src/sna/gen4_render.c |  330 -
 src/sna/gen5_render.c |  350 --
 src/sna/gen6_render.c |  555 +
 src/sna/gen7_render.c |  717 +++-
 src/sna/kgem.c| 1052 +-
 src/sna/kgem.h|   33 
 src/sna/sna.h |   39 
 src/sna/sna_accel.c   | 1428 +++-
 src/sna/sna_blt.c |  168 +-
 src/sna/sna_composite.c   |  170 +-
 src/sna/sna_damage.c  |   50 
 src/sna/sna_display.c |  242 ++--
 src/sna/sna_dri.c |  282 +++-
 src/sna/sna_driver.c  |   18 
 src/sna/sna_glyphs.c  |   32 
 src/sna/sna_gradient.c|   27 
 src/sna/sna_io.c  |  125 --
 src/sna/sna_render.c  |  359 +++---
 src/sna/sna_render.h  |   17 
 src/sna/sna_render_inline.h   |   46 
 src/sna/sna_stream.c  |2 
 src/sna/sna_tiling.c  |2 
 src/sna/sna_trapezoids.c  | 1335 ++-
 src/sna/sna_video.c   |   21 
 src/sna/sna_video.h   |9 
 src/sna/sna_video_sprite.c|  432 +++
 src/sna/sna_video_textured.c  |   11 
 uxa/uxa-glyphs.c  |4 
 uxa/uxa-priv.h|1 
 uxa/uxa-render.c  |  189 ---
 uxa/uxa.c |4 
 56 files changed, 8641 insertions(+), 3287 deletions(-)

New commits:
commit 7a9d6cdcd45ff0accc252d4e668054e4ddebbe06
Author: Julien Cristau jcris...@debian.org
Date:   Sat May 26 13:07:25 2012 +0200

Upload to unstable

diff --git a/debian/changelog b/debian/changelog
index 23c0170..884957b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,8 @@
-xserver-xorg-video-intel (2:2.19.0-1) UNRELEASED; urgency=low
+xserver-xorg-video-intel (2:2.19.0-1) unstable; urgency=low
 
   * New upstream release.
 
- -- Julien Cristau jcris...@debian.org  Sat, 26 May 2012 11:23:22 +0200
+ -- Julien Cristau jcris...@debian.org  Sat, 26 May 2012 12:38:07 +0200
 
 xserver-xorg-video-intel (2:2.18.0-2) unstable; urgency=low
 

commit dc1d327b4dd7ab65bebf48ab5d76189a3bbf6f32
Author: Julien Cristau jcris...@debian.org
Date:   Sat May 26 11:23:55 2012 +0200

Bump changelogs

diff --git a/ChangeLog b/ChangeLog
index 651ab6a..d8bcdc1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,2440 @@
+commit ffdf9aca12adcfa1ec7ab7a1706873105a5f0d4a
+Author: Chris Wilson ch...@chris-wilson.co.uk
+Date:   Sun Apr 29 21:59:52 2012 +0100
+
+legacy/i810: hwmc additionally depends upon building DRI
+
+Signed-off-by: Chris Wilson ch...@chris-wilson.co.uk
+
+commit 444da84c47266bcbbdf5121507901de8eb36f11b
+Author: Chris Wilson ch...@chris-wilson.co.uk
+Date:   Sun Apr 29 21:49:04 2012 +0100
+
+configure: Version bump for 2.19.0 release
+
+commit a206a1eee1fb799d567d68db564d663cfc66f6cc
+Author: Chris Wilson ch...@chris-wilson.co.uk
+Date:   Sat Apr 28 01:54:43 2012 +0100
+
+sna: Tune relocation array size
+
+Signed-off-by: Chris Wilson ch...@chris-wilson.co.uk
+
+commit 4f1908c651ef9e2af33d8831466a605234978c46
+Author: Chris Wilson ch...@chris-wilson.co.uk
+Date:   Fri Apr 27 23:19:56 2012 +0100
+
+sna: PolyPoint only uses the gc-fgPixel
+
+Signed-off-by: Chris Wilson ch...@chris-wilson.co.uk
+
+commit 8453034c7dd893f1d4c32ee87724f3a13137595d
+Author: Chris Wilson ch...@chris-wilson.co.uk
+Date:   Fri Apr 27 22:08:51 2012 +0100
+
+sna/gen6: Allow ring switching at the start of a batch
+
+Signed-off-by: Chris Wilson ch...@chris-wilson.co.uk
+
+commit 93ad7793894787600c5074917c753fa7c6816134
+Author: Chris Wilson ch...@chris-wilson.co.uk
+Date:   Fri Apr 27 22:03:55 2012 +0100
+
+sna: Tweak semaphores-enabled heuristic
+
+The kernel module now defaults to -1, confusing the test.
+
+Signed-off-by: Chris Wilson ch...@chris-wilson.co.uk
+
+commit 986dbdda3bf8dcf208e55543d8a3393c4b53f10b
+Author: Chris Wilson ch...@chris-wilson.co.uk

xserver-xorg-video-intel: Changes to 'debian-unstable'

[Julien Cristau]

 debian/changelog |7 +
 uxa/uxa-glyphs.c |  330 ++-
 2 files changed, 24 insertions(+), 313 deletions(-)

New commits:
commit d29a44a34b1e3300355769518fc51c21f999beec
Author: Julien Cristau jcris...@debian.org
Date:   Thu Apr 5 20:24:29 2012 +0200

Upload to unstable

diff --git a/debian/changelog b/debian/changelog
index 83ac4f5..722cf43 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xserver-xorg-video-intel (2:2.18.0-2) unstable; urgency=low
+
+  * Cherry-pick a change from upstream to fix a bug triggered by cairo 1.12:
+uxa: Remove broken render glyphs-to-dst
+
+ -- Julien Cristau jcris...@debian.org  Thu, 05 Apr 2012 20:24:22 +0200
+
 xserver-xorg-video-intel (2:2.18.0-1) unstable; urgency=low
 
   * New upstream release.

commit 70ddfcde352d175ebd614071c18a8a51370d1894
Author: Chris Wilson ch...@chris-wilson.co.uk
Date:   Fri Mar 30 12:47:21 2012 +0100

uxa: Remove broken render glyphs-to-dst

Reported-by: Vincent Untz vu...@gnome.org
Reported-by: Robert Bradford robert.bradf...@intel.com
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=48045
Signed-off-by: Chris Wilson ch...@chris-wilson.co.uk
(cherry picked from commit fde8a010b3d9406c2f65ee99978360a6ca54e006)

diff --git a/uxa/uxa-glyphs.c b/uxa/uxa-glyphs.c
index 6172f2f..b754f4e 100644
--- a/uxa/uxa-glyphs.c
+++ b/uxa/uxa-glyphs.c
@@ -663,190 +663,6 @@ uxa_glyph_cache(ScreenPtr screen, GlyphPtr glyph, int 
*out_x, int *out_y)
return cache-picture;
 }
 
-static int
-uxa_glyphs_to_dst(CARD8 op,
- PicturePtr pSrc,
- PicturePtr pDst,
- INT16 src_x, INT16 src_y,
- INT16 xDst, INT16 yDst,
- int nlist, GlyphListPtr list, GlyphPtr * glyphs,
- BoxPtr extents)
-{
-   ScreenPtr screen = pDst-pDrawable-pScreen;
-   uxa_screen_t *uxa_screen = uxa_get_screen(screen);
-   PixmapPtr src_pixmap, dst_pixmap;
-   PicturePtr localSrc, glyph_atlas;
-   int x, y, n;
-   BoxRec box;
-
-   if (uxa_screen-info-check_composite_texture 
-   uxa_screen-info-check_composite_texture(screen, pSrc)) {
-   if (pSrc-pDrawable) {
-   int src_off_x, src_off_y;
-
-   src_pixmap = uxa_get_offscreen_pixmap(pSrc-pDrawable, 
src_off_x, src_off_y);
-   if (src_pixmap == NULL)
-   return -1;
-
-   src_x += pSrc-pDrawable-x + src_off_x;
-   src_y += pSrc-pDrawable-y + src_off_y;
-   } else {
-   src_pixmap = NULL;
-   }
-   localSrc = pSrc;
-   } else {
-   int width, height;
-
-   if (extents == NULL) {
-   uxa_glyph_extents(nlist, list, glyphs, box);
-   extents = box;
-   }
-
-   width  = extents-x2 - extents-x1;
-   height = extents-y2 - extents-y1;
-   if (width == 0 || height == 0)
-   return 0;
-
-   if (pSrc-pDrawable) {
-   int src_off_x, src_off_y;
-
-   src_off_x = extents-x1 - xDst;
-   src_off_y = extents-y1 - yDst;
-   localSrc = uxa_acquire_drawable(screen, pSrc,
-   src_x + src_off_x, 
src_y + src_off_y,
-   width, height,
-   src_x, src_y);
-   if (uxa_screen-info-check_composite_texture 
-   !uxa_screen-info-check_composite_texture(screen, 
localSrc)) {
-   if (localSrc != pSrc)
-   FreePicture(localSrc, 0);
-   return -1;
-   }
-
-   src_pixmap = 
uxa_get_offscreen_pixmap(localSrc-pDrawable, src_off_x, src_off_y);
-   if (src_pixmap == NULL) {
-   if (localSrc != pSrc)
-   FreePicture(localSrc, 0);
-   return -1;
-   }
-
-   src_x += localSrc-pDrawable-x + src_off_x;
-   src_y += localSrc-pDrawable-y + src_off_y;
-   } else {
-   localSrc = uxa_acquire_pattern(screen, pSrc,
-  PICT_a8r8g8b8, x, y, 
width, height);
-   if (!localSrc)
-   return 1;
-
-   src_pixmap = 
uxa_get_drawable_pixmap(localSrc-pDrawable);
-   if (src_pixmap == NULL) {
-   FreePicture(localSrc, 0);
-   return 

xserver-xorg-video-intel: Changes to 'debian-unstable'

[Cyril Brulebois]

 ChangeLog   | 
7754 ++
 Makefile.am |  
  1 
 NEWS|  
 26 
 autogen.sh  |  
 14 
 configure.ac|  
 45 
 debian/changelog|  
 49 
 debian/patches/0001-Fix-build-failure-when-passing-with-builderstring.patch |  
 33 
 debian/patches/series   |  
  2 
 debian/rules|  
 20 
 m4/.gitignore   |  
  5 
 src/Makefile.am |  
 18 
 src/common.h|  
 17 
 src/i965_video.c|  
596 
 src/intel.h |  
101 
 src/intel_display.c |  
 32 
 src/intel_dri.c |  
213 
 src/intel_driver.c  |  
 64 
 src/intel_driver.h  |  
  3 
 src/intel_glamor.c  |  
231 
 src/intel_glamor.h  |  
 67 
 src/intel_list.h|  
392 
 src/intel_memory.c  |  
 86 
 src/intel_module.c  |  
 34 
 src/intel_shadow.c  |  
 24 
 src/intel_uxa.c |  
164 
 src/intel_video.c   |  
  2 
 src/legacy/i810/i810.h  |  
  1 
 src/legacy/i810/i810_dga.c  |  
  1 
 src/legacy/i810/i810_dri.c  |  
  1 
 src/legacy/i810/i810_hwmc.c |  
  1 
 src/legacy/i810/i810_video.c|  
  1 
 src/render_program/Makefile.am  |  
 78 
 src/render_program/exa_sf.g5a   |  
 99 
 src/render_program/exa_sf.g5b   |  
  7 
 src/render_program/exa_sf_mask.g5a  |  
 99 
 src/render_program/exa_sf_mask.g5b  |  
  7 
 src/render_program/exa_wm_ca.g5a|  
 38 
 src/render_program/exa_wm_ca.g5b|  
  4 
 src/render_program/exa_wm_ca_srcalpha.g5a   |  
 37 
 src/render_program/exa_wm_ca_srcalpha.g5b   |  
  4 
 src/render_program/exa_wm_mask_affine.g5a   |  
 31 
 src/render_program/exa_wm_mask_affine.g5b   |  
  4 
 src/render_program/exa_wm_mask_projective.g5a   |  
 53 
 src/render_program/exa_wm_mask_projective.g5b   |  
 16 
 src/render_program/exa_wm_mask_sample_a.g5a |  
 49 
 src/render_program/exa_wm_mask_sample_a.g5b |  
  3 
 src/render_program/exa_wm_mask_sample_argb.g5a  |  
 49 
 src/render_program/exa_wm_mask_sample_argb.g5b  |  
  3 
 src/render_program/exa_wm_noca.g5a  |  
 38 
 src/render_program/exa_wm_noca.g5b  |  
  4 
 src/render_program/exa_wm_src_affine.g5a|  
 31 
 src/render_program/exa_wm_src_affine.g5b|  
  4 
 src/render_program/exa_wm_src_projective.g5a|  
 49 
 src/render_program/exa_wm_src_projective.g5b|  
 16 
 src/render_program/exa_wm_src_sample_a.g5a  |  
 48 
 src/render_program/exa_wm_src_sample_a.g5b  |  
  3 
 src/render_program/exa_wm_src_sample_argb.g5a   |  
 46 
 src/render_program/exa_wm_src_sample_argb.g5b   |  
  2 
 

xserver-xorg-video-intel: Changes to 'debian-unstable'

[Cyril Brulebois]

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

New commits:
commit 0dda59045138b364e1fa40cbf9d320a1aaf3b3a2
Author: Cyril Brulebois k...@debian.org
Date:   Sat Nov 19 12:47:04 2011 +0100

Upload to unstable.

diff --git a/debian/changelog b/debian/changelog
index 3a22527..d542e58 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,9 @@
-xserver-xorg-video-intel (2:2.17.0-1) UNRELEASED; urgency=low
+xserver-xorg-video-intel (2:2.17.0-1) unstable; urgency=low
 
+  [ Timo Aaltonen ]
   * New upstream release. (Closes: #635953)
 
- -- Timo Aaltonen tjaal...@ubuntu.com  Thu, 17 Nov 2011 13:24:07 +0200
+ -- Cyril Brulebois k...@debian.org  Sat, 19 Nov 2011 12:46:57 +0100
 
 xserver-xorg-video-intel (2:2.16.0-1) unstable; 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/e1rs6yk-0003kk...@vasks.debian.org

xserver-xorg-video-intel: Changes to 'debian-unstable'

[Timo Aaltonen]

 .gitignore  |1 
 ChangeLog   | 4112 ++
 Makefile.am |8 
 NEWS|   56 
 configure.ac|   55 
 debian/changelog|6 
 src/Makefile.am |   14 
 src/common.h|   10 
 src/i915_video.c|1 
 src/i965_reg.h  |4 
 src/i965_render.c   |  102 
 src/i965_video.c|3 
 src/intel.h |   16 
 src/intel_batchbuffer.c |   52 
 src/intel_display.c |2 
 src/intel_dri.c |2 
 src/intel_driver.c  |   13 
 src/intel_module.c  |   14 
 src/intel_uxa.c |   31 
 src/intel_video.c   |   38 
 src/legacy/i810/Makefile.am |1 
 src/legacy/i810/i810.h  |   14 
 src/legacy/i810/i810_cursor.c   |   19 
 src/legacy/i810/i810_driver.c   |   21 
 src/legacy/i810/i810_io.c   |  133 
 src/legacy/i810/xvmc/I810XvMC.c |2 
 src/sna/Makefile.am |   12 
 src/sna/blt.c   |   57 
 src/sna/compiler.h  |   51 
 src/sna/gen2_render.c   | 1016 +++--
 src/sna/gen3_render.c   |  984 +++--
 src/sna/gen4_render.c   |  334 +
 src/sna/gen5_render.c   |  768 +++-
 src/sna/gen5_render.h   |   47 
 src/sna/gen6_render.c   |  734 +++-
 src/sna/gen7_render.c   |  388 +-
 src/sna/gen7_render.h   |6 
 src/sna/kgem.c  |  851 +++-
 src/sna/kgem.h  |   79 
 src/sna/kgem_debug.c|   24 
 src/sna/kgem_debug.h|3 
 src/sna/kgem_debug_gen2.c   |  631 +++
 src/sna/kgem_debug_gen3.c   |1 
 src/sna/kgem_debug_gen7.c   |  747 
 src/sna/rop.h   |  264 +
 src/sna/sna.h   |  150 
 src/sna/sna_accel.c | 7301 ++--
 src/sna/sna_blt.c   |  823 +++-
 src/sna/sna_composite.c |  190 -
 src/sna/sna_damage.c|  704 +++
 src/sna/sna_damage.h|   81 
 src/sna/sna_display.c   |   85 
 src/sna/sna_dri.c   | 1051 +++--
 src/sna/sna_driver.c|  141 
 src/sna/sna_glyphs.c|  439 +-
 src/sna/sna_gradient.c  |   67 
 src/sna/sna_io.c|   51 
 src/sna/sna_reg.h   |   50 
 src/sna/sna_render.c|  141 
 src/sna/sna_render.h|   62 
 src/sna/sna_render_inline.h |   37 
 src/sna/sna_tiling.c|   29 
 src/sna/sna_trapezoids.c| 4208 +--
 src/sna/sna_video.c |  261 -
 src/sna/sna_video.h |   25 
 src/sna/sna_video_overlay.c |   36 
 src/sna/sna_video_textured.c|   77 
 src/xvmc/i965_xvmc.c|2 
 src/xvmc/intel_batchbuffer.h|1 
 src/xvmc/intel_xvmc.c   |2 
 src/xvmc/xvmc_vld.c |2 
 test/.gitignore |1 
 test/Makefile.am|1 
 test/basic-copyarea-size.c  |6 
 test/basic-copyarea.c   |3 
 test/basic-fillrect.c   |3 
 test/basic-lines.c  |  147 
 test/basic-putimage.c   |3 
 test/basic-stress.c |3 
 test/mixed-stress.c |3 
 test/render-composite-solid.c   |3 
 test/render-copyarea-size.c |6 
 test/render-copyarea.c  |3 
 test/render-fill-copy.c |3 
 test/render-fill.c  |3 
 test/render-trapezoid-image.c   |6 
 test/render-trapezoid.c |6 
 test/test.h |2 
 test/test_image.c   |7 
 uxa/uxa-glyphs.c|   17 
 uxa/uxa-priv.h  |4 
 uxa/uxa-render.c|   16 
 uxa/uxa-unaccel.c   |   50 
 93 files changed, 22639 insertions(+), 5400 deletions(-)

New commits:
commit cb451dc94c6cf722fb21be8814e21a76ce69a3b3
Author: Timo Aaltonen tjaal...@ubuntu.com
Date:   Thu Nov 17 13:25:49 2011 +0200

update the changelogs

diff --git a/ChangeLog b/ChangeLog
index 8e1407f..6c4ac40 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,4115 @@
+commit 24ece4a87e34c27115ffb55f91294bce2bdf1502
+Author: Chris Wilson ch...@chris-wilson.co.uk
+Date:   Wed Nov 16 23:14:25 2011 +
+
+configure: Version bump for 2.17.0 release
+
+Signed-off-by: Chris Wilson ch...@chris-wilson.co.uk
+
+commit 14b3176962bd535933623d8ed77ba286b077d6f0
+Author: Chris Wilson ch...@chris-wilson.co.uk
+Date:   Wed Nov 16 23:13:44 2011 +
+
+NEWS: Release notes for 2.17.0
+
+Signed-off-by: Chris Wilson ch...@chris-wilson.co.uk
+
+commit c259144e3fc52d078b0a78107c38f0f3d3a2bbc1
+Author: Chris Wilson ch...@chris-wilson.co.uk
+Date:   Wed Nov 16 10:28:23 2011 +
+
+sna: The block handler is passed an indirect pointer to the timeval
+   

xserver-xorg-video-intel: Changes to 'debian-unstable'

[Timo Aaltonen]

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

New commits:
commit 858e02cdd901f59622abd767f1bae221b34601e7
Author: Timo Aaltonen tjaal...@ubuntu.com
Date:   Thu Nov 17 18:50:17 2011 +0200

new release closes bug 635953

diff --git a/debian/changelog b/debian/changelog
index 1e50197..3a22527 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,6 @@
 xserver-xorg-video-intel (2:2.17.0-1) UNRELEASED; urgency=low
 
-  * New upstream release.
+  * New upstream release. (Closes: #635953)
 
  -- Timo Aaltonen tjaal...@ubuntu.com  Thu, 17 Nov 2011 13:24:07 +0200
 


-- 
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/e1rr5am-q9...@vasks.debian.org

xserver-xorg-video-intel: Changes to 'debian-unstable'

[Cyril Brulebois]

 ChangeLog   | 2500 
 Makefile.am |4 
 NEWS|   43 
 configure.ac|  114 
 debian/changelog|   12 
 debian/control  |2 
 man/intel.man   |   30 
 src/Makefile.am |6 
 src/brw_structs.h   |  124 
 src/i965_3d.c   |  438 ++
 src/i965_reg.h  |  132 
 src/i965_render.c   |  578 ++-
 src/i965_video.c|  578 ++-
 src/intel.h |   45 
 src/intel_batchbuffer.c |   13 
 src/intel_batchbuffer.h |2 
 src/intel_display.c |   16 
 src/intel_dri.c |  479 ++-
 src/intel_driver.c  |   26 
 src/intel_driver.h  |9 
 src/intel_module.c  |  660 +---
 src/intel_video.c   |1 
 src/legacy/i810/i810_dri.c  |1 
 src/render_program/Makefile.am  |   50 
 src/render_program/exa_wm_affine.g6i|   35 
 src/render_program/exa_wm_mask_affine.g6a   |8 
 src/render_program/exa_wm_mask_affine.g7a   |   41 
 src/render_program/exa_wm_mask_affine.g7b   |4 
 src/render_program/exa_wm_mask_projective.g7a   |   63 
 src/render_program/exa_wm_mask_projective.g7b   |   12 
 src/render_program/exa_wm_mask_sample_a.g7a |   49 
 src/render_program/exa_wm_mask_sample_a.g7b |3 
 src/render_program/exa_wm_mask_sample_argb.g7a  |   49 
 src/render_program/exa_wm_mask_sample_argb.g7b  |3 
 src/render_program/exa_wm_sample_planar.g4i |   64 
 src/render_program/exa_wm_src_affine.g6a|8 
 src/render_program/exa_wm_src_affine.g7a|   41 
 src/render_program/exa_wm_src_affine.g7b|4 
 src/render_program/exa_wm_src_projective.g7a|   63 
 src/render_program/exa_wm_src_projective.g7b|   12 
 src/render_program/exa_wm_src_sample_a.g7a  |   48 
 src/render_program/exa_wm_src_sample_a.g7b  |3 
 src/render_program/exa_wm_src_sample_argb.g4a   |   18 
 src/render_program/exa_wm_src_sample_argb.g4i   |   44 
 src/render_program/exa_wm_src_sample_argb.g7a   |   38 
 src/render_program/exa_wm_src_sample_argb.g7b   |3 
 src/render_program/exa_wm_src_sample_planar.g4a |   36 
 src/render_program/exa_wm_src_sample_planar.g7a |   38 
 src/render_program/exa_wm_src_sample_planar.g7b |5 
 src/render_program/exa_wm_write.g6a |   38 
 src/render_program/exa_wm_write.g6i |   61 
 src/render_program/exa_wm_write.g7a |   41 
 src/render_program/exa_wm_write.g7b |   17 
 src/render_program/exa_wm_yuv_rgb.g7b   |   12 
 src/sna/Makefile.am |  101 
 src/sna/README  |   30 
 src/sna/blt.c   |   73 
 src/sna/gen2_render.c   | 2314 ++
 src/sna/gen2_render.h   |  795 +
 src/sna/gen3_render.c   | 3716 
 src/sna/gen3_render.h   | 1479 +
 src/sna/gen4_render.c   | 2839 ++
 src/sna/gen4_render.h   | 2643 +
 src/sna/gen5_render.c   | 2842 ++
 src/sna/gen5_render.h   | 2730 +
 src/sna/gen6_render.c   | 2891 ++
 src/sna/gen6_render.h   | 1598 ++
 src/sna/gen7_render.c   | 3036 +++
 src/sna/gen7_render.h   | 1716 +++
 src/sna/kgem.c  | 1978 
 src/sna/kgem.h  |  337 ++
 src/sna/kgem_debug.c|  408 ++
 src/sna/kgem_debug.h|   31 
 src/sna/kgem_debug_gen2.c   |   60 
 src/sna/kgem_debug_gen3.c   | 1620 ++
 src/sna/kgem_debug_gen4.c   |  711 
 src/sna/kgem_debug_gen5.c   |  687 
 src/sna/kgem_debug_gen6.c   | 1099 +++
 src/sna/sna.h   |  581 +++
 src/sna/sna_accel.c | 3435 ++
 src/sna/sna_blt.c   | 1361 
 src/sna/sna_composite.c |  738 
 src/sna/sna_damage.c   

xserver-xorg-video-intel: Changes to 'debian-unstable'

[Julien Cristau]

 debian/changelog|6 ++
 debian/rules|3 ---
 debian/xserver-xorg-video-intel.install |2 ++
 3 files changed, 8 insertions(+), 3 deletions(-)

New commits:
commit 0d64f742e2b234cfa1da2e2f97fb041004564a01
Author: Julien Cristau jcris...@debian.org
Date:   Mon Aug 1 01:27:42 2011 +0200

Re-enable XvMC.

diff --git a/debian/changelog b/debian/changelog
index e262d50..2ad7bd4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-video-intel (2:2.15.0-4) UNRELEASED; urgency=low
+
+  * Re-enable XvMC.
+
+ -- Julien Cristau jcris...@debian.org  Mon, 01 Aug 2011 01:27:19 +0200
+
 xserver-xorg-video-intel (2:2.15.0-3) unstable; urgency=high
 
   * Temporarily disable xvmc to sidestep the xcb-util mess and move to
diff --git a/debian/rules b/debian/rules
index a8df03a..cfa32f5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,8 +1,5 @@
 #!/usr/bin/make -f
 
-override_dh_auto_configure:
-   dh_auto_configure -O--builddirectory=build/ -- --disable-xvmc
-
 # Install in debian/tmp to retain control through dh_install:
 override_dh_auto_install:
dh_auto_install --destdir=debian/tmp
diff --git a/debian/xserver-xorg-video-intel.install 
b/debian/xserver-xorg-video-intel.install
index 15d87f0..b6b04ff 100644
--- a/debian/xserver-xorg-video-intel.install
+++ b/debian/xserver-xorg-video-intel.install
@@ -1,4 +1,6 @@
 usr/lib/xorg/modules/drivers/*.so
+usr/lib/libI810XvMC.so*
+usr/lib/libIntelXvMC.so*
 usr/share/man
 
 ../i915-kms.conf /etc/modprobe.d


-- 
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/e1qnfqj-95...@vasks.debian.org

xserver-xorg-video-intel: Changes to 'debian-unstable'

[Julien Cristau]

 debian/changelog|7 +++
 debian/rules|3 +++
 debian/xserver-xorg-video-intel.install |2 --
 3 files changed, 10 insertions(+), 2 deletions(-)

New commits:
commit 4b7e1e2a39f160902a9d3c95e838e6347991485f
Author: Julien Cristau jcris...@debian.org
Date:   Sat May 14 19:01:27 2011 +0200

Temporarily disable xvmc

Allows us to sidestep the xcb-util mess and move to testing.

diff --git a/debian/changelog b/debian/changelog
index ec9f9e8..e262d50 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xserver-xorg-video-intel (2:2.15.0-3) unstable; urgency=high
+
+  * Temporarily disable xvmc to sidestep the xcb-util mess and move to
+testing.
+
+ -- Julien Cristau jcris...@debian.org  Sat, 14 May 2011 19:00:38 +0200
+
 xserver-xorg-video-intel (2:2.15.0-2) unstable; urgency=low
 
   * xcb-util was split up in 0.3.8 and libxcb-aux has been merged
diff --git a/debian/rules b/debian/rules
index cfa32f5..a8df03a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,5 +1,8 @@
 #!/usr/bin/make -f
 
+override_dh_auto_configure:
+   dh_auto_configure -O--builddirectory=build/ -- --disable-xvmc
+
 # Install in debian/tmp to retain control through dh_install:
 override_dh_auto_install:
dh_auto_install --destdir=debian/tmp
diff --git a/debian/xserver-xorg-video-intel.install 
b/debian/xserver-xorg-video-intel.install
index b6b04ff..15d87f0 100644
--- a/debian/xserver-xorg-video-intel.install
+++ b/debian/xserver-xorg-video-intel.install
@@ -1,6 +1,4 @@
 usr/lib/xorg/modules/drivers/*.so
-usr/lib/libI810XvMC.so*
-usr/lib/libIntelXvMC.so*
 usr/share/man
 
 ../i915-kms.conf /etc/modprobe.d


-- 
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/e1qlihl-vs...@alioth.debian.org

xserver-xorg-video-intel: Changes to 'debian-unstable'

[Cyril Brulebois]

 debian/watch |1 +
 1 file changed, 1 insertion(+)

New commits:
commit bff4876b6003c6ed52af2571848304850118471c
Author: Cyril Brulebois cyril.bruleb...@ariadnext.com
Date:   Wed May 11 10:36:13 2011 +0200

Mention upstream git URL in a comment.

diff --git a/debian/watch b/debian/watch
index 371e19c..6f65e84 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,2 +1,3 @@
+#git=git://anongit.freedesktop.org/xorg/driver/xf86-video-intel
 version=3
 http://xorg.freedesktop.org/releases/individual/driver/ 
xf86-video-intel-(.*)\.tar\.gz


-- 
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/e1qkaqk-so...@alioth.debian.org

xserver-xorg-video-intel: Changes to 'debian-unstable'

[Arnaud Fontaine]

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

New commits:
commit 60b557fbf4646fd17408ea98bf730e2f5b20b82f
Author: Arnaud Fontaine ar...@debian.org
Date:   Fri May 6 23:10:28 2011 +0900

Update Build-Depends following xcb-util 0.3.8 release.

diff --git a/debian/changelog b/debian/changelog
index c938aa9..53f6c1e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xserver-xorg-video-intel (2:2.15.0-2) UNRELEASED; urgency=low
+
+  * xcb-util was split up in 0.3.8 and libxcb-aux has been merged
+into libxcb-util, thus update Build-Depends accordingly.
+
+ -- Arnaud Fontaine ar...@debian.org  Fri, 06 May 2011 23:02:42 +0900
+
 xserver-xorg-video-intel (2:2.15.0-1) unstable; urgency=low
 
   * New upstream release.
diff --git a/debian/control b/debian/control
index ead90dd..c4b5790 100644
--- a/debian/control
+++ b/debian/control
@@ -27,7 +27,7 @@ Build-Depends:
  libxext-dev,
  libxfixes-dev,
  libx11-xcb-dev,
- libxcb-aux0-dev,
+ libxcb-util0-dev,
  libxcb-dri2-0-dev,
 # end xvmc
  libudev-dev [linux-any],


-- 
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/e1qilkg-0005h7...@alioth.debian.org

xserver-xorg-video-intel: Changes to 'debian-unstable'

[Arnaud Fontaine]

 debian/changelog |1 +
 debian/control   |1 +
 2 files changed, 2 insertions(+)

New commits:
commit 18131d0b20a96b2d683cc78af115a54565ef9268
Author: Arnaud Fontaine ar...@debian.org
Date:   Fri May 6 23:16:11 2011 +0900

Add  to xserver-xorg-video-intel-dbg Depends.

diff --git a/debian/changelog b/debian/changelog
index 53f6c1e..6db66a3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ xserver-xorg-video-intel (2:2.15.0-2) UNRELEASED; urgency=low
 
   * xcb-util was split up in 0.3.8 and libxcb-aux has been merged
 into libxcb-util, thus update Build-Depends accordingly.
+  * Add ${misc:Depends} to xserver-xorg-video-intel-dbg Depends.
 
  -- Arnaud Fontaine ar...@debian.org  Fri, 06 May 2011 23:02:42 +0900
 
diff --git a/debian/control b/debian/control
index c4b5790..927d9cb 100644
--- a/debian/control
+++ b/debian/control
@@ -63,6 +63,7 @@ Architecture: amd64 i386
 Depends:
  xserver-xorg-video-intel (= ${binary:Version}),
  ${shlibs:Depends},
+ ${misc:Depends}
 Recommends:
  intel-gpu-tools,
 Section: debug


-- 
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/e1qilpa-0003i5...@alioth.debian.org

xserver-xorg-video-intel: Changes to 'debian-unstable'

[Arnaud Fontaine]

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

New commits:
commit 054b058013dbec542ee46860530b43b8bcbd7c5c
Author: Arnaud Fontaine ar...@debian.org
Date:   Fri May 6 23:55:24 2011 +0900

Upload to unstable.

diff --git a/debian/changelog b/debian/changelog
index 6db66a3..ec9f9e8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,10 @@
-xserver-xorg-video-intel (2:2.15.0-2) UNRELEASED; urgency=low
+xserver-xorg-video-intel (2:2.15.0-2) unstable; urgency=low
 
   * xcb-util was split up in 0.3.8 and libxcb-aux has been merged
 into libxcb-util, thus update Build-Depends accordingly.
   * Add ${misc:Depends} to xserver-xorg-video-intel-dbg Depends.
 
- -- Arnaud Fontaine ar...@debian.org  Fri, 06 May 2011 23:02:42 +0900
+ -- Arnaud Fontaine ar...@debian.org  Fri, 06 May 2011 23:53:39 +0900
 
 xserver-xorg-video-intel (2:2.15.0-1) unstable; 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/e1qimra-fb...@alioth.debian.org

xserver-xorg-video-intel: Changes to 'debian-unstable'

[Cyril Brulebois]

 ChangeLog   |  263 +
 NEWS|   53 +
 configure.ac|2 
 debian/changelog|   12 
 man/intel.man   |9 
 src/brw_structs.h   |5 
 src/i915_render.c   |   30 -
 src/i965_reg.h  |1 
 src/i965_render.c   | 1320 
 src/i965_video.c|6 
 src/intel.h |   25 
 src/intel_batchbuffer.c |   24 
 src/intel_batchbuffer.h |8 
 src/intel_display.c |4 
 src/intel_dri.c |   24 
 src/intel_driver.c  |   55 +-
 src/intel_memory.c  |7 
 src/intel_module.c  |2 
 src/intel_uxa.c |   46 +
 src/intel_video.c   |4 
 20 files changed, 1158 insertions(+), 742 deletions(-)

New commits:
commit 4b21e1bf037b148ac70719c45fab5af580f02032
Author: Cyril Brulebois k...@debian.org
Date:   Tue Apr 19 03:37:34 2011 +0200

Upload to unstable.

diff --git a/debian/changelog b/debian/changelog
index f11dae2..c938aa9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xserver-xorg-video-intel (2:2.15.0-1) UNRELEASED; urgency=low
+xserver-xorg-video-intel (2:2.15.0-1) unstable; urgency=low
 
   * New upstream release.
   * Merge from upstream master up to c9fb69cb25 to fix crashes with i965
@@ -8,7 +8,7 @@ xserver-xorg-video-intel (2:2.15.0-1) UNRELEASED; urgency=low
 - intel: Beware the unsigned promotion when checking for batch overflows
 - i965/video: We need 150 dwords of space for video state emission
 
- -- Cyril Brulebois k...@debian.org  Tue, 19 Apr 2011 03:29:07 +0200
+ -- Cyril Brulebois k...@debian.org  Tue, 19 Apr 2011 03:37:23 +0200
 
 xserver-xorg-video-intel (2:2.14.902-1) unstable; urgency=low
 

commit 0932f1927e4705730fe98c293433c258febb6059
Author: Cyril Brulebois k...@debian.org
Date:   Tue Apr 19 03:36:31 2011 +0200

Bump changelogs again (Closes: #622653).

diff --git a/ChangeLog b/ChangeLog
index ad435f1..7128372 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,35 @@
+commit c9fb69cb2502917dfb2828c90802de7766072899
+Author: Chris Wilson ch...@chris-wilson.co.uk
+Date:   Sun Apr 17 10:42:05 2011 +0100
+
+i965/video: We need 150 dwords of space for video state emission
+
+(Actually around 131, with additional 10% just for safety.)
+
+Reported-by: Modestas Vainius geroma...@mailas.com
+Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=36319
+Signed-off-by: Chris Wilson ch...@chris-wilson.co.uk
+
+commit a51cd83d25f2f9f2107219d5671194f931601244
+Author: Chris Wilson ch...@chris-wilson.co.uk
+Date:   Sun Apr 17 10:36:26 2011 +0100
+
+intel: Beware the unsigned promotion when checking for batch overflows
+
+Reported-by: Modestas Vainius geroma...@mailas.com
+References: https://bugs.freedesktop.org/show_bug.cgi?id=36319
+Signed-off-by: Chris Wilson ch...@chris-wilson.co.uk
+
+commit 030aa3d13643a0acb7126fa1fa6c5a8eac134639
+Author: Chris Wilson ch...@chris-wilson.co.uk
+Date:   Thu Apr 14 10:25:21 2011 +0100
+
+NEWS: typo.
+
+Spotted too late...
+
+Signed-off-by: Chris Wilson ch...@chris-wilson.co.uk
+
 commit 0e425b30e12b11dbf51eea1d3366e3372f8b93af
 Author: Chris Wilson ch...@chris-wilson.co.uk
 Date:   Thu Apr 14 10:16:03 2011 +0100
diff --git a/debian/changelog b/debian/changelog
index c7a6ff0..f11dae2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,12 @@
 xserver-xorg-video-intel (2:2.15.0-1) UNRELEASED; urgency=low
 
   * New upstream release.
+  * Merge from upstream master up to c9fb69cb25 to fix crashes with i965
+and kwin in particular, thanks to Julian Andres Klode and Modestas
+Vainius for their reports in Debian and upstream (Closes: #622653):
+- NEWS: typo.
+- intel: Beware the unsigned promotion when checking for batch overflows
+- i965/video: We need 150 dwords of space for video state emission
 
  -- Cyril Brulebois k...@debian.org  Tue, 19 Apr 2011 03:29:07 +0200
 

commit c41e36ebc95c75b7e90af1b5accd1fd2734ea493
Author: Cyril Brulebois k...@debian.org
Date:   Tue Apr 19 03:29:30 2011 +0200

Bump changelogs.

diff --git a/ChangeLog b/ChangeLog
index bd38e98..ad435f1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,234 @@
+commit 0e425b30e12b11dbf51eea1d3366e3372f8b93af
+Author: Chris Wilson ch...@chris-wilson.co.uk
+Date:   Thu Apr 14 10:16:03 2011 +0100
+
+configure,NEWS: 2.15.0 release
+
+Signed-off-by: Chris Wilson ch...@chris-wilson.co.uk
+
+commit 686018f283f1d131073ef5917213e6a8ac013f26
+Author: Chris Wilson ch...@chris-wilson.co.uk
+Date:   Tue Apr 12 08:23:04 2011 +0100
+
+Turn relaxed-fencing off by default for older (pre-G33) chipsets
+
+There are still too many unresolved bugs, typically GPU hangs, that are
+related to using relaxed fencing (i.e. only allocating the minimal
+amount of memory required for a buffer) on older hardware, so turn off
+the feature by default for the release.
+
+

xserver-xorg-video-intel: Changes to 'debian-unstable'

[Cyril Brulebois]

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

New commits:
commit 3d01babddf38add58cb79673b3f4a4c20220d3d5
Author: Cyril Brulebois k...@debian.org
Date:   Sun Apr 10 23:30:34 2011 +0200

Upload to unstable.

diff --git a/debian/changelog b/debian/changelog
index 5209654..46c13c9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xserver-xorg-video-intel (2:2.14.902-1) UNRELEASED; urgency=low
+xserver-xorg-video-intel (2:2.14.902-1) unstable; urgency=low
 
   * New upstream snapshot (2.15 rc2).
   * Apparently, using libXvMC means adding the name of the library (like
@@ -8,7 +8,7 @@ xserver-xorg-video-intel (2:2.14.902-1) UNRELEASED; urgency=low
 - /usr/lib/libIntelXvMC.so
   * Override lintian warning about the libXvMC shared objects.
 
- -- Cyril Brulebois k...@debian.org  Wed, 02 Mar 2011 19:40:58 +0100
+ -- Cyril Brulebois k...@debian.org  Sun, 10 Apr 2011 23:30:19 +0200
 
 xserver-xorg-video-intel (2:2.14.0-4) unstable; 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/e1q94qv-000152...@alioth.debian.org

xserver-xorg-video-intel: Changes to 'debian-unstable'

[Cyril Brulebois]

 ChangeLog   |  143 
 NEWS|   21 
 configure.ac|2 
 debian/changelog|4 
 man/intel.man   |   10 ++
 src/i915_video.c|3 
 src/intel.h |   33 ++-
 src/intel_batchbuffer.h |6 -
 src/intel_display.c |   14 +--
 src/intel_dri.c |  209 ++--
 src/intel_driver.c  |   23 +++--
 src/intel_driver.h  |2 
 src/intel_memory.c  |4 
 src/intel_uxa.c |6 -
 14 files changed, 388 insertions(+), 92 deletions(-)

New commits:
commit 4b3d9aa8abd2e995af5e2de3decae28d4111251b
Author: Cyril Brulebois k...@debian.org
Date:   Wed Mar 30 03:16:35 2011 +0200

Bump changelogs.

diff --git a/ChangeLog b/ChangeLog
index 5f33e75..bd38e98 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,146 @@
+commit a2c8442fcb29ef2d0df41518952a2d8df1671070
+Author: Chris Wilson ch...@chris-wilson.co.uk
+Date:   Tue Mar 29 11:38:45 2011 +0100
+
+configure: version bump for 2.14.902 snapshot
+
+Signed-off-by: Chris Wilson ch...@chris-wilson.co.uk
+
+commit 2f2680793952876c89796174bed53c824fe6d1cb
+Author: Chris Wilson ch...@chris-wilson.co.uk
+Date:   Tue Mar 29 11:38:18 2011 +0100
+
+NEWS: Entry for 2.14.902 snapshot
+
+Signed-off-by: Chris Wilson ch...@chris-wilson.co.uk
+
+commit 7ccbec801e9ee32fc110db730dfec674a94dea21
+Author: Keith Packard kei...@keithp.com
+Date:   Thu Mar 24 11:06:57 2011 -0700
+
+Recover from i830_dri2_add_frame_event out-of-memory condition
+
+If adding either the frame or client resources fails, we need to clean
+up afterwards properly.
+
+First, add_frame_event needs to internally clean up after itself by
+undoing any partial execution. Second, the callers need to look at the
+return value and free the swap/flip info structure when necessary.
+
+Signed-off-by: Keith Packard kei...@keithp.com
+Reviewed-by: Julien Cristau jcris...@debian.org
+
+commit ec133abc4bd8caba15ed54e18621b816afb06981
+Author: Chris Wilson ch...@chris-wilson.co.uk
+Date:   Thu Mar 24 15:32:50 2011 +
+
+Use the per-generation batch context switch for atomic sequences
+
+A modest boost to throughput and reduction in CPU overhead from
+not flushing the batch on every transition from BLT to RENDER.
+
+Signed-off-by: Chris Wilson ch...@chris-wilson.co.uk
+
+commit 86f23f21ab57fcbc031bcd2b8f432a08ff4cc320
+Author: Keith Packard kei...@keithp.com
+Date:   Wed Mar 23 17:07:49 2011 -0700
+
+Skip client and drawable resource delete calls when deleting frame event
+
+As the frame_event is about to be freed, there's no point in cleaning
+up references to the drawable and client.
+
+Signed-off-by: Keith Packard kei...@keithp.com
+
+commit e1ff5182304e00c0d392092069422cae7626cf8d
+Author: Keith Packard kei...@keithp.com
+Date:   Wed Mar 9 17:00:41 2011 -0800
+
+Handle drawable/client destruction in pending swaps/flips
+
+A pending swap or flip holds references to drawables and clients which
+become invalid when destroyed. Add suitable resources to the database
+to track those lifetimes and clean up the pending data structure then.
+
+Later, when the pending swap or flip occurs, handle a missing drawable
+by just discarding the flip or swap. Handle a missing client by not
+sending an event or reply.
+
+Signed-off-by: Keith Packard kei...@keithp.com
+
+commit aa0328f342177e33f9c863531712eaa4577b5f2b
+Author: Keith Packard kei...@keithp.com
+Date:   Wed Mar 9 16:23:22 2011 -0800
+
+dri2: Make DRI2FrameEvent public and use instead of void *
+
+Instead of using void * for all of the flip_info and swap_info
+pointers, just make the underlying structure a public data type and
+use that.
+
+Signed-off-by: Keith Packard kei...@keithp.com
+
+commit ee740778f5d5355c04f6fc4564f598993b106d62
+Author: Chris Wilson ch...@chris-wilson.co.uk
+Date:   Wed Mar 16 08:37:24 2011 +
+
+i915/video: Clip indirect Xv output
+
+In the case of a singular clip box and rendering onto the front buffer
+larger than 2048, the clip extents were being ignored.  Here we can
+simply reduce the size of the indirect pixmap to the clip extents.
+
+Reported-by: Michael Chang mch...@novell.com
+Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=35346
+Signed-off-by: Chris Wilson ch...@chris-wilson.co.uk
+
+commit 014fc7abb7b2cc2110e3ab9a0bd6f7cff2c64c05
+Author: Chris Wilson ch...@chris-wilson.co.uk
+Date:   Wed Mar 9 17:10:50 2011 +
+
+dri: Disable page-flip between a tiled buffer and a linear scanout
+
+Keith Packard pointed out a loophole that could cause the DDX to end up
+with a tiled scanout even if the user required a linear framebuffer;
+that is by using page-flipping we could replace the scanout pixmap with
+another 

xserver-xorg-video-intel: Changes to 'debian-unstable'

[Cyril Brulebois]

 debian/changelog  |6 ++
 debian/rules  |4 +++-
 debian/xserver-xorg-video-intel.lintian-overrides |1 +
 3 files changed, 10 insertions(+), 1 deletion(-)

New commits:
commit 2ee14511f3d72701aa2429095bad7a5616bf4cc2
Author: Cyril Brulebois k...@debian.org
Date:   Sat Mar 5 17:25:04 2011 +0100

Override lintian warning about the libXvMC shared objects.

diff --git a/debian/changelog b/debian/changelog
index ebb8829..a4c67d8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ xserver-xorg-video-intel (2:2.14.901-1) UNRELEASED; urgency=low
 file (/etc/X11/XvMCConfig). Accordingly, remove extraneous symlinks:
 - /usr/lib/libI810XvMC.so
 - /usr/lib/libIntelXvMC.so
+  * Override lintian warning about the libXvMC shared objects.
 
  -- Cyril Brulebois k...@debian.org  Wed, 02 Mar 2011 19:40:58 +0100
 
diff --git a/debian/xserver-xorg-video-intel.lintian-overrides 
b/debian/xserver-xorg-video-intel.lintian-overrides
new file mode 100644
index 000..bfbe798
--- /dev/null
+++ b/debian/xserver-xorg-video-intel.lintian-overrides
@@ -0,0 +1 @@
+package-name-doesnt-match-sonames libI810XvMC1 libIntelXvMC1

commit 42774b9ef0ff614c1a6024f05c53ab3b180f5257
Author: Cyril Brulebois k...@debian.org
Date:   Sat Mar 5 17:22:26 2011 +0100

Stop shipping libxvmc symlinks.

diff --git a/debian/changelog b/debian/changelog
index 4aa3720..ebb8829 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,11 @@
 xserver-xorg-video-intel (2:2.14.901-1) UNRELEASED; urgency=low
 
   * New upstream snapshot (2.15 rc1).
+  * Apparently, using libXvMC means adding the name of the library (like
+libI810XvMC.so.1 or libIntelXvMC.so.1) to the libXvMC configuration
+file (/etc/X11/XvMCConfig). Accordingly, remove extraneous symlinks:
+- /usr/lib/libI810XvMC.so
+- /usr/lib/libIntelXvMC.so
 
  -- Cyril Brulebois k...@debian.org  Wed, 02 Mar 2011 19:40:58 +0100
 
diff --git a/debian/rules b/debian/rules
index d83fbc1..cfa32f5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,9 +4,11 @@
 override_dh_auto_install:
dh_auto_install --destdir=debian/tmp
 
-# Kill *.la files, and forget no-one:
+# Kill *.la files, libxvmc symlinks, and forget no-one:
 override_dh_install:
find debian/tmp -name '*.la' -delete
+   rm -f debian/tmp/usr/lib/libI810XvMC.so
+   rm -f debian/tmp/usr/lib/libIntelXvMC.so
dh_install --fail-missing
 
 # Debug package:


-- 
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/e1pvuim-0005kz...@alioth.debian.org

xserver-xorg-video-intel: Changes to 'debian-unstable'

[Cyril Brulebois]

 ChangeLog|  379 +++
 Makefile.am  |1 
 NEWS |   31 +++
 autogen.sh   |   14 -
 configure.ac |   34 ++-
 debian/changelog |6 
 m4/.gitignore|5 
 src/i915_render.c|   10 -
 src/i965_render.c|6 
 src/i965_video.c |   34 +--
 src/intel.h  |   58 --
 src/intel_display.c  |   19 +-
 src/intel_dri.c  |   54 +++---
 src/intel_driver.c   |  319 ++--
 src/intel_driver.h   |   28 +--
 src/intel_module.c   |   40 ++--
 src/intel_uxa.c  |   18 +-
 src/intel_video.c|4 
 src/legacy/i810/i810_reg.h   |   32 +--
 src/xvmc/i915_xvmc.c |3 
 src/xvmc/intel_batchbuffer.c |2 
 src/xvmc/intel_batchbuffer.h |2 
 src/xvmc/intel_xvmc.c|   21 --
 src/xvmc/intel_xvmc_dump.c   |2 
 src/xvmc/xvmc_vld.c  |5 
 uxa/uxa-accel.c  |8 
 uxa/uxa-glyphs.c |   20 +-
 uxa/uxa-priv.h   |1 
 uxa/uxa-render.c |2 
 29 files changed, 709 insertions(+), 449 deletions(-)

New commits:
commit dcf256bc8c39aa4dff6961ae1dc842e10636ac72
Author: Cyril Brulebois k...@debian.org
Date:   Wed Mar 2 19:41:42 2011 +0100

Bump changelogs.

diff --git a/ChangeLog b/ChangeLog
index 25ca9e5..5f33e75 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,382 @@
+commit 34f9a3335f96b16ef9df6213eb0a586c94f8f05b
+Author: Chris Wilson ch...@chris-wilson.co.uk
+Date:   Wed Mar 2 17:46:19 2011 +
+
+configure: Bump for 2.14.901 snapshot
+
+Signed-off-by: Chris Wilson ch...@chris-wilson.co.uk
+
+commit 057783937d7a42a766d0e45174c4c2dc0ffacd40
+Author: Chris Wilson ch...@chris-wilson.co.uk
+Date:   Wed Mar 2 17:45:43 2011 +
+
+NEWS: Add entry for 2.14.901 snapshot
+
+Signed-off-by: Chris Wilson ch...@chris-wilson.co.uk
+
+commit e889d3a709b55a0731ab098b17a3364b9bf39387
+Author: Chris Wilson ch...@chris-wilson.co.uk
+Date:   Sun Feb 27 10:51:50 2011 +
+
+dri: Protect against destroying a foreign DRI drawable
+
+I have no clue as to how such an alien drawable reached us, but we have
+the evidence of a segfault to say it can happen.
+
+Reported-by: Bernie Innocenti ber...@codewiz.org
+Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=34787
+Signed-off-by: Chris Wilson ch...@chris-wilson.co.uk
+
+commit d21d781466785c317131a8a57606925867265dc8
+Author: Daniel Vetter daniel.vet...@ffwll.ch
+Date:   Tue Feb 22 18:31:44 2011 +0100
+
+Fix relaxed tiling on gen2
+
+Signed-off-by: Daniel Vetter daniel.vet...@ffwll.ch
+
+commit 9599fde65a0d8b7e7c85199346f7b620bdd8388d
+Author: Bryce Harrington br...@canonical.com
+Date:   Tue Feb 15 22:30:18 2011 -0800
+
+Quell excessively verbose vblank counter failed error messages
+
+Certain error situations can result in the following printed to
+Xorg.0.log at a high enough rate to make log file size a problem.
+
+(WW) intel(0): I830DRI2GetMSC:1062 get vblank counter failed: Invalid 
argument
+(WW) intel(0): I830DRI2ScheduleWaitMSC:1118 get vblank counter failed: 
Invalid argument
+
+Following in the tradition of commit 0ad6d6e1, limit the warnings to be
+output 5 times, then quell the remainder.
+
+Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=34322
+Ref.: 
https://bugs.launchpad.net/ubuntu/+source/xserver-xorg-video-intel/+bug/710594
+
+Signed-off-by: Bryce Harrington br...@canonical.com
+Signed-off-by: Chris Wilson ch...@chris-wilson.co.uk
+
+commit 0ca595e9d533019b241666d29b421c7b36f9647a
+Author: Adam Jackson a...@redhat.com
+Date:   Thu Feb 17 15:26:35 2011 -0500
+
+Fix IGD and IGDNG constants to be comprehensible
+
+Since, with GPU-on-package, it's hard to talk about a model number for
+a specific chipset like 855GM, just use the platform names.
+
+Signed-off-by: Adam Jackson a...@redhat.com
+Signed-off-by: Chris Wilson ch...@chris-wilson.co.uk
+
+commit 4c66b28870b050493ad96f7b0fe2d70d7ee539c7
+Author: Chris Wilson ch...@chris-wilson.co.uk
+Date:   Thu Feb 17 16:48:24 2011 +
+
+uxa: Fallback if the temporary is too large
+
+If the render operation requires a temporary source Picture and the
+operation is large, larger than the maximum permitted bo, then we will
+fail to allocate the bo. In this case, we need to fallback and perform
+the operation on the CPU rather than dereference a NULL bo.
+
+Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=34399
+Signed-off-by: Chris Wilson ch...@chris-wilson.co.uk
+
+commit 23f9b14df7c102c1036134835dd5d1a508059858
+Author: Chris Wilson ch...@chris-wilson.co.uk
+Date:   Sat Feb 12 10:42:34 2011 +
+
+i965: Remove broken maximum base 

xserver-xorg-video-intel: Changes to 'debian-unstable'

[Cyril Brulebois]

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

New commits:
commit 3518593b72baee57a60cf4fbbcc96043230ac21d
Author: Cyril Brulebois k...@debian.org
Date:   Fri Feb 18 12:44:26 2011 +0100

Upload to unstable.

diff --git a/debian/changelog b/debian/changelog
index b1bc602..52e5855 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,11 @@
-xserver-xorg-video-intel (2:2.14.0-4) UNRELEASED; urgency=low
+xserver-xorg-video-intel (2:2.14.0-4) unstable; urgency=low
 
   * Cherry-pick from upstream:
 - uxa: Fallback if the temporary is too large
   * This fixes a null pointer dereference with some rendering operations
 involving large pictures (Closes: #613830). Thanks, Enrico!
 
- -- Cyril Brulebois k...@debian.org  Thu, 17 Feb 2011 23:12:05 +0100
+ -- Cyril Brulebois k...@debian.org  Fri, 18 Feb 2011 12:44:23 +0100
 
 xserver-xorg-video-intel (2:2.14.0-3) unstable; 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/e1pqop4-0003p2...@alioth.debian.org

xserver-xorg-video-intel: Changes to 'debian-unstable'

[Cyril Brulebois]

 debian/changelog |9 +
 uxa/uxa-render.c |   37 +
 2 files changed, 30 insertions(+), 16 deletions(-)

New commits:
commit 15da5957bd59f02b871ad52203f0075e08a4813c
Author: Cyril Brulebois k...@debian.org
Date:   Thu Feb 17 23:20:24 2011 +0100

Document the cherry-pick (Closes: #613830).

diff --git a/debian/changelog b/debian/changelog
index 17a955a..b1bc602 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+xserver-xorg-video-intel (2:2.14.0-4) UNRELEASED; urgency=low
+
+  * Cherry-pick from upstream:
+- uxa: Fallback if the temporary is too large
+  * This fixes a null pointer dereference with some rendering operations
+involving large pictures (Closes: #613830). Thanks, Enrico!
+
+ -- Cyril Brulebois k...@debian.org  Thu, 17 Feb 2011 23:12:05 +0100
+
 xserver-xorg-video-intel (2:2.14.0-3) unstable; urgency=low
 
   * Switch to dh:

commit 4f08ede8515023f64b907e4a9013008fb1a5815b
Author: Chris Wilson ch...@chris-wilson.co.uk
Date:   Thu Feb 17 16:48:24 2011 +

uxa: Fallback if the temporary is too large

If the render operation requires a temporary source Picture and the
operation is large, larger than the maximum permitted bo, then we will
fail to allocate the bo. In this case, we need to fallback and perform
the operation on the CPU rather than dereference a NULL bo.

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=34399
Signed-off-by: Chris Wilson ch...@chris-wilson.co.uk
(cherry picked from commit 4c66b28870b050493ad96f7b0fe2d70d7ee539c7)

diff --git a/uxa/uxa-render.c b/uxa/uxa-render.c
index 02bfa03..6bffa4d 100644
--- a/uxa/uxa-render.c
+++ b/uxa/uxa-render.c
@@ -460,12 +460,12 @@ uxa_try_driver_solid_fill(PicturePtr pSrc,
 }
 
 static PicturePtr
-uxa_picture_for_pixman_format(ScreenPtr pScreen,
+uxa_picture_for_pixman_format(ScreenPtr screen,
  pixman_format_code_t format,
  int width, int height)
 {
-   PicturePtr pPicture;
-   PixmapPtr pPixmap;
+   PicturePtr picture;
+   PixmapPtr pixmap;
int error;
 
if (format == PIXMAN_a1)
@@ -475,24 +475,29 @@ uxa_picture_for_pixman_format(ScreenPtr pScreen,
if (PIXMAN_FORMAT_A(format) == 0)
format = PIXMAN_a8r8g8b8;
 
-   pPixmap = (*pScreen-CreatePixmap)(pScreen, width, height,
-  PIXMAN_FORMAT_DEPTH(format),
-  UXA_CREATE_PIXMAP_FOR_MAP);
-   if (!pPixmap)
+   pixmap = screen-CreatePixmap(screen, width, height,
+   PIXMAN_FORMAT_DEPTH(format),
+   UXA_CREATE_PIXMAP_FOR_MAP);
+   if (!pixmap)
return 0;
 
-   pPicture = CreatePicture(0, pPixmap-drawable,
-PictureMatchFormat(pScreen,
-   PIXMAN_FORMAT_DEPTH(format),
-   format),
-0, 0, serverClient, error);
-   (*pScreen-DestroyPixmap) (pPixmap);
-   if (!pPicture)
+   if (!uxa_pixmap_is_offscreen(pixmap)) {
+   screen-DestroyPixmap(pixmap);
+   return 0;
+   }
+
+   picture = CreatePicture(0, pixmap-drawable,
+   PictureMatchFormat(screen,
+  PIXMAN_FORMAT_DEPTH(format),
+  format),
+   0, 0, serverClient, error);
+   screen-DestroyPixmap(pixmap);
+   if (!picture)
return 0;
 
-   ValidatePicture(pPicture);
+   ValidatePicture(picture);
 
-   return pPicture;
+   return picture;
 }
 
 static PicturePtr


-- 
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/e1pqcgu-00072e...@alioth.debian.org

xserver-xorg-video-intel: Changes to 'debian-unstable'

[Cyril Brulebois]

Rebased ref, commits from common ancestor:
commit 7e2ec9c5a7058ab21a71ffcd2cbe4f497550437c
Author: Cyril Brulebois k...@debian.org
Date:   Sat Feb 5 14:47:05 2011 +0100

Upload to unstable

diff --git a/debian/changelog b/debian/changelog
index e1e3d25..17a955a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xserver-xorg-video-intel (2:2.14.0-3) UNRELEASED; urgency=low
+xserver-xorg-video-intel (2:2.14.0-3) unstable; urgency=low
 
   * Switch to dh:
 - Use debhelper 8.
@@ -21,7 +21,7 @@ xserver-xorg-video-intel (2:2.14.0-3) UNRELEASED; urgency=low
   * Wrap Depends/Provides/Recommends.
   * Bump Standards-Version to 3.9.1 (no changes needed).
 
- -- Cyril Brulebois k...@debian.org  Sat, 05 Feb 2011 07:43:53 +0100
+ -- Cyril Brulebois k...@debian.org  Sat, 05 Feb 2011 14:47:04 +0100
 
 xserver-xorg-video-intel (2:2.14.0-2) experimental; urgency=low
 

commit 61447c93fafbd48ced723d29503e99da1036b81e
Author: Cyril Brulebois k...@debian.org
Date:   Sat Feb 5 09:32:14 2011 +0100

Add a placeholding series file.

diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 000..fdffa2a
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+# placeholder

commit a1d57726610e6caa03b08eef4fac6e380ecf3392
Author: Cyril Brulebois k...@debian.org
Date:   Sat Feb 5 08:11:33 2011 +0100

Bump Standards-Version to 3.9.1 (no changes needed).

diff --git a/debian/changelog b/debian/changelog
index 74e52c2..e1e3d25 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -19,6 +19,7 @@ xserver-xorg-video-intel (2:2.14.0-3) UNRELEASED; urgency=low
   * Update Uploaders list. Thanks, David  Brice!
   * Remove long obsolete Replaces.
   * Wrap Depends/Provides/Recommends.
+  * Bump Standards-Version to 3.9.1 (no changes needed).
 
  -- Cyril Brulebois k...@debian.org  Sat, 05 Feb 2011 07:43:53 +0100
 
diff --git a/debian/control b/debian/control
index acfa1ec..ead90dd 100644
--- a/debian/control
+++ b/debian/control
@@ -33,7 +33,7 @@ Build-Depends:
  libudev-dev [linux-any],
  quilt,
  xutils-dev (= 1:7.5+4),
-Standards-Version: 3.8.4
+Standards-Version: 3.9.1
 Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-video-intel
 Vcs-Browser: 
http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-video-intel.git
 

commit 9624b733a9e10700224178fcf37ee064b2f05124
Author: Cyril Brulebois k...@debian.org
Date:   Sat Feb 5 08:11:18 2011 +0100

Wrap Depends/Provides/Recommends.

diff --git a/debian/changelog b/debian/changelog
index ef016ba..74e52c2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -18,6 +18,7 @@ xserver-xorg-video-intel (2:2.14.0-3) UNRELEASED; urgency=low
   now Linux-only.
   * Update Uploaders list. Thanks, David  Brice!
   * Remove long obsolete Replaces.
+  * Wrap Depends/Provides/Recommends.
 
  -- Cyril Brulebois k...@debian.org  Sat, 05 Feb 2011 07:43:53 +0100
 
diff --git a/debian/control b/debian/control
index a74fb06..acfa1ec 100644
--- a/debian/control
+++ b/debian/control
@@ -39,8 +39,12 @@ Vcs-Browser: 
http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-video-intel.g
 
 Package: xserver-xorg-video-intel
 Architecture: amd64 i386
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${xviddriver:Depends}
-Provides: ${xviddriver:Provides}
+Depends:
+ ${shlibs:Depends},
+ ${misc:Depends},
+ ${xviddriver:Depends},
+Provides:
+ ${xviddriver:Provides}
 Description: X.Org X server -- Intel i8xx, i9xx display driver
  This package provides the driver for the Intel i8xx and i9xx family
  of chipsets, including i810, i815, i830, i845, i855, i865, i915, i945
@@ -56,8 +60,11 @@ Description: X.Org X server -- Intel i8xx, i9xx display 
driver
 
 Package: xserver-xorg-video-intel-dbg
 Architecture: amd64 i386
-Depends: xserver-xorg-video-intel (= ${binary:Version}), ${shlibs:Depends}
-Recommends: intel-gpu-tools
+Depends:
+ xserver-xorg-video-intel (= ${binary:Version}),
+ ${shlibs:Depends},
+Recommends:
+ intel-gpu-tools,
 Section: debug
 Priority: extra
 Description: X.Org X server -- Intel i8xx, i9xx display driver (debug symbols)

commit 84b9320310b839661f17a72109aa9b626f074b79
Author: Cyril Brulebois k...@debian.org
Date:   Sat Feb 5 08:09:51 2011 +0100

Remove long obsolete Replaces/Conflicts.

diff --git a/debian/changelog b/debian/changelog
index 6d78011..ef016ba 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -17,6 +17,7 @@ xserver-xorg-video-intel (2:2.14.0-3) UNRELEASED; urgency=low
 - The .install.hurd-i386 file is no longer relevant, this package is
   now Linux-only.
   * Update Uploaders list. Thanks, David  Brice!
+  * Remove long obsolete Replaces.
 
  -- Cyril Brulebois k...@debian.org  Sat, 05 Feb 2011 07:43:53 +0100
 
diff --git a/debian/control b/debian/control
index f90b884..a74fb06 100644
--- a/debian/control
+++ b/debian/control
@@ -41,8 +41,6 @@ Package: xserver-xorg-video-intel
 Architecture: amd64 i386
 Depends: ${shlibs:Depends}, ${misc:Depends}, ${xviddriver:Depends}
 Provides: 

xserver-xorg-video-intel: Changes to 'debian-unstable'

[Cyril Brulebois]

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

New commits:
commit 51f089ac6e4361916c00daa912994bedee89a579
Author: Cyril Brulebois k...@debian.org
Date:   Fri Dec 24 19:56:09 2010 +0100

Upload to unstable.

diff --git a/debian/changelog b/debian/changelog
index 265e396..e30b885 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
-xserver-xorg-video-intel (2:2.13.0-5) UNRELEASED; urgency=low
+xserver-xorg-video-intel (2:2.13.0-5) unstable; urgency=low
 
+  [ Julien Cristau ]
   * Drop the intel_pci_probe patch from -4 (closes: #606288).  This relied on
 i915.ko getting loaded automatically, which doesn't happen if:
 - the kernel is built without CONFIG_DRM_I915_KMS and lacks modaliases, or
@@ -7,7 +8,11 @@ xserver-xorg-video-intel (2:2.13.0-5) UNRELEASED; urgency=low
   * Use the patch from upstream instead, which tries to load the kernel driver
 before testing for kms.
 
- -- Julien Cristau jcris...@debian.org  Sat, 18 Dec 2010 20:17:18 +0100
+  [ Cyril Brulebois ]
+  * The “♫ we wish you a working driver ♫” release.
+  * Build, test, and upload to unstable.
+
+ -- Cyril Brulebois k...@debian.org  Fri, 24 Dec 2010 19:55:18 +0100
 
 xserver-xorg-video-intel (2:2.13.0-4) unstable; 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/e1pwd5x-yp...@alioth.debian.org

xserver-xorg-video-intel: Changes to 'debian-unstable'

[Julien Cristau]

 debian/changelog |   11 +++
 debian/patches/fail-probe-if-no-kms.diff |   40 --
 debian/patches/series|1 
 src/intel_driver.c   |   35 ---
 src/intel_module.c   |   46 ---
 5 files changed, 53 insertions(+), 80 deletions(-)

New commits:
commit a50928e5d6a8e239ae5649c527d7a2df07a557c5
Author: Julien Cristau jcris...@debian.org
Date:   Sat Dec 18 20:22:33 2010 +0100

changelog entry

diff --git a/debian/changelog b/debian/changelog
index 47a7170..265e396 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+xserver-xorg-video-intel (2:2.13.0-5) UNRELEASED; urgency=low
+
+  * Drop the intel_pci_probe patch from -4 (closes: #606288).  This relied on
+i915.ko getting loaded automatically, which doesn't happen if:
+- the kernel is built without CONFIG_DRM_I915_KMS and lacks modaliases, or
+- the user kept obsolete /etc/modprobe.d blacklists around.
+  * Use the patch from upstream instead, which tries to load the kernel driver
+before testing for kms.
+
+ -- Julien Cristau jcris...@debian.org  Sat, 18 Dec 2010 20:17:18 +0100
+
 xserver-xorg-video-intel (2:2.13.0-4) unstable; urgency=low
 
   [ Julien Cristau ]

commit 20af913400bd0d847f36da4b5253b737335db1d8
Author: Chris Wilson ch...@chris-wilson.co.uk
Date:   Sat Oct 2 13:32:58 2010 +0100

Do not claim the PCI device if !KMS

By returning FALSE whilst probing if we can't find a KMS driver, we
allow X to fallback to trying the VESA driver -- rather than failing.

The initial idea for this was by Julien Cristau.

Reported-by: Julien Cristau jcris...@debian.org
Signed-off-by: Chris Wilson ch...@chris-wilson.co.uk
(cherry picked from commit 455f2939a661764ebb8d1747d44e16a0a8937808)

diff --git a/src/intel_driver.c b/src/intel_driver.c
index d086d94..26bdc6a 100644
--- a/src/intel_driver.c
+++ b/src/intel_driver.c
@@ -262,33 +262,6 @@ static void PreInitCleanup(ScrnInfoPtr scrn)
scrn-driverPrivate = NULL;
 }
 
-/*
- * DRM mode setting Linux only at this point... later on we could
- * add a wrapper here.
- */
-static Bool intel_kernel_mode_enabled(ScrnInfoPtr scrn)
-{
-   struct pci_device *dev;
-   char id[20];
-   int ret;
-
-   dev = 
xf86GetPciInfoForEntity(xf86GetEntityInfo(scrn-entityList[0])-index);
-   snprintf(id, sizeof(id),
-pci:%04x:%02x:%02x.%d,
-dev-domain, dev-bus, dev-dev, dev-func);
-
-   ret = drmCheckModesettingSupported(id);
-   if (ret) {
-   if (xf86LoadKernelModule(i915))
-   ret = drmCheckModesettingSupported(id);
-   }
-   /* Be nice to the user and load fbcon too */
-   if (!ret)
-   (void)xf86LoadKernelModule(fbcon);
-
-   return ret == 0;
-}
-
 static void intel_check_chipset_option(ScrnInfoPtr scrn)
 {
intel_screen_private *intel = intel_get_screen_private(scrn);
@@ -513,18 +486,10 @@ static Bool I830PreInit(ScrnInfoPtr scrn, int flags)
EntityInfoPtr pEnt;
int flags24;
Gamma zeros = { 0.0, 0.0, 0.0 };
-   int drm_mode_setting;
 
if (scrn-numEntities != 1)
return FALSE;
 
-   drm_mode_setting = intel_kernel_mode_enabled(scrn);
-   if (!drm_mode_setting) {
-   xf86DrvMsg(scrn-scrnIndex, X_ERROR,
-  No kernel modesetting driver detected.\n);
-   return FALSE;
-   }
-
pEnt = xf86GetEntityInfo(scrn-entityList[0]);
 
if (flags  PROBE_DETECT)
diff --git a/src/intel_module.c b/src/intel_module.c
index 53e1cb6..8fd55ed 100644
--- a/src/intel_module.c
+++ b/src/intel_module.c
@@ -37,6 +37,8 @@
 #include intel_driver.h
 #include legacy/legacy.h
 
+#include xf86drmMode.h
+
 static const SymTabRec _intel_chipsets[] = {
 {PCI_CHIP_I810,i810},
 {PCI_CHIP_I810_DC100,  i810-dc100},
@@ -361,6 +363,27 @@ static Bool intel_driver_func(ScrnInfoPtr pScrn,
 }
 }
 
+static Bool has_kernel_mode_setting(struct pci_device *dev)
+{
+   char id[20];
+   int ret;
+
+   snprintf(id, sizeof(id),
+pci:%04x:%02x:%02x.%d,
+dev-domain, dev-bus, dev-dev, dev-func);
+
+   ret = drmCheckModesettingSupported(id);
+   if (ret) {
+   if (xf86LoadKernelModule(i915))
+   ret = drmCheckModesettingSupported(id);
+   }
+   /* Be nice to the user and load fbcon too */
+   if (!ret)
+   (void)xf86LoadKernelModule(fbcon);
+
+   return ret == 0;
+}
+
 /*
  * intel_pci_probe --
  *
@@ -373,11 +396,26 @@ static Bool intel_pci_probe (DriverPtrdriver,
 struct pci_device  *device,
 intptr_t   match_data)
 {
-ScrnInfoPtr scrn = NULL;
+ScrnInfoPtr scrn;
+
+if 

xserver-xorg-video-intel: Changes to 'debian-unstable'

[Cyril Brulebois]

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

New commits:
commit 5f02d83c5a14be1ccbb65b1359979192b189d487
Author: Cyril Brulebois k...@debian.org
Date:   Tue Dec 7 15:23:44 2010 +0100

Build, test, and upload to unstable.

diff --git a/debian/changelog b/debian/changelog
index 6ab6ff8..47a7170 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,13 @@
-xserver-xorg-video-intel (2:2.13.0-4) UNRELEASED; urgency=low
+xserver-xorg-video-intel (2:2.13.0-4) unstable; urgency=low
 
+  [ Julien Cristau ]
   * Fail intel_pci_probe if we don't have a kernel mode setting driver.  This
 allows the X server to fall back to the vesa driver instead.
 
- -- Julien Cristau jcris...@debian.org  Mon, 06 Dec 2010 10:22:35 +0100
+  [ Cyril Brulebois ]
+  * Build, test, and upload to unstable.
+
+ -- Cyril Brulebois k...@debian.org  Tue, 07 Dec 2010 15:23:32 +0100
 
 xserver-xorg-video-intel (2:2.13.0-3) unstable; 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/e1ppyzo-00012w...@alioth.debian.org

xserver-xorg-video-intel: Changes to 'debian-unstable'

[Julien Cristau]

 debian/changelog |7 +
 debian/patches/fail-probe-if-no-kms.diff |   40 
++
 debian/patches/revert-display-outputs-are-enabled-automatically.diff |   13 +--
 debian/patches/series|1 
 4 files changed, 53 insertions(+), 8 deletions(-)

New commits:
commit 50b0eccdd708aec16a9d95f0961fffa923f7dbe3
Author: Julien Cristau jcris...@debian.org
Date:   Mon Dec 6 10:26:39 2010 +0100

Refresh patch

diff --git 
a/debian/patches/revert-display-outputs-are-enabled-automatically.diff 
b/debian/patches/revert-display-outputs-are-enabled-automatically.diff
index 497ca29..081f83e 100644
--- a/debian/patches/revert-display-outputs-are-enabled-automatically.diff
+++ b/debian/patches/revert-display-outputs-are-enabled-automatically.diff
@@ -11,10 +11,10 @@ switch.  Debian bug#600405.
  src/intel_display.c |   16 ++--
  1 files changed, 14 insertions(+), 2 deletions(-)
 
-diff --git a/src/intel_display.c b/src/intel_display.c
-index d32224e..d9c4b5b 100644
 a/src/intel_display.c
-+++ b/src/intel_display.c
+Index: xserver-xorg-video-intel/src/intel_display.c
+===
+--- xserver-xorg-video-intel.orig/src/intel_display.c
 xserver-xorg-video-intel/src/intel_display.c
 @@ -327,7 +327,7 @@ intel_crtc_apply(xf86CrtcPtr crtc)
uint32_t *output_ids;
int output_count = 0;
@@ -24,7 +24,7 @@ index d32224e..d9c4b5b 100644
  
output_ids = calloc(sizeof(uint32_t), xf86_config-num_output);
if (!output_ids)
-@@ -378,14 +378,26 @@ intel_crtc_apply(xf86CrtcPtr crtc)
+@@ -380,14 +380,26 @@ intel_crtc_apply(xf86CrtcPtr crtc)
} else
ret = TRUE;
  
@@ -52,6 +52,3 @@ index d32224e..d9c4b5b 100644
  }
  
  static Bool
--- 
-1.7.2.3
-

commit ac1906c9d9cf0c16b0471bcb20c1aae88340e00d
Author: Julien Cristau jcris...@debian.org
Date:   Mon Dec 6 10:25:57 2010 +0100

Fail intel_pci_probe if we don't have a kernel mode setting driver.

This allows the X server to fall back to the vesa driver instead.

diff --git a/debian/changelog b/debian/changelog
index a38ddfe..6ab6ff8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xserver-xorg-video-intel (2:2.13.0-4) UNRELEASED; urgency=low
+
+  * Fail intel_pci_probe if we don't have a kernel mode setting driver.  This
+allows the X server to fall back to the vesa driver instead.
+
+ -- Julien Cristau jcris...@debian.org  Mon, 06 Dec 2010 10:22:35 +0100
+
 xserver-xorg-video-intel (2:2.13.0-3) unstable; urgency=low
 
   [ Julien Cristau ]
diff --git a/debian/patches/fail-probe-if-no-kms.diff 
b/debian/patches/fail-probe-if-no-kms.diff
new file mode 100644
index 000..c88f9cb
--- /dev/null
+++ b/debian/patches/fail-probe-if-no-kms.diff
@@ -0,0 +1,40 @@
+From a2b44cc8d4a9182becaaa00eda1ad3adcea92ee3 Mon Sep 17 00:00:00 2001
+From: Julien Cristau jcris...@debian.org
+Date: Thu, 23 Sep 2010 17:17:05 +0200
+Subject: [PATCH] intel_pci_probe: bail if there's no KMS
+
+This allows fallback to vesa when there's no kernel driver bound to the
+intel pci device.
+---
+ src/intel_module.c |   11 +++
+ 1 files changed, 11 insertions(+), 0 deletions(-)
+
+diff --git a/src/intel_module.c b/src/intel_module.c
+index 53e1cb6..7356ab8 100644
+--- a/src/intel_module.c
 b/src/intel_module.c
+@@ -374,6 +374,21 @@ static Bool intel_pci_probe (DriverPtrdriver,
+intptr_t   match_data)
+ {
+ ScrnInfoPtr scrn = NULL;
++if (!pci_device_has_kernel_driver(device))
++#if KMS_ONLY
++return FALSE;
++#else
++switch (DEVICE_ID(device)) {
++case PCI_CHIP_I810:
++case PCI_CHIP_I810_DC100:
++case PCI_CHIP_I810_E:
++case PCI_CHIP_I815:
++break;
++
++default:
++return FALSE;
++  }
++#endif
+ 
+ scrn = xf86ConfigPciEntity(scrn, 0, entity_num, intel_pci_chipsets,
+  NULL,
+-- 
+1.7.1
+
diff --git a/debian/patches/series b/debian/patches/series
index 7732e96..ed16c3f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 i8xx-shadow.diff
 libdrm-from-sid-is-ok.diff
 revert-display-outputs-are-enabled-automatically.diff
+fail-probe-if-no-kms.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/e1ppxnd-0005ol...@alioth.debian.org

xserver-xorg-video-intel: Changes to 'debian-unstable'

[Cyril Brulebois]

 debian/changelog|   10 --
 src/intel_batchbuffer.c |3 +++
 src/intel_display.c |2 ++
 3 files changed, 13 insertions(+), 2 deletions(-)

New commits:
commit b9c7d6dbe0e9bb0d357bce7ed6e43da98e82f49d
Author: Cyril Brulebois k...@debian.org
Date:   Mon Dec 6 04:05:16 2010 +0100

Upload to unstable.

diff --git a/debian/changelog b/debian/changelog
index b332a33..a38ddfe 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xserver-xorg-video-intel (2:2.13.0-3) UNRELEASED; urgency=low
+xserver-xorg-video-intel (2:2.13.0-3) unstable; urgency=low
 
   [ Julien Cristau ]
   * Revert display: outputs are enabled automatically by KMS.
@@ -9,7 +9,7 @@ xserver-xorg-video-intel (2:2.13.0-3) UNRELEASED; urgency=low
 + a44a63d2: Wait for any pending rendering before switching modes.
   Hopefully we should get rid of a number of GPU hangs.
 
- -- Julien Cristau jcris...@debian.org  Mon, 15 Nov 2010 17:11:30 +0100
+ -- Cyril Brulebois k...@debian.org  Mon, 06 Dec 2010 04:05:07 +0100
 
 xserver-xorg-video-intel (2:2.13.0-2) unstable; urgency=low
 

commit 5c087e00e3bd804281bcd355f8f8dec6cfcf3c44
Author: Cyril Brulebois k...@debian.org
Date:   Mon Dec 6 04:03:39 2010 +0100

Document the cherry-pick of a44a63d2.

That is: Wait for any pending rendering before switching modes.
Hopefully we should get rid of a number of GPU hangs.

diff --git a/debian/changelog b/debian/changelog
index d044a25..b332a33 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,14 @@
 xserver-xorg-video-intel (2:2.13.0-3) UNRELEASED; urgency=low
 
+  [ Julien Cristau ]
   * Revert display: outputs are enabled automatically by KMS.
 Closes: #600405.
 
+  [ Cyril Brulebois ]
+  * Cherry-pick from upstream:
++ a44a63d2: Wait for any pending rendering before switching modes.
+  Hopefully we should get rid of a number of GPU hangs.
+
  -- Julien Cristau jcris...@debian.org  Mon, 15 Nov 2010 17:11:30 +0100
 
 xserver-xorg-video-intel (2:2.13.0-2) unstable; urgency=low

commit 596f85ad9a93045dfdb051a2556b7b741e4ead86
Author: Chris Wilson ch...@chris-wilson.co.uk
Date:   Fri Nov 5 09:58:45 2010 +

Wait for any pending rendering before switching modes.

A perennial problem we have is the accursed WAIT_FOR_EVENT hangs, which
occur when we switch the framebuffer before the WAIT_FOR_EVENT completes
and upsets the GPU.

We have tried more subtle approaches to detected these and fix them up in
the kernel, to no avail. What we need to do is to delay the framebuffer
flip until the WAIT completes, which is quite tricky in the kernel
without new ioctls and round-trips. Instead, apply the big hammer from
userspace and synchronise all rendering before changing the framebuffer.
I expect this not to cause noticeable latency on switching modes (far
less than the actual modeswitch) and should stop these hangs once and
for all.

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=31401 (...)
Signed-off-by: Chris Wilson ch...@chris-wilson.co.uk
(cherry picked from commit a44a63d2ff6c01c3dc61de6f736dd441ddd25e52)

diff --git a/src/intel_batchbuffer.c b/src/intel_batchbuffer.c
index a4802d0..cb1c5f2 100644
--- a/src/intel_batchbuffer.c
+++ b/src/intel_batchbuffer.c
@@ -261,6 +261,9 @@ void intel_batch_wait_last(ScrnInfoPtr scrn)
 {
intel_screen_private *intel = intel_get_screen_private(scrn);
 
+   if (intel-last_batch_bo == NULL)
+   return;
+
/* Map it CPU write, which guarantees it's done.  This is a completely
 * non performance path, so we don't need anything better.
 */
diff --git a/src/intel_display.c b/src/intel_display.c
index d32224e..7eef80b 100644
--- a/src/intel_display.c
+++ b/src/intel_display.c
@@ -359,6 +359,8 @@ intel_crtc_apply(xf86CrtcPtr crtc)
   crtc-gamma_blue, crtc-gamma_size);
 #endif
 
+   /* drain any pending waits on the current framebuffer */
+   intel_batch_wait_last(crtc-scrn);
 
x = crtc-x;
y = crtc-y;


-- 
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/e1pprlu-0001cw...@alioth.debian.org

xserver-xorg-video-intel: Changes to 'debian-unstable'

[Julien Cristau]

 debian/changelog |7 +
 debian/patches/revert-display-outputs-are-enabled-automatically.diff |   57 
++
 debian/patches/series|1 
 3 files changed, 65 insertions(+)

New commits:
commit 2e37d6f4183f695386ded784720870a9598d3825
Author: Julien Cristau jcris...@debian.org
Date:   Mon Nov 15 17:12:57 2010 +0100

Revert display: outputs are enabled automatically by KMS.

Closes: #600405.

diff --git a/debian/changelog b/debian/changelog
index 1dc1036..d044a25 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xserver-xorg-video-intel (2:2.13.0-3) UNRELEASED; urgency=low
+
+  * Revert display: outputs are enabled automatically by KMS.
+Closes: #600405.
+
+ -- Julien Cristau jcris...@debian.org  Mon, 15 Nov 2010 17:11:30 +0100
+
 xserver-xorg-video-intel (2:2.13.0-2) unstable; urgency=low
 
   [ Cyril Brulebois ]
diff --git 
a/debian/patches/revert-display-outputs-are-enabled-automatically.diff 
b/debian/patches/revert-display-outputs-are-enabled-automatically.diff
new file mode 100644
index 000..497ca29
--- /dev/null
+++ b/debian/patches/revert-display-outputs-are-enabled-automatically.diff
@@ -0,0 +1,57 @@
+From a04411f8a00bb111612e48859140612ce2ed0289 Mon Sep 17 00:00:00 2001
+From: Julien Cristau jcris...@debian.org
+Date: Mon, 15 Nov 2010 17:09:07 +0100
+Subject: [PATCH] Revert display: outputs are enabled automatically by KMS
+
+This reverts commit 19c48d3b3f33582baa87a9b3a9189e320e4cea45.
+
+Turns out they aren't, and this resets the backlight to 0 on a mode
+switch.  Debian bug#600405.
+---
+ src/intel_display.c |   16 ++--
+ 1 files changed, 14 insertions(+), 2 deletions(-)
+
+diff --git a/src/intel_display.c b/src/intel_display.c
+index d32224e..d9c4b5b 100644
+--- a/src/intel_display.c
 b/src/intel_display.c
+@@ -327,7 +327,7 @@ intel_crtc_apply(xf86CrtcPtr crtc)
+   uint32_t *output_ids;
+   int output_count = 0;
+   int fb_id, x, y;
+-  int i, ret = FALSE;
++  int i, ret;
+ 
+   output_ids = calloc(sizeof(uint32_t), xf86_config-num_output);
+   if (!output_ids)
+@@ -378,14 +378,26 @@ intel_crtc_apply(xf86CrtcPtr crtc)
+   } else
+   ret = TRUE;
+ 
++  /* Turn on any outputs on this crtc that may have been disabled */
++  for (i = 0; i  xf86_config-num_output; i++) {
++  xf86OutputPtr output = xf86_config-output[i];
++
++  if (output-crtc != crtc)
++  continue;
++
++  intel_output_dpms(output, DPMSModeOn);
++  }
++
+   intel_set_gem_max_sizes(scrn);
+ 
+   if (scrn-pScreen)
+   xf86_reload_cursors(scrn-pScreen);
+ 
++  return ret;
++
+ done:
+   free(output_ids);
+-  return ret;
++  return FALSE;
+ }
+ 
+ static Bool
+-- 
+1.7.2.3
+
diff --git a/debian/patches/series b/debian/patches/series
index 6f457c7..7732e96 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 i8xx-shadow.diff
 libdrm-from-sid-is-ok.diff
+revert-display-outputs-are-enabled-automatically.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/e1pi1gv-0001gv...@alioth.debian.org

xserver-xorg-video-intel: Changes to 'debian-unstable'

[Cyril Brulebois]

 ChangeLog |  113 
 NEWS  |  117 +-
 configure.ac  |4 -
 debian/README.Debian  |   13 +++
 debian/changelog  |   29 ++-
 debian/control|4 -
 debian/patches/libdrm-from-sid-is-ok.diff |   11 ++
 debian/patches/series |2 
 debian/patches/shadow-no-dri2.diff|   33 
 src/i915_render.c |4 +
 src/i965_render.c |4 +
 src/intel_display.c   |   14 ++-
 src/intel_dri.c   |   12 +++
 src/intel_driver.c|  107 +--
 src/intel_memory.c|4 +
 src/intel_video.c |   10 ++
 uxa/uxa-accel.c   |2 
 uxa/uxa-render.c  |8 ++
 18 files changed, 388 insertions(+), 103 deletions(-)

New commits:
commit 8ecc8dc2767e1a25fd7453152ec822f7b3a386d1
Author: Cyril Brulebois k...@debian.org
Date:   Sun Nov 7 19:03:06 2010 +0100

Drop shadow-no-dri2.diff, obsoleted by upstream's 537e73f3.

diff --git a/debian/changelog b/debian/changelog
index a660d38..26a1ccc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,7 @@ xserver-xorg-video-intel (2:2.13.0-2) UNRELEASED; urgency=low
   * Add patch to make configure.ac happy: libdrm-from-sid-is-ok.diff
   * Add README.Debian documenting the need for a kernel driver to handle
 modesetting.
+  * Drop shadow-no-dri2.diff, obsoleted by upstream's 537e73f3.
 
  -- Cyril Brulebois k...@debian.org  Mon, 01 Nov 2010 20:54:43 +0100
 
diff --git a/debian/patches/series b/debian/patches/series
index 5a18fb8..6f457c7 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
-shadow-no-dri2.diff
 i8xx-shadow.diff
 libdrm-from-sid-is-ok.diff
diff --git a/debian/patches/shadow-no-dri2.diff 
b/debian/patches/shadow-no-dri2.diff
deleted file mode 100644
index ba8a4d6..000
--- a/debian/patches/shadow-no-dri2.diff
+++ /dev/null
@@ -1,33 +0,0 @@
-Index: xserver-xorg-video-intel/src/intel_driver.c
-===
 xserver-xorg-video-intel.orig/src/intel_driver.c
-+++ xserver-xorg-video-intel/src/intel_driver.c
-@@ -830,12 +830,6 @@
- 
-   scrn-videoRam = device-regions[fb_bar].size / 1024;
- 
--#ifdef DRI2
--  if (intel-directRenderingType == DRI_NONE
--   I830DRI2ScreenInit(screen))
--  intel-directRenderingType = DRI_DRI2;
--#endif
--
-   intel-force_fallback = FALSE;
-   intel-use_shadow = FALSE;
- 
-@@ -859,8 +853,15 @@
-   xf86DrvMsg(scrn-scrnIndex, X_CONFIG,
-  Shadow buffer enabled,
-   GPU acceleration disabled.\n);
-+  intel-directRenderingType = DRI_DISABLED;
-   }
- 
-+#ifdef DRI2
-+  if (intel-directRenderingType == DRI_NONE
-+   I830DRI2ScreenInit(screen))
-+  intel-directRenderingType = DRI_DRI2;
-+#endif
-+
-   /* SwapBuffers delays to avoid tearing */
-   intel-swapbuffers_wait = TRUE;
- 

commit 78bef551d778e6230e412709e5b2d66457b5ebad
Author: Cyril Brulebois k...@debian.org
Date:   Mon Nov 1 20:59:57 2010 +0100

Add README.Debian, documenting KMS stuff.

diff --git a/debian/README.Debian b/debian/README.Debian
new file mode 100644
index 000..3c74081
--- /dev/null
+++ b/debian/README.Debian
@@ -0,0 +1,13 @@
+xserver-xorg-video-intel (2:2.13.0-2) UNRELEASED; urgency=low
+
+  * Starting from 2.10, the Intel X driver depends on a kernel driver for
+mode setting (that's called KMS). The corresponding kernel option is
+CONFIG_DRM_I915, and is enabled in Debian kernels.
+  * To enable KMS, either of those should be sufficient:
+ + /etc/modprobe.d/i915-kms.conf should contain:
+ options i915 modeset=1
+ + CONFIG_DRM_I915_KMS=y should be set in the kernel config.
+  * If you have issues with this driver, the vesa or fbdev drivers
+may be useful fallbacks.
+
+ -- Cyril Brulebois k...@debian.org  Mon, 01 Nov 2010 19:21:33 +0100
diff --git a/debian/changelog b/debian/changelog
index 2634e48..a660d38 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,8 @@ xserver-xorg-video-intel (2:2.13.0-2) UNRELEASED; urgency=low
 the latter contains the needed bits, making it possible to build
 within unstable.
   * Add patch to make configure.ac happy: libdrm-from-sid-is-ok.diff
+  * Add README.Debian documenting the need for a kernel driver to handle
+modesetting.
 
  -- Cyril Brulebois k...@debian.org  Mon, 01 Nov 2010 20:54:43 +0100
 

commit a766b36e6afaf259ea4bc2d70a7dad35313558a6
Author: Cyril Brulebois k...@debian.org
Date:   Mon Nov 1 20:59:09 2010 +0100

Add patch to make configure.ac happy: 

xserver-xorg-video-intel: Changes to 'debian-unstable'

[Julien Cristau]

 debian/changelog|4 
 debian/patches/i8xx-shadow.diff |   20 ++--
 2 files changed, 14 insertions(+), 10 deletions(-)

New commits:
commit e2d73c8e7ae324431eccbf90cfb80feeaf286f50
Author: Julien Cristau jcris...@debian.org
Date:   Sun Nov 7 19:46:28 2010 +0100

Update i8xx-shadow.diff.

diff --git a/debian/changelog b/debian/changelog
index 26a1ccc..98552e9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
 xserver-xorg-video-intel (2:2.13.0-2) UNRELEASED; urgency=low
 
+  [ Cyril Brulebois ]
   * Merge from experimental.
   * Lower build-dep on libdrm-dev from 2.4.22 to 2.4.21-1~squeeze3 since
 the latter contains the needed bits, making it possible to build
@@ -9,6 +10,9 @@ xserver-xorg-video-intel (2:2.13.0-2) UNRELEASED; urgency=low
 modesetting.
   * Drop shadow-no-dri2.diff, obsoleted by upstream's 537e73f3.
 
+  [ Julien Cristau ]
+  * Update i8xx-shadow.diff.
+
  -- Cyril Brulebois k...@debian.org  Mon, 01 Nov 2010 20:54:43 +0100
 
 xserver-xorg-video-intel (2:2.13.0-1) experimental; urgency=low
diff --git a/debian/patches/i8xx-shadow.diff b/debian/patches/i8xx-shadow.diff
index c152a79..c6df25c 100644
--- a/debian/patches/i8xx-shadow.diff
+++ b/debian/patches/i8xx-shadow.diff
@@ -2,17 +2,15 @@ Index: xserver-xorg-video-intel/src/intel_driver.c
 ===
 --- xserver-xorg-video-intel.orig/src/intel_driver.c
 +++ xserver-xorg-video-intel/src/intel_driver.c
-@@ -830,9 +830,6 @@
+@@ -595,7 +595,6 @@
  
-   scrn-videoRam = device-regions[fb_bar].size / 1024;
- 
--  intel-force_fallback = FALSE;
+   intel-force_fallback =
+   drmCommandNone(intel-drmSubFD, DRM_I915_GEM_THROTTLE) != 0;
 -  intel-use_shadow = FALSE;
--
+ 
/* Enable tiling by default */
intel-tiling = TRUE;
- 
-@@ -844,13 +841,12 @@
+@@ -608,15 +607,13 @@
intel-tiling = FALSE;
}
  
@@ -20,13 +18,15 @@ Index: xserver-xorg-video-intel/src/intel_driver.c
 -  if (xf86ReturnOptValBool(intel-Options, OPTION_SHADOW, FALSE))
 -  intel-force_fallback = intel-use_shadow = TRUE;
 -  }
+-
 +  intel-use_shadow = xf86ReturnOptValBool(intel-Options, OPTION_SHADOW, 
IS_I8XX(intel));
-+  intel-force_fallback = intel-use_shadow;
- 
if (intel-use_shadow) {
 -  xf86DrvMsg(scrn-scrnIndex, X_CONFIG,
 +  xf86DrvMsg(scrn-scrnIndex,
 + xf86IsOptionSet(intel-Options, OPTION_SHADOW) ? 
X_CONFIG : X_DEFAULT,
   Shadow buffer enabled,
GPU acceleration disabled.\n);
-   intel-directRenderingType = DRI_DISABLED;
++  intel-force_fallback = TRUE;
+   }
+ 
+   /* SwapBuffers delays to avoid tearing */


-- 
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/e1pfaia-00019t...@alioth.debian.org

xserver-xorg-video-intel: Changes to 'debian-unstable'

[Cyril Brulebois]

 debian/README.Debian |4 ++--
 debian/changelog |4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit b9220ffb881447c11f4d53535e1150eea7e92e00
Author: Cyril Brulebois k...@debian.org
Date:   Sun Nov 7 19:52:27 2010 +0100

Upload to unstable.

diff --git a/debian/README.Debian b/debian/README.Debian
index 3c74081..cb6a206 100644
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -1,4 +1,4 @@
-xserver-xorg-video-intel (2:2.13.0-2) UNRELEASED; urgency=low
+xserver-xorg-video-intel (2:2.13.0-2) unstable; urgency=low
 
   * Starting from 2.10, the Intel X driver depends on a kernel driver for
 mode setting (that's called KMS). The corresponding kernel option is
@@ -10,4 +10,4 @@ xserver-xorg-video-intel (2:2.13.0-2) UNRELEASED; urgency=low
   * If you have issues with this driver, the vesa or fbdev drivers
 may be useful fallbacks.
 
- -- Cyril Brulebois k...@debian.org  Mon, 01 Nov 2010 19:21:33 +0100
+ -- Cyril Brulebois k...@debian.org  Sun, 07 Nov 2010 19:51:56 +0100
diff --git a/debian/changelog b/debian/changelog
index 98552e9..1dc1036 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xserver-xorg-video-intel (2:2.13.0-2) UNRELEASED; urgency=low
+xserver-xorg-video-intel (2:2.13.0-2) unstable; urgency=low
 
   [ Cyril Brulebois ]
   * Merge from experimental.
@@ -13,7 +13,7 @@ xserver-xorg-video-intel (2:2.13.0-2) UNRELEASED; urgency=low
   [ Julien Cristau ]
   * Update i8xx-shadow.diff.
 
- -- Cyril Brulebois k...@debian.org  Mon, 01 Nov 2010 20:54:43 +0100
+ -- Cyril Brulebois k...@debian.org  Sun, 07 Nov 2010 19:51:56 +0100
 
 xserver-xorg-video-intel (2:2.13.0-1) experimental; 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/e1pfakz-0001ht...@alioth.debian.org

xserver-xorg-video-intel: Changes to 'debian-unstable'

[Julien Cristau]

 debian/changelog|7 +++
 src/intel_display.c |6 +-
 2 files changed, 12 insertions(+), 1 deletion(-)

New commits:
commit c2636a1b8c2cfa889860a4e3f947348f3529c3fc
Author: Julien Cristau jcris...@debian.org
Date:   Sun Oct 17 11:15:30 2010 +0200

Add changelog entry

diff --git a/debian/changelog b/debian/changelog
index 506734d..9c87668 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xserver-xorg-video-intel (2:2.12.0+shadow-3) UNRELEASED; urgency=low
+
+  * Cherry-pick: display: do not report failure for setting unrecognised
+properties.  This unbreaks EDID reporting.
+
+ -- Julien Cristau jcris...@debian.org  Sun, 17 Oct 2010 11:14:48 +0200
+
 xserver-xorg-video-intel (2:2.12.0+shadow-2) unstable; urgency=low
 
   * UMS is gone, this means Linux-only (closes: 597845).

commit 63d58e20b0ede39816daaa8696fa6a4223b12b8e
Author: Chris Wilson ch...@chris-wilson.co.uk
Date:   Sun Oct 17 09:21:06 2010 +0100

display: do not report failure for setting unrecognised properties

We need to accept any changes to properties not handled by ourselves -- we
can't validate the changes ourselves. Denying those changes breaks EDID
reporting, for example.

Reported-by: Elvis Pranskevichus e...@prans.net
Signed-off-by: Chris Wilson ch...@chris-wilson.co.uk
(cherry picked from commit 33133a1d38a4dce60d2e135663b545895fc85abc)

diff --git a/src/intel_display.c b/src/intel_display.c
index 5d85baa..780b204 100644
--- a/src/intel_display.c
+++ b/src/intel_display.c
@@ -1155,7 +1155,11 @@ intel_output_set_property(xf86OutputPtr output, Atom 
property,
}
}
 
-   return FALSE;
+   /* We didn't recognise this property, just report success in order
+* to allow the set to continue, otherwise we break setting of
+* common properties like EDID.
+*/
+   return TRUE;
 }
 
 static Bool


-- 
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/e1p7plx-000320...@alioth.debian.org

xserver-xorg-video-intel: Changes to 'debian-unstable'

[Julien Cristau]

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

New commits:
commit 2586daf3f7e86c1857ab426f98e0ae4045c9e239
Author: Julien Cristau jcris...@debian.org
Date:   Thu Sep 23 16:40:47 2010 +0200

UMS is gone, this means Linux-only (closes: 597845).

diff --git a/debian/changelog b/debian/changelog
index a3b51c4..506734d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-video-intel (2:2.12.0+shadow-2) unstable; urgency=low
+
+  * UMS is gone, this means Linux-only (closes: 597845).
+
+ -- Julien Cristau jcris...@debian.org  Thu, 23 Sep 2010 16:40:26 +0200
+
 xserver-xorg-video-intel (2:2.12.0+shadow-1) unstable; urgency=low
 
   * Revert the come-back of UMS.  Update to upstream HEAD instead.
diff --git a/debian/control b/debian/control
index d06a49c..b09631c 100644
--- a/debian/control
+++ b/debian/control
@@ -39,7 +39,7 @@ Vcs-Git: 
git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-video-intel
 Vcs-Browser: 
http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-video-intel.git
 
 Package: xserver-xorg-video-intel
-Architecture: amd64 hurd-i386 i386 kfreebsd-i386 kfreebsd-amd64 netbsd-i386
+Architecture: amd64 i386
 Depends: ${shlibs:Depends}, ${misc:Depends}, ${xviddriver:Depends}
 Provides: ${xviddriver:Provides}
 Replaces: xserver-xorg ( 6.8.2-35), xserver-xorg-video-i810 ( 2:1.9.91-1), 
xserver-xorg-video-i810-modesetting, xserver-xorg-video-intel-modesetting, 
xserver-xorg-driver-i810
@@ -58,7 +58,7 @@ Description: X.Org X server -- Intel i8xx, i9xx display driver
  This package is built from the X.org xf86-video-intel driver module.
 
 Package: xserver-xorg-video-intel-dbg
-Architecture: amd64 hurd-i386 i386 kfreebsd-i386 kfreebsd-amd64 netbsd-i386
+Architecture: amd64 i386
 Depends: xserver-xorg-video-intel (= ${binary:Version}), ${shlibs:Depends}
 Recommends: intel-gpu-tools
 Section: debug


-- 
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/e1oyonq-0001ua...@alioth.debian.org

xserver-xorg-video-intel: Changes to 'debian-unstable'

[Julien Cristau]

 ChangeLog   |  817 ++
 configure.ac|  136 
 debian/changelog|   14 
 debian/control  |2 
 debian/patches/i8xx-shadow.diff |   32 
 debian/patches/series   |2 
 debian/patches/shadow-no-dri2.diff  |   33 
 man/Makefile.am |   17 
 man/intel.man   |   14 
 src/Makefile.am |8 
 src/common.h|4 
 src/drmmode_display.c   | 1536 -
 src/i830_render.c   |1 
 src/i915_video.c|7 
 src/intel.h |   58 
 src/intel_batchbuffer.h |3 
 src/intel_display.c | 1611 +
 src/intel_dri.c |   35 
 src/intel_driver.c  |  211 
 src/intel_driver.h  |   34 
 src/intel_memory.c  |8 
 src/intel_module.c  |   65 
 src/intel_transform.c   |   92 
 src/intel_transform.h   |   14 
 src/intel_uxa.c |  375 +
 src/intel_video.c   |  227 
 src/intel_video.h   |3 
 src/legacy/Makefile.am  |3 
 src/legacy/i810/i810.h  |6 
 src/legacy/i810/i810_accel.c|6 
 src/legacy/i810/i810_common.h   |6 
 src/legacy/i810/i810_dri.c  |  128 
 src/legacy/i810/i810_driver.c   |   45 
 src/legacy/i810/i810_video.c|   18 
 src/legacy/i810/xvmc/Makefile.am|4 
 src/legacy/legacy.h |8 
 src/legacy/ums/Makefile.am  |  161 
 src/legacy/ums/brw_defines.h|  874 ---
 src/legacy/ums/brw_structs.h| 1469 -
 src/legacy/ums/ch7017/Makefile.am   |   10 
 src/legacy/ums/ch7017/ch7017.c  |  324 -
 src/legacy/ums/ch7017/ch7017_module.c   |   36 
 src/legacy/ums/ch7017/ch7017_reg.h  |  162 
 src/legacy/ums/ch7xxx/Makefile.am   |   11 
 src/legacy/ums/ch7xxx/ch7xxx.c  |  317 -
 src/legacy/ums/ch7xxx/ch7xxx.h  |   31 
 src/legacy/ums/ch7xxx/ch7xxx_module.c   |   35 
 src/legacy/ums/ch7xxx/ch7xxx_reg.h  |   80 
 src/legacy/ums/ivch/Makefile.am |   10 
 src/legacy/ums/ivch/ivch.c  |  368 -
 src/legacy/ums/ivch/ivch_module.c   |   64 
 src/legacy/ums/ivch/ivch_reg.h  |  291 -
 src/legacy/ums/render_programs/exa_sf.g4a   |  107 
 src/legacy/ums/render_programs/exa_sf.g4b   |   15 
 src/legacy/ums/render_programs/exa_sf_mask.g4a  |  107 
 src/legacy/ums/render_programs/exa_sf_mask.g4b  |   15 
 src/legacy/ums/render_programs/exa_wm.g4i   |  156 
 src/legacy/ums/render_programs/exa_wm_affine.g4i|   44 
 src/legacy/ums/render_programs/exa_wm_ca.g4a|   38 
 src/legacy/ums/render_programs/exa_wm_ca.g4b|4 
 src/legacy/ums/render_programs/exa_wm_ca_srcalpha.g4a   |   37 
 src/legacy/ums/render_programs/exa_wm_ca_srcalpha.g4b   |4 
 src/legacy/ums/render_programs/exa_wm_mask_affine.g4a   |   41 
 src/legacy/ums/render_programs/exa_wm_mask_affine.g4b   |8 
 src/legacy/ums/render_programs/exa_wm_mask_projective.g4a   |   53 
 src/legacy/ums/render_programs/exa_wm_mask_projective.g4b   |   16 
 src/legacy/ums/render_programs/exa_wm_mask_sample_a.g4a |   48 
 src/legacy/ums/render_programs/exa_wm_mask_sample_a.g4b |2 
 src/legacy/ums/render_programs/exa_wm_mask_sample_argb.g4a  |   48 
 src/legacy/ums/render_programs/exa_wm_mask_sample_argb.g4b  |2 
 src/legacy/ums/render_programs/exa_wm_noca.g4a  |   38 
 src/legacy/ums/render_programs/exa_wm_noca.g4b  |4 
 

xserver-xorg-video-intel: Changes to 'debian-unstable'

[Julien Cristau]

 debian/patches/i8xx-shadow.diff|2 +-
 debian/patches/shadow-no-dri2.diff |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit a4e5ae6ba5724c4b14dca3fe5164c5de19ff2640
Author: Julien Cristau jcris...@debian.org
Date:   Mon Sep 20 19:35:23 2010 +0200

Fix stupid typo

diff --git a/debian/patches/i8xx-shadow.diff b/debian/patches/i8xx-shadow.diff
index 74788db..c152a79 100644
--- a/debian/patches/i8xx-shadow.diff
+++ b/debian/patches/i8xx-shadow.diff
@@ -29,4 +29,4 @@ Index: xserver-xorg-video-intel/src/intel_driver.c
 + xf86IsOptionSet(intel-Options, OPTION_SHADOW) ? 
X_CONFIG : X_DEFAULT,
   Shadow buffer enabled,
GPU acceleration disabled.\n);
-   intel-directRenderingType == DRI_DISABLED;
+   intel-directRenderingType = DRI_DISABLED;
diff --git a/debian/patches/shadow-no-dri2.diff 
b/debian/patches/shadow-no-dri2.diff
index f135106..ba8a4d6 100644
--- a/debian/patches/shadow-no-dri2.diff
+++ b/debian/patches/shadow-no-dri2.diff
@@ -19,7 +19,7 @@ Index: xserver-xorg-video-intel/src/intel_driver.c
xf86DrvMsg(scrn-scrnIndex, X_CONFIG,
   Shadow buffer enabled,
GPU acceleration disabled.\n);
-+  intel-directRenderingType == DRI_DISABLED;
++  intel-directRenderingType = DRI_DISABLED;
}
  
 +#ifdef DRI2


-- 
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/e1oxklg-0006m7...@alioth.debian.org

xserver-xorg-video-intel: Changes to 'debian-unstable'

[Julien Cristau]

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

New commits:
commit 7997f9a03e831e1182c5b575e1bc6018a4d59885
Author: Julien Cristau jcris...@debian.org
Date:   Mon Sep 20 19:47:25 2010 +0200

Upload to unstable

diff --git a/debian/changelog b/debian/changelog
index 9eb0b7d..a3b51c4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xserver-xorg-video-intel (2:2.12.0+shadow-1) UNRELEASED; urgency=low
+xserver-xorg-video-intel (2:2.12.0+shadow-1) unstable; urgency=low
 
   * Revert the come-back of UMS.  Update to upstream HEAD instead.
 Closes: #594623, #594338.
@@ -10,7 +10,7 @@ xserver-xorg-video-intel (2:2.12.0+shadow-1) UNRELEASED; 
urgency=low
 #576848, #592586, #593293.
   * New upstream doesn't assert() when running sm (closes: #593199).
 
- -- Julien Cristau jcris...@debian.org  Mon, 20 Sep 2010 16:31:16 +0200
+ -- Julien Cristau jcris...@debian.org  Mon, 20 Sep 2010 19:44:14 +0200
 
 xserver-xorg-video-intel (2:2.12.0+legacy1-1) unstable; 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/e1oxkdg-0001ip...@alioth.debian.org

xserver-xorg-video-intel: Changes to 'debian-unstable'

[Julien Cristau]

 .gitignore  |   83 
 COPYING |  169 
 ChangeLog   | 5983 +++-
 Makefile.am |   14 
 NEWS|  356 
 README  |2 
 configure.ac|  161 
 debian/changelog|   47 
 debian/control  |   11 
 debian/copyright|   37 
 debian/rules|2 
 debian/xserver-xorg-video-intel-dbg.install |1 
 m4/dolt.m4  |  178 
 m4/shave.m4 |   73 
 man/Makefile.am |   41 
 man/intel.man   |  257 
 shave-libtool.in|   69 
 shave.in|   76 
 src/.gitignore  |6 
 src/Makefile.am |  102 
 src/bios_reader/.gitignore  |3 
 src/bios_reader/Makefile.am |   16 
 src/bios_reader/bios_dumper.c   |  104 
 src/bios_reader/bios_reader.c   |  565 -
 src/bios_reader/swf_dumper.c|  110 
 src/ch7017/Makefile.am  |   16 
 src/ch7017/ch7017.c |  330 
 src/ch7017/ch7017_module.c  |   36 
 src/ch7017/ch7017_reg.h |  162 
 src/ch7xxx/Makefile.am  |   17 
 src/ch7xxx/ch7xxx.c |  323 
 src/ch7xxx/ch7xxx.h |   31 
 src/ch7xxx/ch7xxx_module.c  |   35 
 src/ch7xxx/ch7xxx_reg.h |   80 
 src/common.h|  240 
 src/drmmode_display.c   |  622 -
 src/i2c_vid.h   |  132 
 src/i810.h  |  341 
 src/i810_accel.c|  617 -
 src/i810_common.h   |  191 
 src/i810_cursor.c   |  266 
 src/i810_dga.c  |  282 
 src/i810_dri.c  | 1541 ---
 src/i810_dri.h  |  131 
 src/i810_driver.c   | 2430 
 src/i810_hwmc.c |  419 
 src/i810_io.c   |  133 
 src/i810_memory.c   |  428 
 src/i810_reg.h  | 3443 --
 src/i810_ring.h |   90 
 src/i810_video.c| 1424 --
 src/i810_wmark.c|  313 
 src/i830.h  |  986 -
 src/i830_3d.c   |  403 
 src/i830_accel.c|  237 
 src/i830_batchbuffer.c  |  241 
 src/i830_batchbuffer.h  |  167 
 src/i830_bios.c |  401 
 src/i830_bios.h |  632 -
 src/i830_common.h   |  241 
 src/i830_crt.c  |  557 -
 src/i830_cursor.c   |  307 
 src/i830_debug.c| 2540 -
 src/i830_debug.h|   34 
 src/i830_display.c  | 2367 
 src/i830_display.h  |   43 
 src/i830_dri.c  |  443 
 src/i830_dri.h  |   61 
 src/i830_driver.c   | 3220 --
 src/i830_dvo.c  |  521 -
 src/i830_hdmi.c |  368 
 src/i830_hwmc.c   

xserver-xorg-video-intel: Changes to 'debian-unstable'

[Julien Cristau]

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

New commits:
commit 205754a121a7a074110d625b5eb9036d32928ef3
Author: Julien Cristau jcris...@debian.org
Date:   Tue Aug 24 21:34:21 2010 +0200

Upload to unstable

diff --git a/debian/changelog b/debian/changelog
index ac8ad72..8dde421 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,10 @@
-xserver-xorg-video-intel (2:2.12.0+legacy1-1) UNRELEASED; urgency=low
+xserver-xorg-video-intel (2:2.12.0+legacy1-1) unstable; urgency=low
 
   * Merge from people.freedesktop.org/~ickle/xf86-video-intel:legacy.
 This reintroduces UMS and EXA for legacy chips, while allowing us to get
 the fixes and new hw support from 2.12.
 
- -- Julien Cristau jcris...@debian.org  Tue, 24 Aug 2010 17:41:52 +0200
+ -- Julien Cristau jcris...@debian.org  Tue, 24 Aug 2010 21:33:56 +0200
 
 xserver-xorg-video-intel (2:2.12.0-1) experimental; 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/e1onzlc-0002iu...@alioth.debian.org

xserver-xorg-video-intel: Changes to 'debian-unstable'

[Julien Cristau]

 debian/README.source  |2 +-
 debian/changelog  |6 ++
 debian/control|4 ++--
 debian/xsfbs/xsfbs.mk |   35 ++-
 4 files changed, 31 insertions(+), 16 deletions(-)

New commits:
commit cf06fdb5a2289239a5c68c36e5fc6915d3ac10cd
Author: Julien Cristau jcris...@debian.org
Date:   Fri May 14 17:44:48 2010 +0200

Prepare changelog for upload

diff --git a/debian/changelog b/debian/changelog
index 2c3327e..e07cd84 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,8 @@
-xserver-xorg-video-intel (2:2.9.1-4) UNRELEASED; urgency=low
+xserver-xorg-video-intel (2:2.9.1-4) unstable; urgency=medium
 
   * Update xsfbs, use new ${xviddriver:Depends} subsvar.
 
- -- Julien Cristau jcris...@debian.org  Fri, 14 May 2010 17:44:25 +0200
+ -- Julien Cristau jcris...@debian.org  Fri, 14 May 2010 17:44:44 +0200
 
 xserver-xorg-video-intel (2:2.9.1-3) unstable; urgency=low
 

commit eac1fb8cf18453352259beb9733d5f09d9bb686a
Author: Julien Cristau jcris...@debian.org
Date:   Fri May 14 17:44:37 2010 +0200

Update xsfbs, use new ${xviddriver:Depends} subsvar.

diff --git a/debian/changelog b/debian/changelog
index 8e04679..2c3327e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-video-intel (2:2.9.1-4) UNRELEASED; urgency=low
+
+  * Update xsfbs, use new ${xviddriver:Depends} subsvar.
+
+ -- Julien Cristau jcris...@debian.org  Fri, 14 May 2010 17:44:25 +0200
+
 xserver-xorg-video-intel (2:2.9.1-3) unstable; urgency=low
 
   [ Julien Cristau ]
diff --git a/debian/control b/debian/control
index b0c3f56..938ac34 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,7 @@ Uploaders: David Nusinow dnusi...@debian.org, Drew Parsons 
dpars...@debian.or
 Build-Depends:
  debhelper (= 5),
  pkg-config,
- xserver-xorg-dev (= 2:1.7),
+ xserver-xorg-dev (= 2:1.7.6.901),
  x11proto-core-dev,
  x11proto-fonts-dev,
  x11proto-xinerama-dev,
@@ -37,7 +37,7 @@ Vcs-Browser: 
http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-video-intel.g
 
 Package: xserver-xorg-video-intel
 Architecture: amd64 hurd-i386 i386 kfreebsd-i386 kfreebsd-amd64 netbsd-i386
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${xserver:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${xviddriver:Depends}
 Provides: ${xviddriver:Provides}
 Replaces: xserver-xorg ( 6.8.2-35), xserver-xorg-video-i810 ( 2:1.9.91-1), 
xserver-xorg-video-i810-modesetting, xserver-xorg-video-intel-modesetting, 
xserver-xorg-driver-i810
 Conflicts: xserver-xorg-video-i810 ( 2:1.9.91-1), 
xserver-xorg-video-i810-modesetting, xserver-xorg-video-intel-modesetting, 
xserver-xorg-driver-i810, 915resolution

commit 81fc271788605b52e85c2d11635a0371fb44605e
Author: Cyril Brulebois k...@debian.org
Date:   Sun May 2 02:14:45 2010 +0200

Add xorg-driver-{video,input} to Provides.

diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk
index 77c4a39..3c59c20 100755
--- a/debian/xsfbs/xsfbs.mk
+++ b/debian/xsfbs/xsfbs.mk
@@ -261,8 +261,8 @@ INPUTDEP = $(shell cat /usr/share/xserver-xorg/xinputdep 
2/dev/null)
 # these two can be removed post-squeeze
 VIDEOABI = $(shell cat /usr/share/xserver-xorg/videoabiver 2/dev/null)
 INPUTABI = $(shell cat /usr/share/xserver-xorg/inputabiver 2/dev/null)
-VIDDRIVER_PROVIDES = xserver-xorg-video-$(VIDEOABI)
-INPDRIVER_PROVIDES = xserver-xorg-input-$(INPUTABI)
+VIDDRIVER_PROVIDES = xserver-xorg-video-$(VIDEOABI), xorg-driver-video
+INPDRIVER_PROVIDES = xserver-xorg-input-$(INPUTABI), xorg-driver-input
 
 ifeq ($(PACKAGE),)
 PACKAGE=$(shell awk '/^Package:/ { print $$2; exit }'  debian/control)

commit b045afbd8277ad0c44e29d7c45802053c4335ccd
Author: Julien Cristau jcris...@debian.org
Date:   Fri Apr 16 22:14:46 2010 +0200

Update serverabi rule for xserver 1.7.6.901

Add new variables ${xviddriver:Depends} and ${xinpdriver:Depends} for
drivers.  The ${xserver:Depends} variable is deprecated.

diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk
index 351fea5..77c4a39 100755
--- a/debian/xsfbs/xsfbs.mk
+++ b/debian/xsfbs/xsfbs.mk
@@ -253,25 +253,33 @@ $(STAMP_DIR)/genscripts: $(STAMP_DIR)/stampdir
#debian/*.prerm
$@
 
-SERVERMINVERS = $(shell cat /usr/share/xserver-xorg/serverminver 2/dev/null)
+# Compute dependencies for drivers
+#
+VIDEODEP = $(shell cat /usr/share/xserver-xorg/videodrvdep 2/dev/null)
+INPUTDEP = $(shell cat /usr/share/xserver-xorg/xinputdep 2/dev/null)
+
+# these two can be removed post-squeeze
 VIDEOABI = $(shell cat /usr/share/xserver-xorg/videoabiver 2/dev/null)
 INPUTABI = $(shell cat /usr/share/xserver-xorg/inputabiver 2/dev/null)
-SERVER_DEPENDS = xserver-xorg-core (= $(SERVERMINVERS))
 VIDDRIVER_PROVIDES = xserver-xorg-video-$(VIDEOABI)
 INPDRIVER_PROVIDES = xserver-xorg-input-$(INPUTABI)
+
 ifeq ($(PACKAGE),)
 PACKAGE=$(shell awk '/^Package:/ { print $$2; exit }'  debian/control)
 endif
 
 .PHONY: serverabi
 serverabi: install
-ifeq 

xserver-xorg-video-intel: Changes to 'debian-unstable'

[Mikhail Gusarov]

 debian/control |2 --
 1 file changed, 2 deletions(-)

New commits:
commit 3d431910362340771482a52b2e358ddf0f4af224
Author: Mikhail Gusarov dotted...@debian.org
Date:   Fri May 7 18:58:58 2010 +0700

Remove duplicate xorg.fd.o URL and confusing mailing list URL from 
debian/control

diff --git a/debian/control b/debian/control
index 52bd4e5..b0c3f56 100644
--- a/debian/control
+++ b/debian/control
@@ -51,8 +51,6 @@ Description: X.Org X server -- Intel i8xx, i9xx display driver
  .
  More information about X.Org can be found at:
  URL:http://www.X.org
- URL:http://xorg.freedesktop.org
- URL:http://lists.freedesktop.org/mailman/listinfo/xorg
  .
  This package is built from the X.org xf86-video-intel driver module.
 


-- 
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/e1oamoj-wh...@alioth.debian.org

xserver-xorg-video-intel: Changes to 'debian-unstable'

[Brice Goglin]

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

New commits:
commit 46cea29b03aaed697d9a53ed04ab365db121ebb4
Author: Brice Goglin bgog...@debian.org
Date:   Sun Mar 21 10:25:40 2010 +0100

Prepare changelog for upload

diff --git a/debian/changelog b/debian/changelog
index e77141f..8e04679 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xserver-xorg-video-intel (2:2.9.1-3) UNRELEASED; urgency=low
+xserver-xorg-video-intel (2:2.9.1-3) unstable; urgency=low
 
   [ Julien Cristau ]
   * Rename the build directory to not include DEB_BUILD_GNU_TYPE for no
@@ -11,7 +11,7 @@ xserver-xorg-video-intel (2:2.9.1-3) UNRELEASED; urgency=low
   [ Brice Goglin ]
   * Bump Standards-Version to 3.8.4, no changes.
 
- -- Julien Cristau jcris...@debian.org  Sat, 16 Jan 2010 16:47:17 +
+ -- Brice Goglin bgog...@debian.org  Sun, 21 Mar 2010 10:25:27 +0100
 
 xserver-xorg-video-intel (2:2.9.1-2) unstable; urgency=low
 

commit 355d3a86a8c3fc8adaea9fec5ae8ebb5d660a706
Author: Brice Goglin bgog...@debian.org
Date:   Sun Mar 21 10:25:25 2010 +0100

Bump Standards-Version to 3.8.4

diff --git a/debian/changelog b/debian/changelog
index 473b1d7..e77141f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
 xserver-xorg-video-intel (2:2.9.1-3) UNRELEASED; urgency=low
 
+  [ Julien Cristau ]
   * Rename the build directory to not include DEB_BUILD_GNU_TYPE for no
 good reason.  Thanks, Colin Watson!
   * Remove myself from Uploaders
@@ -7,6 +8,9 @@ xserver-xorg-video-intel (2:2.9.1-3) UNRELEASED; urgency=low
   * Backport KMS video overlay from upstream 2.10 (closes: #565328).
   * Bump libdrm-dev build-dep for the above.
 
+  [ Brice Goglin ]
+  * Bump Standards-Version to 3.8.4, no changes.
+
  -- Julien Cristau jcris...@debian.org  Sat, 16 Jan 2010 16:47:17 +
 
 xserver-xorg-video-intel (2:2.9.1-2) unstable; urgency=low
diff --git a/debian/control b/debian/control
index 40cc39e..52bd4e5 100644
--- a/debian/control
+++ b/debian/control
@@ -31,7 +31,7 @@ Build-Depends:
  automake,
  libtool,
  xutils-dev
-Standards-Version: 3.8.3
+Standards-Version: 3.8.4
 Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-video-intel
 Vcs-Browser: 
http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-video-intel.git
 


-- 
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/e1nthua-00064x...@alioth.debian.org

xserver-xorg-video-intel: Changes to 'debian-unstable'

[Julien Cristau]

 debian/changelog  |2 
 debian/control|2 
 src/drmmode_display.c |9 
 src/i830.h|3 
 src/i830_driver.c |2 
 src/i830_video.c  | 1505 +++---
 src/i830_video.h  |   20 
 src/i915_video.c  |   33 -
 src/i965_video.c  |   48 -
 9 files changed, 748 insertions(+), 876 deletions(-)

New commits:
commit cf2d7aa99f30737dbc15c385fbf6aa43d4f2b5b8
Author: Julien Cristau jcris...@debian.org
Date:   Wed Mar 17 20:10:15 2010 +0100

Bump libdrm-dev build-dep for the kms video overlay changes

diff --git a/debian/changelog b/debian/changelog
index a793d60..473b1d7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ xserver-xorg-video-intel (2:2.9.1-3) UNRELEASED; urgency=low
   * Remove myself from Uploaders
   * Add a NEWS.Debian entry about KMS.
   * Backport KMS video overlay from upstream 2.10 (closes: #565328).
+  * Bump libdrm-dev build-dep for the above.
 
  -- Julien Cristau jcris...@debian.org  Sat, 16 Jan 2010 16:47:17 +
 
diff --git a/debian/control b/debian/control
index e1f558e..40cc39e 100644
--- a/debian/control
+++ b/debian/control
@@ -15,7 +15,7 @@ Build-Depends:
  x11proto-xext-dev,
  x11proto-video-dev,
  libx11-dev,
- libdrm-dev (= 2.4.11),
+ libdrm-dev (= 2.4.18-3),
  x11proto-xf86dri-dev,
  x11proto-gl-dev,
  libgl1-mesa-dev | libgl-dev,

commit 2ae5615f76f255e34154953c1dabafc77b14eea4
Author: Julien Cristau jcris...@debian.org
Date:   Wed Mar 17 20:00:35 2010 +0100

Xv: enable drmmode overlay

Essentially the same as commit bd81734465912d79d6320a6fb021ce43d258b906
but that one doesn't cherry-pick cleanly.

diff --git a/src/i830_video.c b/src/i830_video.c
index a2c9a98..2084131 100644
--- a/src/i830_video.c
+++ b/src/i830_video.c
@@ -360,7 +360,6 @@ I830SetOneLineModeRatio(ScrnInfoPtr pScrn);
 static Bool
 drmmode_has_overlay(ScrnInfoPtr pScrn)
 {
-#ifdef DRM_MODE_OVERLAY_LANDED
 I830Ptr p830 = I830PTR(pScrn);
 struct drm_i915_getparam gp;
 int has_overlay = 0;
@@ -371,15 +370,11 @@ drmmode_has_overlay(ScrnInfoPtr pScrn)
  gp, sizeof(gp));
 
 return has_overlay ? TRUE : FALSE;
-#else
-return FALSE;
-#endif
 }
 
 static void
 drmmode_overlay_update_attrs(ScrnInfoPtr pScrn)
 {
-#ifdef DRM_MODE_OVERLAY_LANDED
 I830Ptr p830 = I830PTR(pScrn);
 I830PortPrivPtr pPriv = GET_PORT_PRIVATE(pScrn);
 struct drm_intel_overlay_attrs attrs;
@@ -402,13 +397,11 @@ drmmode_overlay_update_attrs(ScrnInfoPtr pScrn)
 
 if (ret != 0)
OVERLAY_DEBUG(overlay attrs ioctl failed: %i\n, ret);
-#endif
 }
 
 static void
 drmmode_overlay_off(ScrnInfoPtr pScrn)
 {
-#ifdef DRM_MODE_OVERLAY_LANDED
 I830Ptr p830 = I830PTR(pScrn);
 struct drm_intel_overlay_put_image request;
 int ret;
@@ -420,7 +413,6 @@ drmmode_overlay_off(ScrnInfoPtr pScrn)
 
 if (ret != 0)
OVERLAY_DEBUG(overlay switch-off ioctl failed: %i\n, ret);
-#endif
 }
 
 static Bool
@@ -429,7 +421,6 @@ drmmode_overlay_put_image(ScrnInfoPtr pScrn, xf86CrtcPtr 
crtc,
   int dstPitch, int x1, int y1, int x2, int y2, BoxPtr dstBox,
   short src_w, short src_h, short drw_w, short drw_h)
 {
-#ifdef DRM_MODE_OVERLAY_LANDED
 I830Ptr p830 = I830PTR(pScrn);
 I830PortPrivPtr pPriv = GET_PORT_PRIVATE(pScrn);
 struct drm_intel_overlay_put_image request;
@@ -495,9 +486,6 @@ drmmode_overlay_put_image(ScrnInfoPtr pScrn, xf86CrtcPtr 
crtc,
return FALSE;
 } else
return TRUE;
-#else
-return FALSE;
-#endif
 }
 
 static void

commit 1dceba2603969870ee87ea4b467e454fff6ab18f
Author: Daniel Vetter daniel.vet...@ffwll.ch
Date:   Wed Oct 14 18:09:08 2009 +0200

Xv overlay: fix planar YUV copy for right rotated crtcs

While copying and rotating the buffer, array access was out of bounds when
rotated to the right (RR_Rotate_270).  My buffer handling changes probably
made this bug much more likely to actually result in a SIGSEGV.

I've checked the logs and the bug exists since rotation has been supported,
i.e.  this looks like a candidate for cherry-picking for all supported
releases.

Signed-off-by: Daniel Vetter daniel.vet...@ffwll.ch
Signed-off-by: Eric Anholt e...@anholt.net
(manually cherry-picked from commit 
aaedeffe00d9414bb03723dbc30b4938a07ce5fa)

diff --git a/src/i830_video.c b/src/i830_video.c
index 5e98f27..a2c9a98 100644
--- a/src/i830_video.c
+++ b/src/i830_video.c
@@ -1502,10 +1502,10 @@ I830CopyPackedData(I830PortPrivPtr pPriv,
for (j = 0; j  w; j+=2) {
/* Copy U */
dst[(((h - i)*2) - 3) + (j * dstPitch)] = src[(j*2) + 1 + (i * 
srcPitch)];
-   dst[(((h - i)*2) - 3) + ((j - 1) * dstPitch)] = src[(j*2) + 1 + 
((i+1) * srcPitch)];
+   dst[(((h - i)*2) - 3) + ((j + 1) * dstPitch)] = src[(j*2) + 1 + 
((i+1) * srcPitch)];
/* Copy V */
   

xserver-xorg-video-intel: Changes to 'debian-unstable'

[Julien Cristau]

 debian/changelog |1 +
 debian/xserver-xorg-video-intel.NEWS |   11 +++
 2 files changed, 12 insertions(+)

New commits:
commit 17624ff76cc8cac8495e2fe8ded2ac8a7fbde124
Author: Julien Cristau jcris...@debian.org
Date:   Tue Mar 16 16:34:12 2010 +0100

Add a NEWS.Debian entry about KMS.

diff --git a/debian/changelog b/debian/changelog
index 437fcb1..4609ab8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ xserver-xorg-video-intel (2:2.9.1-3) UNRELEASED; urgency=low
   * Rename the build directory to not include DEB_BUILD_GNU_TYPE for no
 good reason.  Thanks, Colin Watson!
   * Remove myself from Uploaders
+  * Add a NEWS.Debian entry about KMS.
 
  -- Julien Cristau jcris...@debian.org  Sat, 16 Jan 2010 16:47:17 +
 
diff --git a/debian/xserver-xorg-video-intel.NEWS 
b/debian/xserver-xorg-video-intel.NEWS
new file mode 100644
index 000..18b53f7
--- /dev/null
+++ b/debian/xserver-xorg-video-intel.NEWS
@@ -0,0 +1,11 @@
+xserver-xorg-video-intel (2:2.9.1-2) unstable; urgency=low
+
+  Starting with this version, the intel driver enables kernel mode setting
+  (KMS) by default for 830 and later chips.  This comes with a framebuffer
+  driver which enables native resolution on the console.  KMS also allows
+  faster VT switching and mode changes, as well as e.g. DisplayPort support.
+
+  In case of trouble KMS can be disabled with the 'nomodeset' kernel command
+  line parameter, or by editing /etc/modprobe.d/i915-kms.conf.
+
+ -- Julien Cristau jcris...@debian.org  Tue, 16 Mar 2010 16:09:55 +0100


-- 
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/e1nryo1-00013u...@alioth.debian.org

xserver-xorg-video-intel: Changes to 'debian-unstable'

[Julien Cristau]

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

New commits:
commit dc672336fa18700098663fde68338082cb1eb7e2
Author: Julien Cristau jcris...@debian.org
Date:   Sat Jan 23 01:46:29 2010 +0100

Remove myself from Uploaders

diff --git a/debian/changelog b/debian/changelog
index 4d0ea0e..437fcb1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ xserver-xorg-video-intel (2:2.9.1-3) UNRELEASED; urgency=low
 
   * Rename the build directory to not include DEB_BUILD_GNU_TYPE for no
 good reason.  Thanks, Colin Watson!
+  * Remove myself from Uploaders
 
  -- Julien Cristau jcris...@debian.org  Sat, 16 Jan 2010 16:47:17 +
 
diff --git a/debian/control b/debian/control
index ae0bfbc..e1f558e 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: xserver-xorg-video-intel
 Section: x11
 Priority: optional
 Maintainer: Debian X Strike Force debian-x@lists.debian.org
-Uploaders: David Nusinow dnusi...@debian.org, Drew Parsons 
dpars...@debian.org, Julien Cristau jcris...@debian.org, Brice Goglin 
bgog...@debian.org
+Uploaders: David Nusinow dnusi...@debian.org, Drew Parsons 
dpars...@debian.org, Brice Goglin bgog...@debian.org
 Build-Depends:
  debhelper (= 5),
  pkg-config,


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org

xserver-xorg-video-intel: Changes to 'debian-unstable'

[Julien Cristau]

 debian/changelog |7 +++
 debian/rules |   16 
 2 files changed, 15 insertions(+), 8 deletions(-)

New commits:
commit 09ea42d31a94cf9773153e6218939dbfc42e2586
Author: Julien Cristau jcris...@debian.org
Date:   Sat Jan 16 16:48:40 2010 +

Rename the build directory to not include DEB_BUILD_GNU_TYPE for no good 
reason.  Thanks, Colin Watson!

diff --git a/debian/changelog b/debian/changelog
index 0bdbb13..4d0ea0e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xserver-xorg-video-intel (2:2.9.1-3) UNRELEASED; urgency=low
+
+  * Rename the build directory to not include DEB_BUILD_GNU_TYPE for no
+good reason.  Thanks, Colin Watson!
+
+ -- Julien Cristau jcris...@debian.org  Sat, 16 Jan 2010 16:47:17 +
+
 xserver-xorg-video-intel (2:2.9.1-2) unstable; urgency=low
 
   * Upload to unstable.
diff --git a/debian/rules b/debian/rules
index 414e4bb..f1c550f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -36,19 +36,19 @@ configure: $(STAMP_DIR)/patch
dh_testdir
autoreconf -vfi
 
-obj-$(DEB_BUILD_GNU_TYPE)/config.status: configure
+build/config.status: configure
dh_testdir
-   test -d obj-$(DEB_BUILD_GNU_TYPE) || mkdir obj-$(DEB_BUILD_GNU_TYPE)
-   cd obj-$(DEB_BUILD_GNU_TYPE)  \
+   test -d build || mkdir build
+   cd build  \
../configure --prefix=/usr --mandir=\$${prefix}/share/man \
 --infodir=\$${prefix}/share/info $(confflags) \
 CFLAGS=$(CFLAGS) 
 
 .PHONY: build
 build: build-stamp
-build-stamp: obj-$(DEB_BUILD_GNU_TYPE)/config.status
+build-stamp: build/config.status
dh_testdir
-   cd obj-$(DEB_BUILD_GNU_TYPE)  $(MAKE)
+   cd build  $(MAKE)
$@
 
 clean: xsfclean
@@ -60,7 +60,7 @@ clean: xsfclean
rm -f */config.cache */config.log */config.status
rm -f conftest* */conftest*
rm -rf autom4te.cache */autom4te.cache
-   rm -rf obj-*
+   rm -rf build
rm -f $$(find -name Makefile.in)
rm -f compile config.guess config.sub configure depcomp install-sh
rm -f ltmain.sh missing INSTALL aclocal.m4 config.h.in mkinstalldirs
@@ -74,9 +74,9 @@ install: build
dh_clean -k
dh_installdirs
 
-   cd obj-$(DEB_BUILD_GNU_TYPE)  $(MAKE) DESTDIR=$(CURDIR)/debian/tmp 
install
+   cd build  $(MAKE) DESTDIR=$(CURDIR)/debian/tmp install
install -d $(CURDIR)/debian/tmp/usr/bin
-   install -m 755 
obj-$(DEB_BUILD_GNU_TYPE)/src/reg_dumper/intel_reg_dumper 
$(CURDIR)/debian/tmp/usr/bin/
+   install -m 755 build/src/reg_dumper/intel_reg_dumper 
$(CURDIR)/debian/tmp/usr/bin/
 
 # Build architecture-dependent files here.
 binary-arch: DH_OPTIONS=-s


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org

xserver-xorg-video-intel: Changes to 'debian-unstable'

[Julien Cristau]

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

New commits:
commit 7df30e7eae193002d7f039faa0a1fc04f315c09d
Author: Julien Cristau jcris...@debian.org
Date:   Thu Jan 7 20:54:02 2010 +

Upload to unstable.

diff --git a/debian/changelog b/debian/changelog
index c5b1f79..0bdbb13 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-video-intel (2:2.9.1-2) unstable; urgency=low
+
+  * Upload to unstable.
+
+ -- Julien Cristau jcris...@debian.org  Thu, 07 Jan 2010 20:53:45 +
+
 xserver-xorg-video-intel (2:2.9.1-1+exp1) experimental; urgency=low
 
   [ Julien Cristau ]


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org

xserver-xorg-video-intel: Changes to 'debian-unstable'

[Timo Aaltonen]

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

New commits:
commit e54aaf1f3d9078dfecd712f8e595935784653f68
Author: Brice Goglin bgog...@debian.org
Date:   Wed Dec 2 15:50:29 2009 +0100

Prepare Changelog for upload

diff --git a/debian/changelog b/debian/changelog
index 2e66784..c5b1f79 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xserver-xorg-video-intel (2:2.9.1-1+exp1) UNRELEASED; urgency=low
+xserver-xorg-video-intel (2:2.9.1-1+exp1) experimental; urgency=low
 
   [ Julien Cristau ]
   * Enable kernel mode setting by default on linux (closes: #555906).
@@ -6,7 +6,7 @@ xserver-xorg-video-intel (2:2.9.1-1+exp1) UNRELEASED; 
urgency=low
   [ Brice Goglin ]
   * Build against xserver 1.7.
 
- -- Brice Goglin bgog...@debian.org  Wed, 02 Dec 2009 15:49:30 +0100
+ -- Brice Goglin bgog...@debian.org  Wed, 02 Dec 2009 15:50:17 +0100
 
 xserver-xorg-video-intel (2:2.9.1-1) unstable; urgency=medium
 

commit 0141804fdc17eaf47027fcb926fc38467edee1b2
Author: Brice Goglin bgog...@debian.org
Date:   Wed Dec 2 15:50:14 2009 +0100

Build against Xserver 1.7

diff --git a/debian/changelog b/debian/changelog
index 9454c74..2e66784 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,12 @@
-xserver-xorg-video-intel (2:2.9.1-2) UNRELEASED; urgency=low
+xserver-xorg-video-intel (2:2.9.1-1+exp1) UNRELEASED; urgency=low
 
+  [ Julien Cristau ]
   * Enable kernel mode setting by default on linux (closes: #555906).
 
- -- Julien Cristau jcris...@debian.org  Wed, 25 Nov 2009 17:09:10 +0100
+  [ Brice Goglin ]
+  * Build against xserver 1.7.
+
+ -- Brice Goglin bgog...@debian.org  Wed, 02 Dec 2009 15:49:30 +0100
 
 xserver-xorg-video-intel (2:2.9.1-1) unstable; urgency=medium
 
diff --git a/debian/control b/debian/control
index 59ff804..ae0bfbc 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,7 @@ Uploaders: David Nusinow dnusi...@debian.org, Drew Parsons 
dpars...@debian.or
 Build-Depends:
  debhelper (= 5),
  pkg-config,
- xserver-xorg-dev (= 2:1.5.99.901),
+ xserver-xorg-dev (= 2:1.7),
  x11proto-core-dev,
  x11proto-fonts-dev,
  x11proto-xinerama-dev,


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org

xserver-xorg-video-intel: Changes to 'debian-unstable'

[Julien Cristau]

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

New commits:
commit 3580955a7f4915ffc08a7ecb2238f4b2bcdcf55b
Author: Julien Cristau jcris...@debian.org
Date:   Wed Nov 25 16:33:08 2009 +0100

Prepare changelog for upload

diff --git a/debian/changelog b/debian/changelog
index 214bb48..3ec5f31 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,10 @@
-xserver-xorg-video-intel (2:2.9.1-1) UNRELEASED; urgency=low
+xserver-xorg-video-intel (2:2.9.1-1) unstable; urgency=medium
 
-  * New upstream bugfix release.
+  * New upstream bugfix release (closes: #508005).
 + reverts change from 2.9.0 that broke DVI detection for some people
   (closes: #548045)
 
- -- Julien Cristau jcris...@debian.org  Thu, 12 Nov 2009 15:22:58 +0100
+ -- Julien Cristau jcris...@debian.org  Wed, 25 Nov 2009 16:32:29 +0100
 
 xserver-xorg-video-intel (2:2.9.0-1) unstable; urgency=low
 


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org

xserver-xorg-video-intel: Changes to 'debian-unstable'

[Julien Cristau]

 debian/changelog|6 ++
 debian/i915-kms.conf|1 +
 debian/rules|4 
 debian/xserver-xorg-video-intel.postinst.in |   21 +
 debian/xserver-xorg-video-intel.postrm.in   |   21 +
 debian/xserver-xorg-video-intel.prerm.in|   21 +
 6 files changed, 74 insertions(+)

New commits:
commit c8e49cd447d2b23f6bdd30d40607b5289ab7365e
Author: Julien Cristau jcris...@debian.org
Date:   Thu Nov 12 15:29:00 2009 +0100

Enable kernel mode setting by default on linux.

diff --git a/debian/changelog b/debian/changelog
index 3ec5f31..9454c74 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-video-intel (2:2.9.1-2) UNRELEASED; urgency=low
+
+  * Enable kernel mode setting by default on linux (closes: #555906).
+
+ -- Julien Cristau jcris...@debian.org  Wed, 25 Nov 2009 17:09:10 +0100
+
 xserver-xorg-video-intel (2:2.9.1-1) unstable; urgency=medium
 
   * New upstream bugfix release (closes: #508005).
diff --git a/debian/i915-kms.conf b/debian/i915-kms.conf
new file mode 100644
index 000..597ac60
--- /dev/null
+++ b/debian/i915-kms.conf
@@ -0,0 +1 @@
+options i915 modeset=1
diff --git a/debian/rules b/debian/rules
index e58d55a..414e4bb 100755
--- a/debian/rules
+++ b/debian/rules
@@ -87,6 +87,10 @@ binary-arch: build install serverabi
dh_installdocs README NEWS
dh_installchangelogs ChangeLog
dh_install --sourcedir=debian/tmp --list-missing --exclude=.la 
--exclude=usr/share/man/man4
+ifeq ($(DEB_HOST_ARCH_OS), linux)
+   install -d -m 755 debian/xserver-xorg-video-intel/etc/modprobe.d/
+   install -m 644 debian/i915-kms.conf 
debian/xserver-xorg-video-intel/etc/modprobe.d/
+endif
dh_installman
dh_link
dh_strip --dbg-package=xserver-xorg-video-intel-dbg
diff --git a/debian/xserver-xorg-video-intel.postinst.in 
b/debian/xserver-xorg-video-intel.postinst.in
new file mode 100644
index 000..d3a09ec
--- /dev/null
+++ b/debian/xserver-xorg-video-intel.postinst.in
@@ -0,0 +1,21 @@
+#!/bin/sh
+
+set -e
+
+THIS_SCRIPT=postinst
+THIS_PACKAGE=xserver-xorg-video-intel
+
+#INCLUDE_SHELL_LIB#
+
+case $1 in
+  abort-upgrade)
+  if dpkg --compare-versions $2 lt-nl 2:2.9.1; then
+# failed downgrading to a version without kms
+remove_conffile_rollback /etc/modprobe.d/i915-kms.conf
+  fi
+  ;;
+esac
+
+#DEBHELPER#
+
+# vim:set ai et sw=2 ts=2 tw=80:
diff --git a/debian/xserver-xorg-video-intel.postrm.in 
b/debian/xserver-xorg-video-intel.postrm.in
new file mode 100644
index 000..3967436
--- /dev/null
+++ b/debian/xserver-xorg-video-intel.postrm.in
@@ -0,0 +1,21 @@
+#!/bin/sh
+
+set -e
+
+THIS_SCRIPT=postrm
+THIS_PACKAGE=xserver-xorg-video-intel
+
+#INCLUDE_SHELL_LIB#
+
+case $1 in
+  upgrade)
+  if dpkg --compare-versions $2 lt-nl 2:2.9.1; then
+# downgrading to a version without kms
+remove_conffile_commit /etc/modprobe.d/i915-kms.conf
+  fi
+  ;;
+esac
+
+#DEBHELPER#
+
+# vim:set ai et sw=2 ts=2 tw=80:
diff --git a/debian/xserver-xorg-video-intel.prerm.in 
b/debian/xserver-xorg-video-intel.prerm.in
new file mode 100644
index 000..58082ed
--- /dev/null
+++ b/debian/xserver-xorg-video-intel.prerm.in
@@ -0,0 +1,21 @@
+#!/bin/sh
+
+set -e
+
+THIS_SCRIPT=prerm
+THIS_PACKAGE=xserver-xorg-video-intel
+
+#INCLUDE_SHELL_LIB#
+
+case $1 in
+  upgrade)
+  if dpkg --compare-versions $2 lt-nl 2:2.9.1; then
+# downgrading to a version without kms
+remove_conffile_lookup $THIS_PACKAGE /etc/modprobe.d/i915-kms.conf
+  fi
+  ;;
+esac
+
+#DEBHELPER#
+
+# vim:set ai et sw=2 ts=2 tw=80:


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org

xserver-xorg-video-intel: Changes to 'debian-unstable'

[Julien Cristau]

 ChangeLog |   72 ++
 NEWS  |   23 +++
 configure.ac  |2 -
 debian/changelog  |8 +
 debian/xsfbs/xsfbs.mk |   17 +--
 debian/xsfbs/xsfbs.sh |4 --
 src/drmmode_display.c |   20 +
 src/i830.h|1 
 src/i830_driver.c |2 +
 src/i830_sdvo.c   |3 --
 uxa/uxa-render.c  |3 +-
 11 files changed, 132 insertions(+), 23 deletions(-)

New commits:
commit d9aa7361e46063195e3bc5ec5826048deb2fda08
Author: Julien Cristau jcris...@debian.org
Date:   Thu Nov 12 15:27:17 2009 +0100

bump changelogs

diff --git a/ChangeLog b/ChangeLog
index f136785..f66dd4f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,75 @@
+commit 9acf10762b5f3d3b1b33ea07792a936a25e45010
+Author: Carl Worth cwo...@cworth.org
+Date:   Mon Oct 26 04:53:13 2009 -0700
+
+Update version to 2.9.1
+
+commit 61c89e56f361fa860f18985137d6bf53f48c16ac
+Author: Carl Worth cwo...@cworth.org
+Date:   Mon Oct 26 04:51:58 2009 -0700
+
+NEWS: Add notes for the 2.9.1 release.
+
+Thanks to everyone for providing nice descriptions of the bug fixe at:
+
+http://wiki.x.org/wiki/Intel29Branch
+
+commit 8e4fc7d3ba0baa6b680c685429060cb62a08f89f
+Author: Carl Worth cwo...@cworth.org
+Date:   Mon Oct 26 04:40:51 2009 -0700
+
+Revert Check whether the DVI-I/D is connected or disconnected based on 
EDID
+
+This reverts commit 02fe9be695f7e209944bd0f7b67950f93619feee  as it
+was causing regressions detecting DVI monitors for several people.
+
+See:
+
+   http://bugs.freedesktop.org/show_bug.cgi?id=24458
+   http://bugs.freedesktop.org/show_bug.cgi?id=24458
+   http://bugs.freedesktop.org/show_bug.cgi?id=24458)
+
+commit 22b85d0198508a13273ab58fd5fa3a127880a0be
+Author: Albert Damen al...@gmx.net
+Date:   Wed Oct 7 21:55:42 2009 +0200
+
+Drop frontbuffer from crtc in I830CloseScreen
+
+By dropping the frontbuffer from the crtc, the new frontbuffer
+can be properly added to the crtc when the xserver is reset.
+
+Signed-off-by: Albert Damen al...@gmx.net
+(cherry picked from commit fcc2ee48b866b81c79315ff10189b56fc201539d)
+
+Fixes https://bugs.freedesktop.org/show_bug.cgi?id=24383
+
+commit 7ccf084b7a281d8aa877f91401d3df7192da408c
+Author: Chris Wilson ch...@chris-wilson.co.uk
+Date:   Mon Oct 12 14:33:08 2009 +0100
+
+uxa: Free the ScratchPixmapHeader after its associated Picture
+
+Fixes: http://bugs.freedesktop.org/show_bug.cgi?id=24459
+Intel Driver  2.8: Cairo rendering bug, triggered in QtCurve GTK engine
+
+Signed-off-by: Chris Wilson ch...@chris-wilson.co.uk
+(cherry picked from commit 7e8f32d0a7279dce1976f87612833d9092554cfe)
+
+commit f858cbe246c5d3a788ae25551b49142c5cc91f1a
+Author: Dave Airlie airl...@redhat.com
+Date:   Fri Oct 9 14:16:06 2009 +1000
+
+drmmode: with 1.7 server, set mode major doesn't get gamma setup.
+
+Noticed this on Fedora, where 1.7 server does gamma via the randr
+codepaths however kms doesn't have this call which happens in the
+non set_mode_major path.
+
+probably should be backported to released drivers.
+
+Signed-off-by: Dave Airlie airl...@redhat.com
+(cherry picked from commit 8a77877f9c2c6a8a1308bc1a3be9e7ad88bc7f49)
+
 commit 2841a4cd8c6c64fdf4b2203ab73b57b38a50f651
 Author: Carl Worth cwo...@cworth.org
 Date:   Mon Sep 28 20:03:11 2009 -0700
diff --git a/debian/changelog b/debian/changelog
index 9b1eaf2..214bb48 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+xserver-xorg-video-intel (2:2.9.1-1) UNRELEASED; urgency=low
+
+  * New upstream bugfix release.
++ reverts change from 2.9.0 that broke DVI detection for some people
+  (closes: #548045)
+
+ -- Julien Cristau jcris...@debian.org  Thu, 12 Nov 2009 15:22:58 +0100
+
 xserver-xorg-video-intel (2:2.9.0-1) unstable; urgency=low
 
   * New upstream release.

commit 9acf10762b5f3d3b1b33ea07792a936a25e45010
Author: Carl Worth cwo...@cworth.org
Date:   Mon Oct 26 04:53:13 2009 -0700

Update version to 2.9.1

diff --git a/configure.ac b/configure.ac
index 7d80c35..7390701 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@
 
 AC_PREREQ(2.57)
 AC_INIT([xf86-video-intel],
-2.9.0,
+2.9.1,
 [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
 xf86-video-intel)
 

commit 61c89e56f361fa860f18985137d6bf53f48c16ac
Author: Carl Worth cwo...@cworth.org
Date:   Mon Oct 26 04:51:58 2009 -0700

NEWS: Add notes for the 2.9.1 release.

Thanks to everyone for providing nice descriptions of the bug fixe at:

http://wiki.x.org/wiki/Intel29Branch

diff --git a/NEWS b/NEWS
index e0033e2..062d6c5 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,26 @@
+Release 2.9.1 (2009-10-26)
+==
+We are pleased to announce a maintenance release (2.9.1) of the

xserver-xorg-video-intel: Changes to 'debian-unstable'

[Brice Goglin]

 ChangeLog  |  802 +++-
 NEWS   |   72 
 RELEASING  |3 
 configure.ac   |   27 
 debian/changelog   |   13 
 src/bios_reader/bios_reader.c  |   36 
 src/ch7017/ch7017.c|6 
 src/ch7xxx/ch7xxx.c|6 
 src/common.h   |7 
 src/drmmode_display.c  |  301 ++-
 src/i810_driver.c  |  117 -
 src/i810_hwmc.c|1 
 src/i810_reg.h |   41 
 src/i810_video.c   |1 
 src/i830.h |   14 
 src/i830_bios.h|   38 
 src/i830_cursor.c  |1 
 src/i830_debug.c   |   43 
 src/i830_display.c |   38 
 src/i830_driver.c  |  142 -
 src/i830_hwmc.c|4 
 src/i830_i2c.c |2 
 src/i830_lvds.c|1 
 src/i830_memory.c  |   77 
 src/i830_quirks.c  |2 
 src/i830_reg.h |2 
 src/i830_render.c  |  318 +--
 src/i830_sdvo.c|3 
 src/i830_tv.c  |2 
 src/i830_uxa.c |5 
 src/i830_video.c   |5 
 src/i915_hwmc.c|   21 
 src/i915_render.c  |  250 ++
 src/i915_video.c   |4 
 src/i965_hwmc.c|1 
 src/i965_hwmc.h|1 
 src/i965_render.c  |   46 
 src/ivch/ivch.c|6 
 src/reg_dumper/Makefile.am |9 
 src/reg_dumper/audio.c |  454 
 src/sil164/sil164.c|6 
 src/tfp410/tfp410.c|6 
 src/xvmc/i965_xvmc.c   |2 
 src/xvmc/shader/mc/Makefile.am |   25 
 src/xvmc/shader/mc/dual_prime.g4b.gen5 | 2486 +
 src/xvmc/shader/mc/dual_prime_igd.g4b.gen5 | 1234 
 src/xvmc/shader/mc/field_backward.g4b.gen5 | 1341 +
 src/xvmc/shader/mc/field_backward_igd.g4b.gen5 |   62 
 src/xvmc/shader/mc/field_f_b.g4b.gen5  | 2486 +
 src/xvmc/shader/mc/field_f_b_igd.g4b.gen5  |  121 +
 src/xvmc/shader/mc/field_forward.g4b.gen5  | 1340 +
 src/xvmc/shader/mc/field_forward_igd.g4b.gen5  |   62 
 src/xvmc/shader/mc/frame_backward.g4b.gen5 |  716 +++
 src/xvmc/shader/mc/frame_backward_igd.g4b.gen5 |   15 
 src/xvmc/shader/mc/frame_f_b.g4b.gen5  | 1257 
 src/xvmc/shader/mc/frame_f_b_igd.g4b.gen5  |   51 
 src/xvmc/shader/mc/frame_forward.g4b.gen5  |  715 +++
 src/xvmc/shader/mc/frame_forward_igd.g4b.gen5  |   15 
 src/xvmc/shader/mc/ipicture.g4b.gen5   |  125 +
 src/xvmc/shader/mc/ipicture_igd.g4b.gen5   |   75 
 src/xvmc/shader/mc/lib_igd.g4b.gen5|  558 +
 src/xvmc/shader/mc/null.g4b.gen5   |   17 
 src/xvmc/shader/vld/Makefile.am|   15 
 src/xvmc/shader/vld/field_backward.g4b.gen5|  553 +
 src/xvmc/shader/vld/field_f_b.g4b.gen5 | 1007 ++
 src/xvmc/shader/vld/field_forward.g4b.gen5 |  555 +
 src/xvmc/shader/vld/frame_backward.g4b.gen5|  369 +++
 src/xvmc/shader/vld/frame_f_b.g4b.gen5 |  675 ++
 src/xvmc/shader/vld/frame_forward.g4b.gen5 |  369 +++
 src/xvmc/shader/vld/ipicture.g4b.gen5  |  313 +++
 src/xvmc/shader/vld/lib.g4b.gen5   |  307 +++
 src/xvmc/xvmc_vld.c|  137 +
 uxa/uxa-accel.c|   13 
 uxa/uxa-priv.h |   14 
 uxa/uxa-render.c   |  382 ++-
 uxa/uxa.c  |7 
 uxa/uxa.h  |   10 
 77 files changed, 19719 insertions(+), 644 deletions(-)

New commits:
commit de10664844faf0d83c52f4a987873d8fae75e9f3
Author: Brice Goglin bgog...@debian.org
Date:   Tue Sep 29 07:17:29 2009 +0200

Prepare changelog for upload

diff --git a/debian/changelog b/debian/changelog
index 7afb94e..9b1eaf2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,8 @@
-xserver-xorg-video-intel (2:2.9.0-1) UNRELEASED; urgency=low
+xserver-xorg-video-intel (2:2.9.0-1) unstable; urgency=low
 
   

xserver-xorg-video-intel: Changes to 'debian-unstable'

[Julien Cristau]

 debian/changelog  |   10 
 debian/control|5 
 debian/patches/disable-uxa-render-accel-on-i8xx.patch |   27 --
 debian/patches/series |1 
 debian/rules  |2 
 debian/xsfbs/xsfbs.mk |4 
 debian/xsfbs/xsfbs.sh |  229 --
 7 files changed, 14 insertions(+), 264 deletions(-)

New commits:
commit 147607344aef41eb33b99390048dc51bb5362888
Author: Julien Cristau jcris...@debian.org
Date:   Thu Sep 17 20:55:49 2009 +0200

Prepare changelog for upload

diff --git a/debian/changelog b/debian/changelog
index 692cb1c..d0e5dab 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xserver-xorg-video-intel (2:2.8.1-2) UNRELEASED; urgency=low
+xserver-xorg-video-intel (2:2.8.1-2) unstable; urgency=low
 
   * Re-enable render accel on 8xx.  The major problem turned out to be related
 to agp chipset flushing (see #541307), so hopefully this should work now.
@@ -6,7 +6,7 @@ xserver-xorg-video-intel (2:2.8.1-2) UNRELEASED; urgency=low
   * Bump Standards-Version to 3.8.3 (no changes).
   * Mention intel_reg_dumper in the debug package's long description.
 
- -- Julien Cristau jcris...@debian.org  Thu, 17 Sep 2009 20:43:00 +0200
+ -- Julien Cristau jcris...@debian.org  Thu, 17 Sep 2009 20:55:47 +0200
 
 xserver-xorg-video-intel (2:2.8.1-1) unstable; urgency=low
 

commit 1407fc2b995dd3a675d62684c90e1d5f8510b77b
Author: Julien Cristau jcris...@debian.org
Date:   Thu Sep 17 20:55:45 2009 +0200

Mention intel_reg_dumper in the debug package's long description.

diff --git a/debian/changelog b/debian/changelog
index e1a6c70..692cb1c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ xserver-xorg-video-intel (2:2.8.1-2) UNRELEASED; urgency=low
 to agp chipset flushing (see #541307), so hopefully this should work now.
   * Add missing xsfclean dependency to debian/rules clean.
   * Bump Standards-Version to 3.8.3 (no changes).
+  * Mention intel_reg_dumper in the debug package's long description.
 
  -- Julien Cristau jcris...@debian.org  Thu, 17 Sep 2009 20:43:00 +0200
 
diff --git a/debian/control b/debian/control
index 4708052..59ff804 100644
--- a/debian/control
+++ b/debian/control
@@ -65,4 +65,5 @@ Description: X.Org X server -- Intel i8xx, i9xx display 
driver (debug symbols)
  This driver provides support for the Intel i8xx and i9xx family of chipsets,
  including i810, i815, i830, i845, i855, i865, i915, and i945 series chips.
  .
- This package provides debugging symbols for this Xorg X driver.
+ This package provides debugging symbols for this Xorg X driver, and the
+ intel_reg_dumper helper.

commit 81fe356496798c1d448ccd2522844a44bd1bf64b
Author: Julien Cristau jcris...@debian.org
Date:   Thu Sep 17 20:54:47 2009 +0200

Bump Standards-Version to 3.8.3 (no changes).

diff --git a/debian/changelog b/debian/changelog
index 462c866..e1a6c70 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ xserver-xorg-video-intel (2:2.8.1-2) UNRELEASED; urgency=low
   * Re-enable render accel on 8xx.  The major problem turned out to be related
 to agp chipset flushing (see #541307), so hopefully this should work now.
   * Add missing xsfclean dependency to debian/rules clean.
+  * Bump Standards-Version to 3.8.3 (no changes).
 
  -- Julien Cristau jcris...@debian.org  Thu, 17 Sep 2009 20:43:00 +0200
 
diff --git a/debian/control b/debian/control
index 2423310..4708052 100644
--- a/debian/control
+++ b/debian/control
@@ -31,7 +31,7 @@ Build-Depends:
  automake,
  libtool,
  xutils-dev
-Standards-Version: 3.8.1
+Standards-Version: 3.8.3
 Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-video-intel
 Vcs-Browser: 
http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-video-intel.git
 

commit 3784cf39a9dea434538fb8ba22c9b77fbc40d478
Author: Julien Cristau jcris...@debian.org
Date:   Thu Sep 17 20:52:52 2009 +0200

Add missing xsfclean dependency to debian/rules clean.

diff --git a/debian/changelog b/debian/changelog
index 39f59bf..462c866 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ xserver-xorg-video-intel (2:2.8.1-2) UNRELEASED; urgency=low
 
   * Re-enable render accel on 8xx.  The major problem turned out to be related
 to agp chipset flushing (see #541307), so hopefully this should work now.
+  * Add missing xsfclean dependency to debian/rules clean.
 
  -- Julien Cristau jcris...@debian.org  Thu, 17 Sep 2009 20:43:00 +0200
 
diff --git a/debian/rules b/debian/rules
index a907d80..e58d55a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -51,7 +51,7 @@ build-stamp: obj-$(DEB_BUILD_GNU_TYPE)/config.status
cd obj-$(DEB_BUILD_GNU_TYPE)  $(MAKE)
$@
 
-clean:
+clean: xsfclean
dh_testdir
dh_testroot
rm -f build-stamp

commit 

xserver-xorg-video-intel: Changes to 'debian-unstable'

[Brice Goglin]

 ChangeLog|  140 +++
 NEWS |   33 
 configure.ac |2 
 debian/changelog |9 +
 src/bios_reader/bios_reader.c|   20 ++
 src/drmmode_display.c|6 
 src/i830.h   |2 
 src/i830_accel.c |3 
 src/i830_bios.c  |6 
 src/i830_memory.c|2 
 src/i830_uxa.c   |   32 +++-
 src/i965_render.c|2 
 src/i965_video.c |3 
 src/render_program/exa_wm_src_sample_planar.g4a  |4 
 src/render_program/exa_wm_src_sample_planar.g4b  |4 
 src/render_program/exa_wm_src_sample_planar.g4b.gen5 |4 
 16 files changed, 237 insertions(+), 35 deletions(-)

New commits:
commit 15a70ce9ef804c4d87c70d7f8d73b14a2cea3351
Author: Brice Goglin bgog...@debian.org
Date:   Wed Aug 26 09:50:25 2009 +0200

Prepare changelog for upload

diff --git a/debian/changelog b/debian/changelog
index 1c8b57f..6542682 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,11 @@
-xserver-xorg-video-intel (2:2.8.1-1) UNRELEASED; urgency=low
+xserver-xorg-video-intel (2:2.8.1-1) unstable; urgency=low
 
   * New upstream release.
 + Calculate the DVO relative offset in LVDS data entry to get the
   DVO timing, closes: #538148.
 + Fix sampler indexes on i965 planar video, closes: #513427.
 
- -- Brice Goglin bgog...@debian.org  Wed, 26 Aug 2009 09:49:11 +0200
+ -- Brice Goglin bgog...@debian.org  Wed, 26 Aug 2009 09:50:15 +0200
 
 xserver-xorg-video-intel (2:2.8.0-2) unstable; urgency=low
 

commit 061b092582d37874d2ed6eb0b27e9d3f9e81b5b1
Author: Brice Goglin bgog...@debian.org
Date:   Wed Aug 26 09:50:01 2009 +0200

New upstream release

diff --git a/ChangeLog b/ChangeLog
index 09d251b..b71fdb6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,143 @@
+commit e6105d978a0217219cb2d60a672ae200c70bc68d
+Author: Carl Worth cwo...@cworth.org
+Date:   Tue Aug 25 16:56:44 2009 -0700
+
+Increment version number to 2.8.1 for release.
+
+commit 584cdcb10ce73838e9a96b8f8a390cd0affe2f0e
+Author: Carl Worth cwo...@cworth.org
+Date:   Tue Aug 25 16:56:09 2009 -0700
+
+NEWS: Add notes for 2.8.1
+
+An additional 5 patches were proposed at:
+
+   http://wiki.x.org/wiki/Intel28Branch
+
+commit 215ee68a5aa1d0f24884cd8bc226959c30c20bd3
+Author: Eric Anholt e...@anholt.net
+Date:   Wed Aug 12 19:29:31 2009 -0700
+
+Align the height of untiled pixmaps to 2 lines as well.
+
+The 965 docs note, and it's probably the case on 915 as well, that the
+2x2 subspans are read as a unit, even if the bottom row isn't used.  If
+the address in that bottom row extended beyond the end of the GTT, a
+fault could occur.
+
+Thanks to Chris Wilson for pointing out the problem.
+(cherry picked from commit 465a4ab416b2e5ad53b96702720331a44fffa2fe)
+
+commit 180a9d160f28087db20e34c838f19ff0a26fabcc
+Author: Eric Anholt e...@anholt.net
+Date:   Wed Aug 5 12:45:16 2009 -0700
+
+Fix sampler indexes on i965 planar video.
+
+We only set up one sampler, because all of our sampling is the same.  By
+using a non-zero index for the other two samplers, we'd dereference 
(likely)
+zeroed data, resulting in using NEAREST filtering.  This was a regression 
in
+40671132cb3732728703c6444f4577467fa9223f which incidentally switched from
+having 6 samplers to 1.
+
+Bug #22895, #19856
+(cherry picked from commit 79b6851148574419389ac8055b0c31b8bdac3ab3)
+
+commit aa1d3f0bfd323126bcb4e11e4e5090fc2850237a
+Author: Zhao Yakui yakui.z...@intel.com
+Date:   Fri Jul 24 10:44:20 2009 +0800
+
+Calculate the DVO relative offset in LVDS data entry to get the DVO timing
+
+Now the DVO timing in LVDS data entry is obtained by using the
+following step:
+a. get the entry size for every LVDS panel data
+b. Get the LVDS fp entry for the preferred panel type
+c. get the DVO timing by using entry-dvo_timing
+
+In our driver the entry-dvo_timing is related with the size of
+lvds_fp_timing. For example: the size is 46.
+
+But it seems that the size of lvds_fp_timing varies on the differnt
+platform. In such case we will get the incorrect DVO timing because of
+the incorrect DVO offset in LVDS panel data entry.
+
+Calculate the DVO timing offset in LVDS data entry to get the DVO timing
+a. get the DVO timing offset in the LVDS fp data entry by using the
+pointer definition in LVDS data ptr
+b. get the LVDS data entry
+c. get the DVO timing by adding the DVO timing offset to 

xserver-xorg-video-intel: Changes to 'debian-unstable'

[Julien Cristau]

 debian/changelog  |9 ++
 debian/control|1 
 debian/patches/disable-uxa-render-accel-on-i8xx.patch |   27 ++
 debian/patches/series |1 
 debian/rules  |2 -
 debian/xsfbs/xsfbs.sh |   10 --
 6 files changed, 39 insertions(+), 11 deletions(-)

New commits:
commit 7044a130ba4225295c890f3d65763dc21cff5846
Author: Julien Cristau jcris...@debian.org
Date:   Fri Jul 31 21:51:06 2009 +0200

Disable UXA render accel on i8xx chips for now.

It currently causes hangs, and doesn't seem likely to get fixed quickly
upstream (closes: #527349).

Reenable patch system and bring back quilt build-dep.

diff --git a/debian/changelog b/debian/changelog
index 02c3b4a..af4a062 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+xserver-xorg-video-intel (2:2.8.0-2) UNRELEASED; urgency=low
+
+  * Disable UXA render accel on i8xx chips for now.  It currently causes
+hangs, and doesn't seem likely to get fixed quickly upstream
+(closes: #527349).
+  * Reenable patch system and bring back quilt build-dep.
+
+ -- Julien Cristau jcris...@debian.org  Fri, 31 Jul 2009 21:47:24 +0200
+
 xserver-xorg-video-intel (2:2.8.0-1) unstable; urgency=low
 
   * New upstream release.
diff --git a/debian/control b/debian/control
index 8377bb9..2423310 100644
--- a/debian/control
+++ b/debian/control
@@ -27,6 +27,7 @@ Build-Depends:
  libxfixes-dev,
 # end xvmc
  dpkg-dev (= 1.14.17),
+ quilt,
  automake,
  libtool,
  xutils-dev
diff --git a/debian/patches/disable-uxa-render-accel-on-i8xx.patch 
b/debian/patches/disable-uxa-render-accel-on-i8xx.patch
new file mode 100644
index 000..6cb74f2
--- /dev/null
+++ b/debian/patches/disable-uxa-render-accel-on-i8xx.patch
@@ -0,0 +1,27 @@
+From cb66b0945fcb86027cf74d22c1c061bf611564c4 Mon Sep 17 00:00:00 2001
+From: Julien Cristau jcris...@debian.org
+Date: Fri, 31 Jul 2009 21:24:12 +0200
+Subject: [PATCH] disable uxa render accel on i8xx
+
+---
+ src/i830_uxa.c |4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/i830_uxa.c b/src/i830_uxa.c
+index 2050c48..5ab266f 100644
+--- a/src/i830_uxa.c
 b/src/i830_uxa.c
+@@ -709,8 +709,8 @@ i830_uxa_init (ScreenPtr pScreen)
+ 
+ /* Composite */
+ if (!IS_I9XX(i830)) {
+-  i830-uxa_driver-check_composite = i830_check_composite;
+-  i830-uxa_driver-prepare_composite = i830_prepare_composite;
++  i830-uxa_driver-check_composite = NULL;
++  i830-uxa_driver-prepare_composite = NULL;
+   i830-uxa_driver-composite = i830_composite;
+   i830-uxa_driver-done_composite = i830_done_composite;
+ } else if (IS_I915G(i830) || IS_I915GM(i830) ||
+-- 
+1.6.3.3
+
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 000..7601b0f
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+disable-uxa-render-accel-on-i8xx.patch
diff --git a/debian/rules b/debian/rules
index 99fcc6e..a907d80 100755
--- a/debian/rules
+++ b/debian/rules
@@ -32,7 +32,7 @@ endif
 # kbd_drv.a isn't phenomenally useful; kbd_drv.so more so
 confflags += --disable-static
 
-configure:
+configure: $(STAMP_DIR)/patch
dh_testdir
autoreconf -vfi
 

commit 8f72294ada477f003888b6776883c1dd98289f3f
Author: Julien Cristau jcris...@debian.org
Date:   Wed Jun 3 03:37:37 2009 +0200

Kill custom readlink function

This was needed for very, very old versions of debianutils.
Closes: #498890

diff --git a/debian/xsfbs/xsfbs.sh b/debian/xsfbs/xsfbs.sh
index 197eb74..781826f 100644
--- a/debian/xsfbs/xsfbs.sh
+++ b/debian/xsfbs/xsfbs.sh
@@ -303,16 +303,6 @@ EOF
   fi
 }
 
-# we require a readlink command or shell function
-if ! which readlink  /dev/null 21; then
-  message The readlink command was not found.  Please install version \
-  1.13.1 or later of the debianutils package.
-  readlink () {
-# returns what symlink in $1 actually points to
-perl -e '$l = shift; exit 1 unless -l $l; $r = readlink $l; exit 1 unless 
$r; print $r\n' $1
-  }
-fi
-
 check_symlink () {
   # syntax: check_symlink symlink
   #


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org

xserver-xorg-video-intel: Changes to 'debian-unstable'

[Brice Goglin]

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

New commits:
commit d1ee9e283090fb9a64b05d6382a45aa87d6df26e
Author: Brice Goglin bgog...@debian.org
Date:   Fri Jul 31 22:44:18 2009 +0200

Prepare changelog for upload

diff --git a/debian/changelog b/debian/changelog
index af4a062..2dfeecc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,12 @@
-xserver-xorg-video-intel (2:2.8.0-2) UNRELEASED; urgency=low
+xserver-xorg-video-intel (2:2.8.0-2) unstable; urgency=low
 
+  [ Julien Cristau ]
   * Disable UXA render accel on i8xx chips for now.  It currently causes
 hangs, and doesn't seem likely to get fixed quickly upstream
 (closes: #527349).
   * Reenable patch system and bring back quilt build-dep.
 
- -- Julien Cristau jcris...@debian.org  Fri, 31 Jul 2009 21:47:24 +0200
+ -- Brice Goglin bgog...@debian.org  Fri, 31 Jul 2009 22:44:13 +0200
 
 xserver-xorg-video-intel (2:2.8.0-1) unstable; urgency=low
 


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org

xserver-xorg-video-intel: Changes to 'debian-unstable'

[Brice Goglin]

 .gitignore   |3 
 AUTHORS  |1 
 ChangeLog| 2354 ++-
 Makefile.am  |3 
 NEWS |  154 -
 README   |2 
 RELEASING|2 
 acinclude.m4 |  140 
 configure.ac |  137 
 debian/README.source |   73 
 debian/changelog |   50 
 debian/control   |   30 
 debian/rules |1 
 debian/xsfbs/repack.sh   |   32 
 debian/xsfbs/xsfbs.sh|   68 
 m4/dolt.m4   |  178 +
 m4/shave.m4  |   73 
 man/intel.man|   30 
 shave-libtool.in |   69 
 shave.in |   76 
 src/Makefile.am  |  100 
 src/bios_reader/Makefile.am  |5 
 src/bios_reader/bios_reader.c|   26 
 src/brw_structs.h|   21 
 src/ch7017/Makefile.am   |2 
 src/ch7xxx/Makefile.am   |2 
 src/common.h |   64 
 src/drmmode_display.c|  293 +
 src/exa_sf.g4a   |  107 
 src/exa_sf.g4b   |   15 
 src/exa_sf_mask.g4a  |  107 
 src/exa_sf_mask.g4b  |   15 
 src/exa_wm.g4i   |  156 -
 src/exa_wm_affine.g4i|   44 
 src/exa_wm_ca.g4a|   38 
 src/exa_wm_ca.g4b|4 
 src/exa_wm_ca_srcalpha.g4a   |   37 
 src/exa_wm_ca_srcalpha.g4b   |4 
 src/exa_wm_mask_affine.g4a   |   41 
 src/exa_wm_mask_affine.g4b   |8 
 src/exa_wm_mask_projective.g4a   |   53 
 src/exa_wm_mask_projective.g4b   |   16 
 src/exa_wm_mask_sample_a.g4a |   48 
 src/exa_wm_mask_sample_a.g4b |2 
 src/exa_wm_mask_sample_argb.g4a  |   48 
 src/exa_wm_mask_sample_argb.g4b  |2 
 src/exa_wm_noca.g4a  |   38 
 src/exa_wm_noca.g4b  |4 
 src/exa_wm_nomask.g4a|  143 
 src/exa_wm_projective.g4i|   51 
 src/exa_wm_src_affine.g4a|   45 
 src/exa_wm_src_affine.g4b|8 
 src/exa_wm_src_projective.g4a|   49 
 src/exa_wm_src_projective.g4b|   16 
 src/exa_wm_src_sample_a.g4a  |   47 
 src/exa_wm_src_sample_a.g4b  |2 
 src/exa_wm_src_sample_argb.g4a   |   47 
 src/exa_wm_src_sample_argb.g4b   |2 
 src/exa_wm_src_sample_planar.g4a |   65 
 src/exa_wm_src_sample_planar.g4b |4 
 src/exa_wm_write.g4a |   74 
 src/exa_wm_write.g4b |   18 
 src/exa_wm_xy.g4a|   52 
 src/exa_wm_xy.g4b|4 
 src/exa_wm_yuv_rgb.g4a   |   98 
 src/exa_wm_yuv_rgb.g4b   |   12 
 src/i2c_vid.h|4 
 src/i810.h   |   10 
 src/i810_accel.c |   14 
 src/i810_common.h|1 
 src/i810_cursor.c|   14 
 src/i810_dga.c   |   14 
 src/i810_dri.c   |   29 
 src/i810_dri.h   |1 
 src/i810_driver.c|  431 --
 src/i810_hwmc.c  |1 
 src/i810_io.c|   14 
 src/i810_memory.c|   14 
 src/i810_reg.h   |  543 +++
 src/i810_video.c |1 
 

xserver-xorg-video-intel: Changes to 'debian-unstable'

[Brice Goglin]

 ChangeLog   |  161 ++
 NEWS|   47 
 README  |   14 --
 RELEASING   |   43 +---
 configure.ac|2 
 debian/changelog|5 
 debian/xserver-xorg-video-intel.install |1 
 src/drmmode_display.c   |  171 
 src/i830_batchbuffer.h  |2 
 src/i830_video.c|1 
 src/i915_video.c|   18 ++-
 src/i965_video.c|   11 +-
 12 files changed, 444 insertions(+), 32 deletions(-)

New commits:
commit be5e8111a0b6b5ff3d643bea6f8728637ae4d070
Author: Brice Goglin bgog...@debian.org
Date:   Wed May 13 07:14:54 2009 +0200

Prepare changelog for upload

diff --git a/debian/changelog b/debian/changelog
index f62895e..23732c8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xserver-xorg-video-intel (2:2.7.1-1) UNRELEASED; urgency=low
+xserver-xorg-video-intel (2:2.7.1-1) unstable; urgency=low
 
   [ Brice Goglin ]
   * New upstream release.
@@ -10,7 +10,7 @@ xserver-xorg-video-intel (2:2.7.1-1) UNRELEASED; urgency=low
 choose a driver during autoconfiguration.
 + Disable patch system and remove quilt from build-deps.
 
- -- Brice Goglin bgog...@debian.org  Wed, 13 May 2009 07:12:20 +0200
+ -- Brice Goglin bgog...@debian.org  Wed, 13 May 2009 07:14:50 +0200
 
 xserver-xorg-video-intel (2:2.7.0-1) unstable; urgency=low
 

commit 601ff5a50657d354ba3ca0d91a50949a95307ad8
Author: Brice Goglin bgog...@debian.org
Date:   Wed May 13 07:23:25 2009 +0200

Don't try to install the now missing pci ids file

diff --git a/debian/xserver-xorg-video-intel.install 
b/debian/xserver-xorg-video-intel.install
index ddb0f1b..c4ac13e 100644
--- a/debian/xserver-xorg-video-intel.install
+++ b/debian/xserver-xorg-video-intel.install
@@ -1,4 +1,3 @@
 usr/lib/xorg/modules/drivers/*.so
 usr/lib/libI810XvMC.so*
 usr/lib/libIntelXvMC.so*
-usr/share/xserver-xorg/pci/*

commit 923798326ce3e622e5618340a4a620910c89f6c0
Author: Brice Goglin bgog...@debian.org
Date:   Wed May 13 07:12:45 2009 +0200

New upstream release

diff --git a/ChangeLog b/ChangeLog
index 1e56b05..ca6fd26 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,164 @@
+commit ba7d739416796d4045952209a0a0090a78d3978d
+Author: Carl Worth cwo...@cworth.org
+Date:   Tue May 12 17:14:11 2009 -0700
+
+Update version to 2.7.1
+
+In preparation for the 2.7.1 maintenance release.
+
+commit b0ad6ad6698643bfabc6a570c145d457ca70e0f5
+Author: Carl Worth cwo...@cworth.org
+Date:   Tue May 12 17:13:26 2009 -0700
+
+NEWS: Update release notes for 2.7.1
+
+Just changing the wording to turn 2.7.0.901 into 2.7.1.
+
+commit ae5b6d8135c7170821db37de0245b0e6b7a87e59
+Author: Carl Worth cwo...@cworth.org
+Date:   Tue May 12 11:45:03 2009 -0700
+
+RELEASING: Better instructions for where to send announcements
+
+The xorg-announce list doesn't need to hear about development
+snapshots and release candidates. The intel-gfx list is good for
+that.
+
+commit 2d7ddfe8d52e6d1dfc3d1a3de00940816d2e09ff
+Author: Carl Worth cwo...@cworth.org
+Date:   Fri May 8 17:14:22 2009 -0700
+
+Increment version number to 2.7.0.901
+
+Which means this is the first release candidate in preparation for 2.7.1.
+
+commit 9c7213fa7273742d91cd31a6052306043d9da784
+Author: Carl Worth cwo...@cworth.org
+Date:   Fri May 8 17:13:44 2009 -0700
+
+NEWS: Add items for 2.7.0.901 release candidate
+
+There are some nice bug fixes here.
+
+commit ca63a5d4afd8482d280d8d64c58021e568931e27
+Author: Keith Packard kei...@keithp.com
+Date:   Fri May 1 11:50:17 2009 -0700
+
+3D_STATE_VERTEX_BUFFERS takes four 32-bit values, not three.
+
+The spec says this command takes an extra (mbz) 32-bit value, so let's
+provide it with one.
+
+Signed-off-by: Keith Packard kei...@keithp.com
+(cherry picked from commit ed492131c13715b73c14d328d0668120acb58b40)
+
+commit 77153d690a3673fdee7bef8e567816b754c43081
+Author: Albert Damen al...@gmx.net
+Date:   Sun Apr 5 16:36:35 2009 +0200
+
+Fix crash with XV with large virtual display
+
+If a virtual display with width  2048 is used, the first time
+an XV buffer is needed will result in a BadAlloc error message,
+but the next time X would crash.
+
+Signed-off-by: Eric Anholt e...@anholt.net
+(cherry picked from commit d7ca870e1ce251d42e3689a8e1e7d080ab1325fb)
+
+commit efda7c776b95f8634cd6a2fed88d526de80176bc
+Author: Carl Worth cwo...@cworth.org
+Date:   Wed May 6 09:37:34 2009 -0700
+
+Split i915 textured video commands to fit into batch buffers.
+
+i915 textured video commands are quite long, but must be contained in the
+same batch buffer as the 3D setup commands. When the number of clip rects

xserver-xorg-video-intel: Changes to 'debian-unstable'

[David Nusinow]

 debian/changelog   |8 +++-
 debian/control |1 -
 debian/patches/01_gen_pci_ids.diff |   14 --
 debian/patches/series  |1 -
 debian/rules   |4 ++--
 5 files changed, 9 insertions(+), 19 deletions(-)

New commits:
commit 35ad3f37cf6b787bcd9e24bbb008fdb226cea2c4
Author: David Nusinow dnusi...@debian.org
Date:   Mon May 4 22:08:47 2009 -0400

Remove 01_gen_pci_ids.diff.

The X server now uses an internal table to choose a driver during
autoconfiguration.

Disable patch system and remove quilt from build-deps.

diff --git a/debian/changelog b/debian/changelog
index ecc78d3..34f0ad0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,15 @@
 xserver-xorg-video-intel (2:2.7.0-2) UNRELEASED; urgency=low
 
+  [ Brice Goglin ]
   * Install the upstream NEWS file, closes: #524334, #524336.
   * Move the -dbg package to section debug.
 
- -- Brice Goglin bgog...@debian.org  Thu, 16 Apr 2009 13:52:00 +0200
+  [ David Nusinow ]
+  * Remove 01_gen_pci_ids.diff. The X server now uses an internal table to
+choose a driver during autoconfiguration.
++ Disable patch system and remove quilt from build-deps.
+
+ -- David Nusinow dnusi...@debian.org  Mon, 04 May 2009 22:07:53 -0400
 
 xserver-xorg-video-intel (2:2.7.0-1) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 77db2b1..1cb46bb 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,6 @@ Maintainer: Debian X Strike Force debian-x@lists.debian.org
 Uploaders: David Nusinow dnusi...@debian.org, Drew Parsons 
dpars...@debian.org, Julien Cristau jcris...@debian.org, Brice Goglin 
bgog...@debian.org
 Build-Depends:
  debhelper (= 5),
- quilt,
  pkg-config,
  xserver-xorg-dev (= 2:1.5.99.901),
  x11proto-gl-dev,
diff --git a/debian/patches/01_gen_pci_ids.diff 
b/debian/patches/01_gen_pci_ids.diff
deleted file mode 100644
index e4d3fc5..000
--- a/debian/patches/01_gen_pci_ids.diff
+++ /dev/null
@@ -1,14 +0,0 @@
-Index: xserver-xorg-video-intel/src/Makefile.am
-===
 xserver-xorg-video-intel.orig/src/Makefile.am
-+++ xserver-xorg-video-intel/src/Makefile.am
-@@ -220,3 +220,9 @@
- intel_drv_la_SOURCES += \
-   $(INTEL_XVMC_SRCS)
- endif
-+
-+pcidatadir = $(datadir)/xserver-xorg/pci
-+pcidata_DATA = intel.ids
-+
-+intel.ids : common.h
-+  awk '/^#define PCI_CHIP/ {print $$3 }' $(srcdir)/common.h | sed 
's/^0x/8086/'  intel.ids
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index b55d79f..000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-01_gen_pci_ids.diff
diff --git a/debian/rules b/debian/rules
index f693995..83f6c84 100755
--- a/debian/rules
+++ b/debian/rules
@@ -32,7 +32,7 @@ endif
 # kbd_drv.a isn't phenomenally useful; kbd_drv.so more so
 confflags += --disable-static
 
-configure: $(STAMP_DIR)/patch
+configure:
dh_testdir
autoreconf -vfi
 
@@ -51,7 +51,7 @@ build-stamp: obj-$(DEB_BUILD_GNU_TYPE)/config.status
cd obj-$(DEB_BUILD_GNU_TYPE)  $(MAKE)
$@
 
-clean: xsfclean
+clean:
dh_testdir
dh_testroot
rm -f build-stamp


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org

xserver-xorg-video-intel: Changes to 'debian-unstable'

[Brice Goglin]

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

New commits:
commit 756141da6b10e4c1e04c717f307c8bde255757e8
Author: Brice Goglin bgog...@debian.org
Date:   Thu Apr 16 13:51:59 2009 +0200

Move -dbg package to section debug

diff --git a/debian/changelog b/debian/changelog
index 22c41f9..ecc78d3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,9 @@
 xserver-xorg-video-intel (2:2.7.0-2) UNRELEASED; urgency=low
 
   * Install the upstream NEWS file, closes: #524334, #524336.
+  * Move the -dbg package to section debug.
 
- -- Brice Goglin bgog...@debian.org  Thu, 16 Apr 2009 13:48:55 +0200
+ -- Brice Goglin bgog...@debian.org  Thu, 16 Apr 2009 13:52:00 +0200
 
 xserver-xorg-video-intel (2:2.7.0-1) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 5f0420c..77db2b1 100644
--- a/debian/control
+++ b/debian/control
@@ -52,6 +52,7 @@ Description: X.Org X server -- Intel i8xx, i9xx display driver
 Package: xserver-xorg-video-intel-dbg
 Architecture: amd64 hurd-i386 i386 kfreebsd-i386 kfreebsd-amd64 netbsd-i386
 Depends: xserver-xorg-video-intel (= ${binary:Version}), ${shlibs:Depends}
+Section: debug
 Priority: extra
 Description: X.Org X server -- Intel i8xx, i9xx display driver (debug symbols)
  This driver provides support for the Intel i8xx and i9xx family of chipsets,

commit 0579306a9fc3e891228ccf40e00cfbba72bf983b
Author: Brice Goglin bgog...@debian.org
Date:   Thu Apr 16 13:50:38 2009 +0200

Install the upstream NEWS file

diff --git a/debian/changelog b/debian/changelog
index d4215bb..22c41f9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-video-intel (2:2.7.0-2) UNRELEASED; urgency=low
+
+  * Install the upstream NEWS file, closes: #524334, #524336.
+
+ -- Brice Goglin bgog...@debian.org  Thu, 16 Apr 2009 13:48:55 +0200
+
 xserver-xorg-video-intel (2:2.7.0-1) unstable; urgency=low
 
   * New upstream release.
diff --git a/debian/rules b/debian/rules
index f1338b9..f693995 100755
--- a/debian/rules
+++ b/debian/rules
@@ -83,7 +83,7 @@ binary-arch: build install serverabi
dh_testdir
dh_testroot
 
-   dh_installdocs README
+   dh_installdocs README NEWS
dh_installchangelogs ChangeLog
dh_install --sourcedir=debian/tmp --list-missing --exclude=.la 
--exclude=usr/share/man/man4
dh_installman


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org

xserver-xorg-video-intel: Changes to 'debian-unstable'

[Brice Goglin]

 AUTHORS|   62 +
 ChangeLog  | 1817 +
 Makefile.am|8 
 NEWS   |  107 ++
 README |  129 --
 RELEASING  |   32 
 configure.ac   |   23 
 debian/changelog   |   13 
 debian/control |2 
 debian/patches/01_gen_pci_ids.diff |8 
 man/Makefile.am|   20 
 man/intel.man  |  111 +-
 src/Makefile.am|   15 
 src/bios_reader/bios_reader.c  |   94 +
 src/common.h   |   15 
 src/drmmode_display.c  |   41 
 src/i810.h |1 
 src/i810_driver.c  |   94 -
 src/i810_reg.h |   20 
 src/i830.h |   43 
 src/i830_accel.c   |4 
 src/i830_batchbuffer.c |3 
 src/i830_bios.c|   30 
 src/i830_bios.h|   41 
 src/i830_crt.c |   16 
 src/i830_debug.c   |  103 +-
 src/i830_display.c |  655 ++---
 src/i830_display.h |2 
 src/i830_dri.c |   44 
 src/i830_driver.c  |  434 ++--
 src/i830_exa.c |  132 ++
 src/i830_hdmi.c|   90 +
 src/i830_lvds.c|  147 ++
 src/i830_memory.c  |  144 --
 src/i830_quirks.c  |   24 
 src/i830_render.c  |2 
 src/i830_ring.h|   14 
 src/i830_sdvo.c|  539 --
 src/i830_sdvo_regs.h   |   58 +
 src/i830_tv.c  |  295 +-
 src/i830_video.c   |  240 ++--
 src/i830_video.h   |2 
 src/i830_xaa.c |   69 -
 src/i915_render.c  |   11 
 src/i915_video.c   |2 
 src/i965_hwmc.c|3 
 src/i965_render.c  |   19 
 src/i965_video.c   |   16 
 src/xvmc/Makefile.am   |2 
 src/xvmc/intel_xvmc.c  |7 
 uxa/uxa-accel.c|   76 +
 uxa/uxa-glyphs.c   |   40 
 uxa/uxa-priv.h |   38 
 uxa/uxa-render.c   |   15 
 uxa/uxa-unaccel.c  |   52 -
 uxa/uxa.c  |   39 
 uxa/uxa.h  |3 
 57 files changed, 4375 insertions(+), 1691 deletions(-)

New commits:
commit 6a47f6a80ac4a0230b732516dabfea57f0422898
Author: Brice Goglin bgog...@debian.org
Date:   Thu Apr 16 07:11:29 2009 +0200

Prepare changelog for upload to unstable

diff --git a/debian/changelog b/debian/changelog
index d6ae516..d4215bb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,8 @@
-xserver-xorg-video-intel (2:2.7.0-1) UNRELEASED; urgency=low
+xserver-xorg-video-intel (2:2.7.0-1) unstable; urgency=low
 
   * New upstream release.
 
- -- Brice Goglin bgog...@debian.org  Thu, 16 Apr 2009 07:09:52 +0200
+ -- Brice Goglin bgog...@debian.org  Thu, 16 Apr 2009 07:11:09 +0200
 
 xserver-xorg-video-intel (2:2.6.99.903-1) experimental; urgency=low
 

commit 08b2062b94b32d42d7e221c27d7e271f13991d38
Author: Brice Goglin bgog...@debian.org
Date:   Thu Apr 16 07:10:27 2009 +0200

New upstream release

diff --git a/ChangeLog b/ChangeLog
index 9f1b5ee..1e56b05 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,116 @@
+commit cff6cf9adc4235af5cc73a47bb272c81635fc8b2
+Author: Carl Worth cwo...@cworth.org
+Date:   Wed Apr 15 16:20:16 2009 -0700
+
+Update version to 2.7.0
+
+In preparation for new major release.
+
+commit 5fc57441b68a85ca3aaa306c336b242616a99f12
+Author: Carl Worth cwo...@cworth.org
+Date:   Wed Apr 15 16:14:44 2009 -0700
+
+Add AUTHORS and NEWS to EXTRA_DIST
+
+These new files don't do us much good if we don't distribute them in
+our releases.
+(cherry picked from commit 9ffd1951d1f2fd2f53273d04ea29de050f07af55)
+
+commit f3d63d9e4956e64f632fbcf5da76fb7278072cb7
+Author: Carl Worth cwo...@cworth.org
+Date:   Wed Apr 15 16:14:03 2009 -0700
+
+Add a NEWS files with release-notes for 2.7.0
+
+It will be nice to have release-notes under revision control, as well
+being able to document issues in an obviously time-sensitive file,
+(as opposed to README where we were documenting some of this previously).
+(cherry picked from commit e4cd9de2933ada3e2a4b43552729ae3a370128bf)
+
+commit 3fafb28a4323c6897bfe36882857bf89e5d88de8
+Author: Carl Worth cwo...@cworth.org
+Date:   Wed Apr 15 16:10:52 2009 -0700
+
+Clarify that the default acceleration is UXA if KMS is available.
+
+Stale documentation considered harmful of course.
+(cherry picked from commit 

xserver-xorg-video-intel: Changes to 'debian-unstable'

[Julien Cristau]

 configure.ac  |5 
 debian/changelog  |8 -
 man/intel.man |   20 ---
 src/i830.h|   10 -
 src/i830_accel.c  |5 
 src/i830_dri.c|  306 --
 src/i830_driver.c |   48 
 src/i830_memory.c |   11 -
 src/i830_xaa.c|6 -
 9 files changed, 8 insertions(+), 411 deletions(-)

New commits:
commit 0ce5c3aa80c73e15ac00978c04b44143854b
Author: Julien Cristau jcris...@debian.org
Date:   Thu Apr 9 10:18:07 2009 +0100

Upload to unstable.

diff --git a/debian/changelog b/debian/changelog
index 9960544..df7d200 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,12 @@
-xserver-xorg-video-intel (2:2.6.3-1) UNRELEASED; urgency=low
+xserver-xorg-video-intel (2:2.6.3-1) unstable; urgency=low
 
   * New upstream release.
-+ doesn't FTBFS with the new libdrm (closes: #523125)
   * Bump build-dep on libdrm-dev to 2.4.5.
+  * Upload to unstable.
+  * Cherry-pick some patches from upstream git, so this doesn't FTBFS with the
+new libdrm (closes: #523125)
 
- -- Julien Cristau jcris...@debian.org  Wed, 08 Apr 2009 21:27:41 +0100
+ -- Julien Cristau jcris...@debian.org  Thu, 09 Apr 2009 10:25:22 +0100
 
 xserver-xorg-video-intel (2:2.6.1-1) experimental; urgency=low
 

commit c26e86881438c47465d0de34437d8cb2cf23faa7
Author: Owain G. Ainsworth o...@openbsd.org
Date:   Tue Jan 13 18:46:41 2009 +

Remove the pageflipping infrastructure.

It was broken on current kernels, and deprecated anyway.
(cherry picked from commit c7db3201106f07f3228c989014d6db5ace5378f6)

diff --git a/configure.ac b/configure.ac
index be4a25f..346506d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -105,8 +105,6 @@ if test x$DRI != xno; then
   [have_sarea_h=yes], [have_sarea_h=no])
 AC_CHECK_FILE([${sdkdir}/dristruct.h],
   [have_dristruct_h=yes], [have_dristruct_h=no])
-   AC_CHECK_FILE([${sdkdir}/damage.h],
-  [have_damage_h=yes], [have_damage_h=no])
 fi
 AC_MSG_CHECKING([whether to include DRI support])
 if test x$DRI = xauto; then
@@ -215,9 +213,6 @@ if test $DRI = yes; then
 PKG_CHECK_MODULES(DRI, [xf86driproto glproto])
 AC_DEFINE(XF86DRI,1,[Enable DRI driver support])
 AC_DEFINE(XF86DRI_DEVEL,1,[Enable developmental DRI driver support])
-   if test $have_damage_h = yes; then
-   AC_DEFINE(DAMAGE,1,[Use Damage extension])
-   fi
 fi
 
 dnl exaGetPixmapDriverPrivate required for DRM_MODE.
diff --git a/man/intel.man b/man/intel.man
index 2359624..65d1114 100644
--- a/man/intel.man
+++ b/man/intel.man
@@ -150,13 +150,6 @@ pool.  On systems with a working GEM environment, this can 
be disabled to
 increase the memory pool available to other graphics tasks.
 Default for i830 and newer: Enabled.
 Default for i810: this option is not used.
-.BI Option \*qPageFlip\*q \*q boolean \*q
-Enable support for page flipping. This should improve 3D performance at the
-potential cost of worse performance with mixed 2D/3D. Also note that this gives
-no benefit without corresponding support in the Mesa 3D driver
-Default for i810: The option is not used.
-Default for i830 and above: Disabled (This option is currently unstable).
-.TP
 .BI Option \*qAccelMethod\*q \*q string \*q
 Choose acceleration architecture, either XAA or EXA.  XAA is the old
 XFree86 based acceleration architecture.  EXA is a newer and simpler
diff --git a/src/i830.h b/src/i830.h
index a051034..5fda244 100644
--- a/src/i830.h
+++ b/src/i830.h
@@ -72,9 +72,6 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include dri.h
 #include GL/glxint.h
 #include i830_dri.h
-#ifdef DAMAGE
-#include damage.h
-#endif
 #endif
 #include intel_bufmgr.h
 #include i915_drm.h
@@ -475,16 +472,11 @@ typedef struct _I830Rec {
Bool can_resize;
 
Bool want_vblank_interrupts;
-#ifdef DAMAGE
-   DamagePtr pDamage;
-   RegionRec driRegion;
-#endif
 #endif
 
Bool need_mi_flush;
 
Bool NeedRingBufferLow;
-   Bool allowPageFlip;
Bool tiling;
Bool fb_compression;
 
diff --git a/src/i830_dri.c b/src/i830_dri.c
index 54a3c14..2a0516c 100644
--- a/src/i830_dri.c
+++ b/src/i830_dri.c
@@ -111,14 +111,6 @@ static void I830DRIMoveBuffers(WindowPtr pParent, 
DDXPointRec ptOldOrg,
 
 static void I830DRITransitionTo2d(ScreenPtr pScreen);
 static void I830DRITransitionTo3d(ScreenPtr pScreen);
-#if defined(DAMAGE)  (DRIINFO_MAJOR_VERSION  5 ||   \
-   (DRIINFO_MAJOR_VERSION == 5  DRIINFO_MINOR_VERSION = 
1))
-#define DRI_SUPPORTS_CLIP_NOTIFY 1
-#else
-#define DRI_SUPPORTS_CLIP_NOTIFY 0
-static void I830DRITransitionMultiToSingle3d(ScreenPtr pScreen);
-static void I830DRITransitionSingleToMulti3d(ScreenPtr pScreen);
-#endif
 
 #if (DRIINFO_MAJOR_VERSION  5 || \
  (DRIINFO_MAJOR_VERSION == 5  DRIINFO_MINOR_VERSION = 4))
@@ -127,10 +119,6 @@ static void I830DRITransitionSingleToMulti3d(ScreenPtr 
pScreen);
 #define 

xserver-xorg-video-intel: Changes to 'debian-unstable'

[Julien Cristau]

Rebased ref, commits from common ancestor:
commit b740eb76bfba2238fc41c908229b27d1f8fbf359
Author: Julien Cristau jcris...@debian.org
Date:   Thu Jan 22 00:18:28 2009 +0100

Prepare changelog for upload

diff --git a/debian/changelog b/debian/changelog
index 4d67124..98d6f4d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
-xserver-xorg-video-intel (2:2.6.1-1) UNRELEASED; urgency=low
+xserver-xorg-video-intel (2:2.6.1-1) experimental; urgency=low
 
   * New upstream release.
   * Build against xserver 1.6 rc1.
 
- -- Julien Cristau jcris...@debian.org  Thu, 22 Jan 2009 00:16:57 +0100
+ -- Julien Cristau jcris...@debian.org  Thu, 22 Jan 2009 00:18:25 +0100
 
 xserver-xorg-video-intel (2:2.6.0-1) experimental; urgency=low
 

commit 964e54acab67d6540a3d8509142b26d7c926b079
Author: Julien Cristau jcris...@debian.org
Date:   Thu Jan 22 00:18:23 2009 +0100

Build against xserver 1.6 rc1.

diff --git a/debian/changelog b/debian/changelog
index 0ea424f..4d67124 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 xserver-xorg-video-intel (2:2.6.1-1) UNRELEASED; urgency=low
 
   * New upstream release.
+  * Build against xserver 1.6 rc1.
 
  -- Julien Cristau jcris...@debian.org  Thu, 22 Jan 2009 00:16:57 +0100
 
diff --git a/debian/control b/debian/control
index d185802..49dd92d 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,7 @@ Build-Depends:
  debhelper (= 5),
  quilt,
  pkg-config,
- xserver-xorg-dev (= 2:1.5),
+ xserver-xorg-dev (= 2:1.5.99.901),
  x11proto-gl-dev,
  x11proto-video-dev,
  libgl1-mesa-dev | libgl-dev,

commit 2cef2b9af63ec1ef89f96b58d06694c21f22592c
Author: Julien Cristau jcris...@debian.org
Date:   Thu Jan 22 00:17:12 2009 +0100

Update changelogs

diff --git a/ChangeLog b/ChangeLog
index 84d9414..dabd57d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,189 @@
+commit 08683d1d053875bcacd7c358d66ef2bfad458a56
+Author: Eric Anholt e...@anholt.net
+Date:   Wed Jan 21 14:10:04 2009 -0800
+
+Bump version to 2.6.1.
+
+commit 52d3c64f2b896966b934d647765674303a8dfa29
+Author: Jesse Barnes jbar...@virtuousgeek.org
+Date:   Wed Jan 21 09:02:13 2009 -0800
+
+Don't run in KD_TEXT mode even with KMS
+
+Leaving the VT in KD_TEXT mode keeps the kernel's blanking code active,
+so when a DPMS event happens, the fb console is restored rather than X's
+configuration.  On the downside it means the kernel won't print messages
+in the background, which would be visible if a panic or emergency switch
+occurred.  The proper fix here is a new kernel mode, which we can move
+to when ready.
+(cherry picked from commit 253b8db298f38676e47dc902534465054f7b58b8)
+
+commit 11c23dd22a737aaa52ef18cd65164da9c5115d3f
+Author: Jesse Barnes jbar...@virtuousgeek.org
+Date:   Wed Jan 21 09:01:05 2009 -0800
+
+Tear down batchbuffers unconditionally on LeaveVT
+
+Even if KMS is enabled we should do this, to avoid running batches that
+depend on other state we tear down in LeaveVT.
+(cherry picked from commit 131b414feb2ecabe31b538d65725ac4427a4387a)
+
+commit f519da8ba21ef27b4a2ed4516336b25c6feb824e
+Author: Kshitij Kulshreshtha kkhere@gmail.com
+Date:   Tue Jan 20 11:35:36 2009 +0800
+
+Support sysfs backlight control for Sony laptops in xf86-video-intel
+
+The sony_laptop kernel module (since v2.6.23) supports backlight control
+via the sysfs interface:
+/sys/class/backlight/sony
+
+This patch will enable xf86-video-intel to use this backlight control 
method
+for Sony VAIO Laptops with Intel integrated video.
+(cherry picked from commit ada44c1c0edcd3ea9e41ed6b6fdb2bf0e87c9c67)
+
+commit e1c2f5d7afbd29dfb6f1e24589e13729ac71a2a7
+Author: Eric Anholt e...@anholt.net
+Date:   Thu Jan 15 09:31:55 2009 -0800
+
+Fix invarient state emits for DRI2 (do it per batch, since there's no 
lock).
+(cherry picked from commit cab5b7a7b0e17414f98b2363b0961c87f32f9c05)
+
+commit 12ad7f650a01916fd05e0aee9a72f70b112e50a0
+Author: Eric Anholt e...@anholt.net
+Date:   Fri Jan 16 16:59:17 2009 -0800
+
+Protect i915 textured video against batchbuffer wrapping.
+(cherry picked from commit d89de6d60a86105a198d904821853e6ed7de3305)
+
+commit 6b299ffac73e7f2069f8207bda677a82e6a60c81
+Author: Eric Anholt e...@anholt.net
+Date:   Thu Jan 15 19:05:52 2009 -0800
+
+Re-emit i915 composite setup when the batchbuffer wraps.
+
+This also introduces tests to make sure that we asked for enough reserved 
space
+and that we don't allow wrapping at the wrong time.
+
+This fixes a hang during text rendering with DRI2 and a GL client running,
+but could potentially affect text rendering with GEM in general with an
+exceptional batchbuffer setup.
+(cherry picked from commit db43b7870a37ea273941302096a6f00120dfae71)
+(cherry picked from commit 15780c53f5717936ea10ac87aff8a881c172f1dc)
+
+commit 5cd65d965c8ed388275fe2084553302aad601d4a
+Author: Zhenyu Wang 

xserver-xorg-video-intel: Changes to 'debian-unstable'

[Julien Cristau]

 ChangeLog |  816 ++-
 configure.ac  |4 
 debian/changelog  |7 
 debian/control|2 
 src/Makefile.am   |3 
 src/common.h  |2 
 src/drmmode_display.c |  307 --
 src/drmmode_display.h |   73 ---
 src/i830.h|   91 +++-
 src/i830_bios.c   |6 
 src/i830_display.c|   48 +-
 src/i830_display.h|1 
 src/i830_dri.c|   50 +-
 src/i830_driver.c |  219 +++---
 src/i830_exa.c|   58 ++
 src/i830_lvds.c   |5 
 src/i830_memory.c |  547 ++
 src/i830_quirks.c |   21 +
 src/i830_video.c  |  125 +++---
 src/i830_video.h  |2 
 src/i915_video.c  |9 
 src/i965_hwmc.c   |6 
 src/i965_render.c | 1032 ++
 src/i965_video.c  |  401 ++-
 24 files changed, 2250 insertions(+), 1585 deletions(-)

New commits:
commit f201c1bab66e73c902dc159cf7bdf06515d53b6e
Author: Julien Cristau jcris...@debian.org
Date:   Wed Apr 8 21:29:21 2009 +0100

Bump build-dep on libdrm-dev to 2.4.5.

diff --git a/debian/changelog b/debian/changelog
index 372912b..7d909c3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 xserver-xorg-video-intel (2:2.6.3-1) UNRELEASED; urgency=low
 
   * New upstream release.
+  * Bump build-dep on libdrm-dev to 2.4.5.
 
  -- Julien Cristau jcris...@debian.org  Wed, 08 Apr 2009 21:27:41 +0100
 
diff --git a/debian/control b/debian/control
index 49dd92d..4e449ee 100644
--- a/debian/control
+++ b/debian/control
@@ -17,7 +17,7 @@ Build-Depends:
  x11proto-randr-dev (= 1.2),
  x11proto-render-dev,
  x11proto-xinerama-dev,
- libdrm-dev (= 2.4.3),
+ libdrm-dev (= 2.4.5),
  x11proto-xf86dri-dev,
  libpciaccess-dev (= 0.8.0+git20071002),
  dpkg-dev (= 1.14.17),

commit 1543f089d483aade11630aef25df87abf3c4d314
Author: Julien Cristau jcris...@debian.org
Date:   Wed Apr 8 21:28:24 2009 +0100

Update changelogs

diff --git a/ChangeLog b/ChangeLog
index dabd57d..827d3a3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,449 @@
+commit f04552cdbcb110c876816dfda577803e6c92fb6a
+Author: Eric Anholt e...@anholt.net
+Date:   Mon Mar 2 11:18:27 2009 -0800
+
+Bump version to 2.6.3.
+
+commit c0d91bd3ffea329058b63e648d2eae05edd9ad8a
+Author: Eric Anholt e...@anholt.net
+Date:   Mon Mar 2 11:17:27 2009 -0800
+
+Only allocate pixmaps aligned for tiling when requested by DRI2 GetBuffers.
+
+This saves massive quantities of memory on pre-965 since the DRI2 tiling
+enable caused the minimum size of any pixmap to be 1MB.
+(cherry picked from commit 5bfd73cd31ba197a62f549cdbad1a1270b571027)
+
+commit 5441be42649e4f969ac16c323de2fb5ed93b271a
+Author: Eric Anholt e...@anholt.net
+Date:   Tue Feb 24 20:54:05 2009 -0800
+
+Disable fb resizing for DRI1-only server so that DRI1 can initialize.
+(cherry picked from commit 70e0261208654c6c875ad462da2734c6aa9eeb96)
+
+commit 93ae6c7f8cadb60d479e626ddd2a67d7cb2cc4c0
+Author: Eric Anholt e...@anholt.net
+Date:   Tue Feb 24 13:59:17 2009 -0800
+
+Bump version to 2.6.2 for release.
+
+commit 626a54870fd3c5038c7bdae5d9085fe98f73885b
+Author: Eric Anholt e...@anholt.net
+Date:   Tue Feb 24 14:05:15 2009 -0800
+
+Fix distcheck from drmmode_display.h deletion.
+(cherry picked from commit 9d8e5c21a1688b915bf39261d4c3b0bf2906daef)
+
+commit aa6997ecd5383ee94c8ac9cfca4a1b58820e098c
+Author: Kristian Høgsberg k...@redhat.com
+Date:   Tue Feb 24 13:58:20 2009 -0500
+
+Update kms to work with drmModeModeInfo API update.
+(cherry picked from commit a6b31f38ebf470c61de0e10b0ce2af0d7ee1684b)
+
+commit 97b3ab47c6eec98baf7566e7290c6030934ad956
+Author: Eric Anholt e...@anholt.net
+Date:   Sat Feb 21 20:36:58 2009 -0800
+
+Don't do AdjustFrame in KMS mode.
+
+This was hit by xv86vm's SwitchMode path, and for that the CRTC offsets
+get set at mode setting time anyway.
+(cherry picked from commit 53108994616d9751ac3a29fd61eb269cfaeab967)
+
+commit f3f21a0e45060aa7b333e026938325af133b014c
+Author: Kristian Høgsberg k...@redhat.com
+Date:   Mon Feb 23 15:16:51 2009 -0500
+
+KMS: Fix bug that prevented EDID data from getting propagated.
+(cherry picked from commit 73bc7f113969834d00cd92be8374dbadc62f96a9)
+
+commit 3baf4cf7deedf2e0df13bf07cd0f329cfc7911f5
+Author: Helge Bahmann helge.bahm...@secunet.com
+Date:   Sat Feb 21 10:10:04 2009 -0800
+
+Move disable_render_standby to EnterVT instead of startup.
+
+Otherwise, with a pre-2.6.28 older kernel the disable would be lost at
+resume time and cause hangs.
+
+Bug #20214
+(cherry picked from commit 81c652e9a666a7459bcc5217c8a5ec518b6e00da)
+
+commit 6314b9178a252292a79e21a64d47d740e23df28d
+Author: Eric Anholt e...@anholt.net
+Date:   Wed Feb 18 13:32:44 2009 -0800
+
+uxa: Ask for BOs ready for rendering for pixmaps.
+
+The assumption is that 

xserver-xorg-video-intel: Changes to 'debian-unstable'

[Julien Cristau]

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

New commits:
commit 6e9f989a882cc2b1548fef7ea9a05d80e822b84c
Author: Julien Cristau jcris...@debian.org
Date:   Wed Apr 8 21:31:47 2009 +0100

Add bug closer

diff --git a/debian/changelog b/debian/changelog
index 7d909c3..9960544 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 xserver-xorg-video-intel (2:2.6.3-1) UNRELEASED; urgency=low
 
   * New upstream release.
++ doesn't FTBFS with the new libdrm (closes: #523125)
   * Bump build-dep on libdrm-dev to 2.4.5.
 
  -- Julien Cristau jcris...@debian.org  Wed, 08 Apr 2009 21:27:41 +0100


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org

xserver-xorg-video-intel: Changes to 'debian-unstable'

[Julien Cristau]

 debian/changelog  |8 
 src/i830_quirks.c |3 ---
 2 files changed, 8 insertions(+), 3 deletions(-)

New commits:
commit a4e5f5a17028f58872d1ab70356525965788
Author: Julien Cristau jcris...@debian.org
Date:   Thu Jan 22 03:49:11 2009 +0100

Prepare changelog for upload

diff --git a/debian/changelog b/debian/changelog
index 0bc4e6c..c6ed098 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+xserver-xorg-video-intel (2:2.3.2-2+lenny6) unstable; urgency=high
+
+  * Remove the Cappuccino SlimPRO SP625F quirk added in -2+lenny5.
+There are machines with the same subdevice ids and an LVDS output
+(closes: #512595).  Thanks, Kushal Koolwal!
+
+ -- Julien Cristau jcris...@debian.org  Thu, 22 Jan 2009 03:49:01 +0100
+
 xserver-xorg-video-intel (2:2.3.2-2+lenny5) unstable; urgency=low
 
   * Cherry-pick some more patches from upstream git:

commit be77a9b0d5dde069f0143cad24a8a7fe47d4aed6
Author: Zhenyu Wang zhenyu.z.w...@intel.com
Date:   Tue Dec 9 19:19:58 2008 +0800

Remove Cappuccino SlimPRO SP625F 855GM LVDS quirk

It breaks bug #18462 on IBM 855GM with same subdevice ids.
(cherry picked from commit 0fe61b0b7e3bbe8ced1b0ad2be72c438d200c64b)

diff --git a/src/i830_quirks.c b/src/i830_quirks.c
index 4f8a921..4fdae17 100644
--- a/src/i830_quirks.c
+++ b/src/i830_quirks.c
@@ -220,9 +220,6 @@ static i830_quirk i830_quirk_list[] = {
 { PCI_CHIP_I965_GM, 0xa0a0, SUBSYS_ANY, quirk_ignore_lvds },
 { PCI_CHIP_I965_GM, 0x8086, 0x1999, quirk_ignore_lvds },
 
-/* Cappuccino SlimPRO SP625F, bz #11368 */
-{ PCI_CHIP_I855_GM, 0x8086, 0x3582, quirk_ignore_lvds },
-
 /* Apple Mac mini has no lvds, but macbook pro does */
 { PCI_CHIP_I945_GM, 0x8086, 0x7270, quirk_mac_mini },
 


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org

xserver-xorg-video-intel: Changes to 'debian-unstable'

[Julien Cristau]

 debian/changelog   |   47 +
 debian/patches/01_gen_pci_ids.diff |4 -
 src/common.h   |7 +
 src/i810_driver.c  |4 +
 src/i810_reg.h |6 +
 src/i830.h |9 ++
 src/i830_accel.c   |9 ++
 src/i830_crt.c |   11 +++
 src/i830_dri.c |  130 ++---
 src/i830_driver.c  |   50 +++---
 src/i830_quirks.c  |7 +
 src/i830_xaa.c |   10 +-
 12 files changed, 208 insertions(+), 86 deletions(-)

New commits:
commit c05f17270cf22fdfa50d4b53f19c60df687d72f0
Author: Julien Cristau [EMAIL PROTECTED]
Date:   Mon Oct 20 20:30:45 2008 +0200

Prepare changelog for upload

diff --git a/debian/changelog b/debian/changelog
index 92dfaa3..0bc4e6c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xserver-xorg-video-intel (2:2.3.2-2+lenny5) UNRELEASED; urgency=low
+xserver-xorg-video-intel (2:2.3.2-2+lenny5) unstable; urgency=low
 
   * Cherry-pick some more patches from upstream git:
 - Disable display clock gating for 4 series chips
@@ -43,7 +43,7 @@ xserver-xorg-video-intel (2:2.3.2-2+lenny5) UNRELEASED; 
urgency=low
   * Adjust patch 01_gen_pci_ids.diff to exclude G41 as well, so vesa is chosen
 by default.  The intel driver can still be selected in xorg.conf.
 
- -- Julien Cristau [EMAIL PROTECTED]  Sat, 18 Oct 2008 15:41:04 +0200
+ -- Julien Cristau [EMAIL PROTECTED]  Mon, 20 Oct 2008 20:28:39 +0200
 
 xserver-xorg-video-intel (2:2.3.2-2+lenny4) unstable; urgency=low
 

commit dd96340f33f1194589b0759363239911b81a9b28
Author: Keith Packard [EMAIL PROTECTED]
Date:   Sun Oct 19 13:39:04 2008 -0700

Remove accidental 'return;' left at the top of I830DRIInitBuffers

I was testing the behaviour of the XAA-based DRI buffer drawing code for
tiled buffers and accidentally left I830DRIInitBuffers disabled.

Signed-off-by: Keith Packard [EMAIL PROTECTED]
(cherry picked from commit c25437a69490b09acff335a81a38aa540f0822f5)

diff --git a/src/i830_dri.c b/src/i830_dri.c
index 5c9344e..f7fe2d2 100644
--- a/src/i830_dri.c
+++ b/src/i830_dri.c
@@ -1162,7 +1162,6 @@ I830DRIInitBuffers(WindowPtr pWin, RegionPtr prgn, CARD32 
index)
int nbox;
int buffer, first_buffer, last_buffer;
 
-   return;
if (I810_DEBUG  DEBUG_VERBOSE_DRI)
   ErrorF(I830DRIInitBuffers\n);
 

commit 1d1b63b1f60f9dc72fa8d17e5601b588a120cf0e
Author: Julien Cristau [EMAIL PROTECTED]
Date:   Sat Oct 18 15:53:34 2008 +0200

Update changelog for cherry-picked patches

Also disable G41 in 01_gen_pci_ids.diff.

diff --git a/debian/changelog b/debian/changelog
index 556eeed..92dfaa3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,50 @@
+xserver-xorg-video-intel (2:2.3.2-2+lenny5) UNRELEASED; urgency=low
+
+  * Cherry-pick some more patches from upstream git:
+- Disable display clock gating for 4 series chips
+- Pipe A force quirk for Toshiba Satellite A30.
+- i830: Fix timer leak
+  TimerCancel just cancels the timer: it still leaves the TimerRec intact
+  and unfreed.
+- Disable render standby
+  Render standby is known to cause possible hang issue on some mobile
+  chips, so always disable it.
+- Add support for G41 chipset
+  G41 is another 4 series chipset like G45/43.
+- Add Cappuccino SlimPRO SP625F to no LVDS quirks list
+  Looks like this platform might contain VBTs that indicate an LFP is
+  present even though it isn't.  Intended to fix bz #11368.
+- Add TV out quirk for HP Compaq nx6110
+  Adds a TV out quirk for HP Compaq nx6110.  Fixes bz #17683.
+- Do force CRT detect sequence twice on 4 series chipset
+- Render register clock gating disable fix on 4 series chipset
+- Disable frame buffer compression by default for GM965.
+  We haven't found a way to make FBC work reliably with GM965 yet, (it
+  often fails to notice CPU writes). This appears to be a specific problem
+  with this device, (as we haven't gotten similar bug reports for
+  subsequent devices such as GM45). So FBC is now disabled by default for
+  GM965 but can still be enabled with the FrameBufferCompression option
+  for experimenting/debugging
+- Fix broken stolen memory counting on G4X (closes: #502387).
+  On the GM45 we were assuming too little stolen memory (mostly harmless,
+  except when it wasn't, until the AGP fix), and on the G45 we were
+  assuming too much stolen memory, which was quite harmful when we touched
+  the page that didn't get mapped.
+- XAA tiling support was mis-computing adjusted pitch (4 instead of 2)
+  This may well explain why XAA never worked well on tiled front buffers;
+  tiled buffers require a different pitch programming on 965 than
+  non-tiled buffers, in dwords 

xserver-xorg-video-intel: Changes to 'debian-unstable'

[Julien Cristau]

 debian/changelog|4 ++--
 debian/patches/02_965_no_exa_composite.diff |2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 428b34b3f2d763177f0e4ae87de5e86a2cc16ef8
Author: Julien Cristau [EMAIL PROTECTED]
Date:   Fri Sep 5 02:56:32 2008 +0200

Prepare changelog for upload

diff --git a/debian/changelog b/debian/changelog
index c2f5f9e..556eeed 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xserver-xorg-video-intel (2:2.3.2-2+lenny4) UNRELEASED; urgency=low
+xserver-xorg-video-intel (2:2.3.2-2+lenny4) unstable; urgency=low
 
   * Kill 02_xaa_by_default_on_i965.diff.  Switching to XAA breaks Xvideo,
 which is Not Good™.
@@ -7,7 +7,7 @@ xserver-xorg-video-intel (2:2.3.2-2+lenny4) UNRELEASED; 
urgency=low
 i965+ to hopefully avoid the font rendering issues reported in #451791 and
 friends.
 
- -- Julien Cristau [EMAIL PROTECTED]  Wed, 03 Sep 2008 19:21:44 +0200
+ -- Julien Cristau [EMAIL PROTECTED]  Fri, 05 Sep 2008 02:55:54 +0200
 
 xserver-xorg-video-intel (2:2.3.2-2+lenny3) unstable; urgency=low
 

commit 9f223623fa4a5666d8045f89485c0760ff9ab84e
Author: Julien Cristau [EMAIL PROTECTED]
Date:   Fri Sep 5 02:52:31 2008 +0200

Fix typos

diff --git a/debian/patches/02_965_no_exa_composite.diff 
b/debian/patches/02_965_no_exa_composite.diff
index 7f49894..2a79c7a 100644
--- a/debian/patches/02_965_no_exa_composite.diff
+++ b/debian/patches/02_965_no_exa_composite.diff
@@ -48,7 +48,7 @@ Index: xserver-xorg-video-intel/src/i830_driver.c
 +   if (xf86GetOptValBool(pI830-Options, OPTION_RENDERACCEL,
 +   pI830-render_accel))
 + from = X_CONFIG;
-+   xf86DrvMsg(pScrn-scrn_index, from, %sabling EXA render 
acceleration\n
++   xf86DrvMsg(pScrn-scrnIndex, from, %sabling EXA render 
acceleration\n,
 +pI830-render_accel ? En : Dis);
 +   }
 +


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]

xserver-xorg-video-intel: Changes to 'debian-unstable'

[Julien Cristau]

 debian/changelog  |   11 +++
 debian/patches/02_965_no_exa_composite.diff   |   87 ++
 debian/patches/02_xaa_by_default_on_i965.diff |   21 --
 debian/patches/series |2 
 4 files changed, 99 insertions(+), 22 deletions(-)

New commits:
commit f63c0db13aede250961ebe351b58a36cd2d83b4d
Author: Julien Cristau [EMAIL PROTECTED]
Date:   Wed Sep 3 19:25:57 2008 +0200

Another try at working around the 965 rendering bug

* Kill 02_xaa_by_default_on_i965.diff.  Switching to XAA breaks Xvideo,
  which is Not Good™.
* New patch 02_965_no_exa_composite.diff: add a RenderAccel option, to
  control whether EXA composite acceleration is enabled.  Default to off on
  i965+ to hopefully avoid the font rendering issues reported in #451791 and
  friends.

diff --git a/debian/changelog b/debian/changelog
index 3d66007..c2f5f9e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+xserver-xorg-video-intel (2:2.3.2-2+lenny4) UNRELEASED; urgency=low
+
+  * Kill 02_xaa_by_default_on_i965.diff.  Switching to XAA breaks Xvideo,
+which is Not Good™.
+  * New patch 02_965_no_exa_composite.diff: add a RenderAccel option, to
+control whether EXA composite acceleration is enabled.  Default to off on
+i965+ to hopefully avoid the font rendering issues reported in #451791 and
+friends.
+
+ -- Julien Cristau [EMAIL PROTECTED]  Wed, 03 Sep 2008 19:21:44 +0200
+
 xserver-xorg-video-intel (2:2.3.2-2+lenny3) unstable; urgency=low
 
   [ Brice Goglin ]
diff --git a/debian/patches/02_965_no_exa_composite.diff 
b/debian/patches/02_965_no_exa_composite.diff
new file mode 100644
index 000..7f49894
--- /dev/null
+++ b/debian/patches/02_965_no_exa_composite.diff
@@ -0,0 +1,87 @@
+From a0ed2f2b652ba077d7638a6e5b5bd9fa99318c5d Mon Sep 17 00:00:00 2001
+From: Julien Cristau [EMAIL PROTECTED]
+Date: Fri, 29 Aug 2008 19:10:57 +0200
+Subject: [PATCH] Add a renderaccel option, to toggle composite acceleration
+
+Disable it by default on 965+
+
+Index: xserver-xorg-video-intel/src/i830.h
+===
+--- xserver-xorg-video-intel.orig/src/i830.h
 xserver-xorg-video-intel/src/i830.h
+@@ -486,6 +486,7 @@
+Bool useEXA;
+Bool noAccel;
+Bool SWCursor;
++   Bool render_accel;
+ #ifdef I830_USE_XAA
+XAAInfoRecPtr AccelInfoRec;
+ 
+Index: xserver-xorg-video-intel/src/i830_driver.c
+===
+--- xserver-xorg-video-intel.orig/src/i830_driver.c
 xserver-xorg-video-intel/src/i830_driver.c
+@@ -317,6 +317,7 @@
+ #ifdef INTEL_XVMC
+OPTION_XVMC,
+ #endif
++   OPTION_RENDERACCEL,
+ } I830Opts;
+ 
+ static OptionInfoRec I830Options[] = {
+@@ -345,6 +346,7 @@
+ #ifdef INTEL_XVMC
+{OPTION_XVMC,  XvMC, OPTV_BOOLEAN,   {0},TRUE},
+ #endif
++   {OPTION_RENDERACCEL, RenderAccel,OPTV_BOOLEAN,   {0},TRUE},
+{-1,   NULL,   OPTV_NONE,  {0},FALSE}
+ };
+ /* *INDENT-ON* */
+@@ -1583,6 +1585,17 @@
+ pI830-useEXA ? EXA : XAA);
+}
+ 
++   if (pI830-useEXA) {
++   pI830-render_accel = !IS_I965G(pI830);
++   from = X_DEFAULT;
++
++   if (xf86GetOptValBool(pI830-Options, OPTION_RENDERACCEL,
++   pI830-render_accel))
++ from = X_CONFIG;
++   xf86DrvMsg(pScrn-scrn_index, from, %sabling EXA render 
acceleration\n
++pI830-render_accel ? En : Dis);
++   }
++
+if (xf86ReturnOptValBool(pI830-Options, OPTION_SW_CURSOR, FALSE)) {
+   pI830-SWCursor = TRUE;
+}
+Index: xserver-xorg-video-intel/src/i830_exa.c
+===
+--- xserver-xorg-video-intel.orig/src/i830_exa.c
 xserver-xorg-video-intel/src/i830_exa.c
+@@ -556,6 +556,10 @@
+   pI830-EXADriverPtr-Composite = i965_composite;
+   pI830-EXADriverPtr-DoneComposite = i830_done_composite;
+ }
++if (!pI830-render_accel) {
++  pI830-EXADriverPtr-CheckComposite = NULL;
++  pI830-EXADriverPtr-PrepareComposite = NULL;
++}
+ #if EXA_VERSION_MINOR = 2
+ pI830-EXADriverPtr-PixmapIsOffscreen = i830_exa_pixmap_is_offscreen;
+ #endif
+Index: xserver-xorg-video-intel/man/intel.man
+===
+--- xserver-xorg-video-intel.orig/man/intel.man
 xserver-xorg-video-intel/man/intel.man
+@@ -90,6 +90,10 @@
+ .BI Option \*qDRI\*q \*q boolean \*q
+ Disable or enable DRI support.
+ Default: DRI is enabled for configurations where it is supported.
++.TP
++.BI Option \*qRenderAccel\*q \*q boolean \*q
++This option controls whether EXA composite acceleration is enabled.
++Default: disabled on i965 and higher.
+ 
+ .PP
+ The following driver
diff --git a/debian/patches/02_xaa_by_default_on_i965.diff 
b/debian/patches/02_xaa_by_default_on_i965.diff
deleted file mode 

xserver-xorg-video-intel: Changes to 'debian-unstable'

[Julien Cristau]

 debian/changelog  |5 +++--
 debian/patches/02_xaa_by_default_on_i965.diff |5 -
 2 files changed, 7 insertions(+), 3 deletions(-)

New commits:
commit 2efa771733d71518dd17e511c7843b8be453d613
Author: Julien Cristau [EMAIL PROTECTED]
Date:   Tue Aug 26 16:55:00 2008 +0200

Prepare changelog for upload

diff --git a/debian/changelog b/debian/changelog
index 6375238..3d66007 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,12 @@
-xserver-xorg-video-intel (2:2.3.2-2+lenny3) UNRELEASED; urgency=low
+xserver-xorg-video-intel (2:2.3.2-2+lenny3) unstable; urgency=low
 
+  [ Brice Goglin ]
   * Add 02_xaa_by_default_on_i965.diff to switch back to XAA on
 i965 by default to avoid many rendering problems, closes: #451791.
   * Drop G45 PCI ids from intel.ids so that vesa is autoloaded by
 default for these new boards for now.
 
- -- Brice Goglin [EMAIL PROTECTED]  Sun, 24 Aug 2008 18:14:11 +0200
+ -- Julien Cristau [EMAIL PROTECTED]  Tue, 26 Aug 2008 16:54:07 +0200
 
 xserver-xorg-video-intel (2:2.3.2-2+lenny2) unstable; urgency=low
 

commit 8128b80c66aca8d8309ab57405b0ff2c8e161353
Author: Julien Cristau [EMAIL PROTECTED]
Date:   Tue Aug 26 16:52:00 2008 +0200

Add author information to 02_xaa_by_default_on_i965.diff

diff --git a/debian/patches/02_xaa_by_default_on_i965.diff 
b/debian/patches/02_xaa_by_default_on_i965.diff
index b1ee5a4..bfbbdf5 100644
--- a/debian/patches/02_xaa_by_default_on_i965.diff
+++ b/debian/patches/02_xaa_by_default_on_i965.diff
@@ -1,7 +1,10 @@
+From: Brice Goglin [EMAIL PROTECTED]
+Subject: Default to XAA on i965
+
 Default to XAA on i965 for now since many people have
 rendering problems with fonts or so.
 
-See bug #451791
+See Debian bug #451791
 
 diff --git a/src/i830_driver.c b/src/i830_driver.c
 index 6121b42..36dcbb5 100644


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]

xserver-xorg-video-intel: Changes to 'debian-unstable'

[Brice Goglin]

 debian/changelog  |9 +
 debian/patches/01_gen_pci_ids.diff|4 +++-
 debian/patches/02_xaa_by_default_on_i965.diff |   18 ++
 debian/patches/series |1 +
 src/Makefile.in   |2 +-
 5 files changed, 32 insertions(+), 2 deletions(-)

New commits:
commit bd9be2a70d5e2948ad5ab5c027d511f36d00f4a2
Author: Brice Goglin [EMAIL PROTECTED]
Date:   Sun Aug 24 18:19:54 2008 +0200

Drop G45 PCI ids from intel.ids

so that vesa is autoloaded by default for these new boards for now.

diff --git a/debian/changelog b/debian/changelog
index acdd982..6375238 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,8 +2,10 @@ xserver-xorg-video-intel (2:2.3.2-2+lenny3) UNRELEASED; 
urgency=low
 
   * Add 02_xaa_by_default_on_i965.diff to switch back to XAA on
 i965 by default to avoid many rendering problems, closes: #451791.
+  * Drop G45 PCI ids from intel.ids so that vesa is autoloaded by
+default for these new boards for now.
 
- -- Brice Goglin [EMAIL PROTECTED]  Sun, 24 Aug 2008 17:03:42 +0200
+ -- Brice Goglin [EMAIL PROTECTED]  Sun, 24 Aug 2008 18:14:11 +0200
 
 xserver-xorg-video-intel (2:2.3.2-2+lenny2) unstable; urgency=low
 
diff --git a/debian/patches/01_gen_pci_ids.diff 
b/debian/patches/01_gen_pci_ids.diff
index ae8f0c3..7b57457 100644
--- a/debian/patches/01_gen_pci_ids.diff
+++ b/debian/patches/01_gen_pci_ids.diff
@@ -1,3 +1,5 @@
+Drop G45 pci.ids for now.
+
 Index: xserver-xorg-video-intel/src/Makefile.am
 ===
 --- xserver-xorg-video-intel.orig/src/Makefile.am
@@ -11,4 +13,4 @@ Index: xserver-xorg-video-intel/src/Makefile.am
 +pcidata_DATA = intel.ids
 +
 +intel.ids : common.h
-+  awk '/^#define PCI_CHIP/ {print $$3 }' $(srcdir)/common.h | sed 
's/^0x/8086/'  intel.ids
++  awk '/^#define PCI_CHIP/ {print $$3 }' $(srcdir)/common.h | grep -vE 
'0x2A42|0x2E02|0x2E22|0x2E12' | sed 's/^0x/8086/'  intel.ids
diff --git a/src/Makefile.in b/src/Makefile.in
index 638ffef..9f7842e 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -931,7 +931,7 @@ uninstall-local:
(cd $(DESTDIR)$(intel_drv_ladir)  rm -f i810_drv.so)
 
 intel.ids : common.h
-   awk '/^#define PCI_CHIP/ {print $$3 }' $(srcdir)/common.h | sed 
's/^0x/8086/'  intel.ids
+   awk '/^#define PCI_CHIP/ {print $$3 }' $(srcdir)/common.h | grep -vE 
'0x2A42|0x2E02|0x2E22|0x2E12' | sed 's/^0x/8086/'  intel.ids
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:

commit c6b0c572248ce38d0be0deffdeb2827ed00b54cc
Author: Brice Goglin [EMAIL PROTECTED]
Date:   Sun Aug 24 17:04:31 2008 +0200

Add 02_xaa_by_default_on_i965.diff

diff --git a/debian/changelog b/debian/changelog
index 509feb8..acdd982 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xserver-xorg-video-intel (2:2.3.2-2+lenny3) UNRELEASED; urgency=low
+
+  * Add 02_xaa_by_default_on_i965.diff to switch back to XAA on
+i965 by default to avoid many rendering problems, closes: #451791.
+
+ -- Brice Goglin [EMAIL PROTECTED]  Sun, 24 Aug 2008 17:03:42 +0200
+
 xserver-xorg-video-intel (2:2.3.2-2+lenny2) unstable; urgency=low
 
   * Revert the quirk for all 855GM chipsets, as it regresses some users
diff --git a/debian/patches/02_xaa_by_default_on_i965.diff 
b/debian/patches/02_xaa_by_default_on_i965.diff
new file mode 100644
index 000..b1ee5a4
--- /dev/null
+++ b/debian/patches/02_xaa_by_default_on_i965.diff
@@ -0,0 +1,18 @@
+Default to XAA on i965 for now since many people have
+rendering problems with fonts or so.
+
+See bug #451791
+
+diff --git a/src/i830_driver.c b/src/i830_driver.c
+index 6121b42..36dcbb5 100644
+--- a/src/i830_driver.c
 b/src/i830_driver.c
+@@ -1561,7 +1561,7 @@ I830PreInit(ScrnInfoPtr pScrn, int flags)
+ */
+if (!pI830-noAccel) {
+ #ifdef I830_USE_EXA
+-   pI830-useEXA = TRUE;
++   pI830-useEXA = IS_I965G(pI830) ? FALSE : TRUE;
+ #else
+pI830-useEXA = FALSE;
+ #endif
diff --git a/debian/patches/series b/debian/patches/series
index b55d79f..6ed6820 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 01_gen_pci_ids.diff
+02_xaa_by_default_on_i965.diff


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]