xorg-server: Changes to 'ubuntu'
debian/changelog | 25 +++
debian/patches/165_fedora_xserver-1.5.0-xaa-option-inversion.patch | 73 ++++++++++
debian/patches/series | 1
3 files changed, 99 insertions(+)
New commits:
commit 4e54495f43fbc13ab30d18e7ad75dedf4590272a
Author: Bryce Harrington <bryce@bryce@bryceharrington.org>
Date: Mon Apr 21 12:37:55 2008 -0700
Adding XAA Option Inversion patch (#182038)
diff --git a/debian/changelog b/debian/changelog
index c61be9a..07266b1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,28 @@
+xorg-server (2:1.4.1~git20080131-1ubuntu9) hardy; urgency=low
+
+ * debian/patches/series,
+ debian/patches/165_fedora_xserver-1.5.0-xaa-option-inversion.patch:
+ - Turn on patch included in previous commit - obviously accidentially
+ forgotten.
+ - Now that its really enabled, make it apply to 1.4.1 code base
+ accordingly. (LP: #182038)
+
+ -- Alexander Sack <asac@ubuntu.com> Tue, 15 Apr 2008 18:23:51 +0200
+
+xorg-server (2:1.4.1~git20080131-1ubuntu8) hardy; urgency=low
+
+ * debian/patches/165_fedora_xserver-1.5.0-xaa-option-inversion.patch:
+ - Turn XAA Offscreen Pixmaps off by default, and use
+ XaaOffscreenPixmaps "true" to turn them on. This setting was an
+ early pre-EXA HW optimization attempt that didn't pan out; upstream is
+ deprecating XAA in favor of EXA generally, and for situations where
+ XAA is still in use recommends NOT using this optimization hack, since
+ they found it often just made performance worse, and sometimes created
+ visualization bugs. People wishing to gain added performance should be
+ experimenting with EXA anyway, not this setting. (closes LP: #182038)
+
+ -- Bryce Harrington <bryce@ubuntu.com> Mon, 21 Apr 2008 12:30:53 -0700
+
xorg-server (2:1.4.1~git20080131-1ubuntu7) hardy; urgency=low
* 159_xkb_default_to_null.diff:
diff --git a/debian/patches/165_fedora_xserver-1.5.0-xaa-option-inversion.patch b/debian/patches/165_fedora_xserver-1.5.0-xaa-option-inversion.patch
new file mode 100644
index 0000000..bd9227b
--- /dev/null
+++ b/debian/patches/165_fedora_xserver-1.5.0-xaa-option-inversion.patch
@@ -0,0 +1,73 @@
+From a01ca030c7a1f38e411281d888f0acf2c3fb40f3 Mon Sep 17 00:00:00 2001
+From: Adam Jackson <ajax@redhat.com>
+Date: Thu, 13 Mar 2008 13:38:02 -0400
+Subject: [PATCH] Disable XAA offscreen pixmaps by default.
+
+Say Option "XaaOffscreenPixmaps" to turn them back on.
+---
+ hw/xfree86/xaa/xaaInitAccel.c | 8 ++++++--
+ 1 file changed, 6 insertions(+), 2 deletions(-)
+
+Index: xorg-server-1.4.1~git20080131/hw/xfree86/xaa/xaaInitAccel.c
+===================================================================
+--- xorg-server-1.4.1~git20080131.orig/hw/xfree86/xaa/xaaInitAccel.c
++++ xorg-server-1.4.1~git20080131/hw/xfree86/xaa/xaaInitAccel.c
+@@ -38,17 +38,18 @@
+ XAAOPT_CPU_TO_SCREEN_COL_EXP_FILL,
+ XAAOPT_SCANLINE_CPU_TO_SCREEN_COL_EXP_FILL,
+ XAAOPT_SCREEN_TO_SCREEN_COL_EXP_FILL,
+ XAAOPT_IMAGE_WRITE_RECT,
+ XAAOPT_SCANLINE_IMAGE_WRITE_RECT,
+ XAAOPT_WRITE_BITMAP,
+ XAAOPT_WRITE_PIXMAP,
+ XAAOPT_PIXMAP_CACHE,
+- XAAOPT_OFFSCREEN_PIXMAPS
++ XAAOPT_OFFSCREEN_PIXMAPS,
++ XAAOPT_HAS_DUMB_INVERTED_OPTION_SENSE
+ } XAAOpts;
+
+ static const OptionInfoRec XAAOptions[] = {
+ {XAAOPT_SCREEN_TO_SCREEN_COPY, "XaaNoScreenToScreenCopy",
+ OPTV_BOOLEAN, {0}, FALSE },
+ {XAAOPT_SOLID_FILL_RECT, "XaaNoSolidFillRect",
+ OPTV_BOOLEAN, {0}, FALSE },
+ {XAAOPT_SOLID_FILL_TRAP, "XaaNoSolidFillTrap",
+@@ -84,16 +85,18 @@
+ {XAAOPT_WRITE_BITMAP, "XaaNoWriteBitmap",
+ OPTV_BOOLEAN, {0}, FALSE },
+ {XAAOPT_WRITE_PIXMAP, "XaaNoWritePixmap",
+ OPTV_BOOLEAN, {0}, FALSE },
+ {XAAOPT_PIXMAP_CACHE, "XaaNoPixmapCache",
+ OPTV_BOOLEAN, {0}, FALSE },
+ {XAAOPT_OFFSCREEN_PIXMAPS, "XaaNoOffscreenPixmaps",
+ OPTV_BOOLEAN, {0}, FALSE },
++ {XAAOPT_HAS_DUMB_INVERTED_OPTION_SENSE, "XaaOffscreenPixmaps",
++ OPTV_BOOLEAN, {0}, FALSE },
+ { -1, NULL,
+ OPTV_NONE, {0}, FALSE }
+ };
+
+ static MODULESETUPPROTO(xaaSetup);
+
+ static XF86ModuleVersionInfo xaaVersRec =
+ {
+@@ -537,17 +540,18 @@
+ else if(HaveScanlineImageWriteRect)
+ xf86ErrorF("\tScanline Image Writes\n");
+
+ }
+
+ #define XAAMSG(s) do { if (serverGeneration == 1) xf86ErrorF(s); } while (0)
+
+ if((infoRec->Flags & OFFSCREEN_PIXMAPS) && HaveScreenToScreenCopy &&
+- !xf86IsOptionSet(options, XAAOPT_OFFSCREEN_PIXMAPS)) {
++ xf86IsOptionSet(options, XAAOPT_HAS_DUMB_INVERTED_OPTION_SENSE))
++ {
+ XAAMSG("\tOffscreen Pixmaps\n");
+ } else {
+ infoRec->Flags &= ~OFFSCREEN_PIXMAPS;
+ }
+
+
+ /************** Mid Level *************/
+
diff --git a/debian/patches/series b/debian/patches/series
index c7040ea..dda7722 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -59,3 +59,4 @@
162_cve-2007-6429.diff
163_fix_untrusted_access.diff
164_fix_context_sharing.diff
+165_fedora_xserver-1.5.0-xaa-option-inversion.patch
Reply to: