xserver-xorg-video-intel: Changes to 'debian-unstable'
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 <bgoglin@debian.org>
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 <bgoglin@debian.org> Sun, 24 Aug 2008 17:03:42 +0200
+ -- Brice Goglin <bgoglin@debian.org> 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 <bgoglin@debian.org>
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 <bgoglin@debian.org> 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 0000000..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
Reply to: