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
