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 0000000..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 100644
index bfbbdf5..0000000
--- a/debian/patches/02_xaa_by_default_on_i965.diff
+++ /dev/null
@@ -1,21 +0,0 @@
-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 Debian 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 6ed6820..588e77a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,2 @@
01_gen_pci_ids.diff
-02_xaa_by_default_on_i965.diff
+02_965_no_exa_composite.diff
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
