debian/changelog | 7 ++++
debian/patches/102-disable-page-flipping-v2.patch | 38 ++++++++++++++++++++++
debian/patches/series | 1
3 files changed, 46 insertions(+)
New commits:
commit a5a908db2be1c1da470f1c1e3f14cb9e4d768947
Author: Christopher James Halse Rogers <christopher.halse.rog...@canonical.com>
Date: Fri Jul 23 11:43:17 2010 +0200
Update changelog
diff --git a/debian/changelog b/debian/changelog
index f519918..0f16d5e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xserver-xorg-video-intel (2:2.12.0-1ubuntu2) maverick; urgency=low
+
+ * Re-add 102-disable-page-flipping-v2.patch. Spate of freeze bugs: recieved.
+ (LP: #609073)
+
+ -- Christopher James Halse Rogers <r...@ubuntu.com> Fri, 23 Jul 2010
11:30:05 +0200
+
xserver-xorg-video-intel (2:2.12.0-1ubuntu1) maverick; urgency=low
* Merge from Debian experimental (LP: #601052). Remaining Ubuntu changes:
commit 3a9d7d67004bc7556b32fde85b6a3dccc0ad8021
Author: Christopher James Halse Rogers <christopher.halse.rog...@canonical.com>
Date: Fri Jul 23 11:42:31 2010 +0200
Un-revert changlog component of previous commit for 2.12.0-1ubuntu1
diff --git a/debian/changelog b/debian/changelog
index 748f226..f519918 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -18,6 +18,9 @@ xserver-xorg-video-intel (2:2.12.0-1ubuntu1) maverick;
urgency=low
the ability to disable KMS.
+ 103-mbp-backlight-support.patch: Enables xrandr backlight control for
macbook's using the mbp_backlight module.
+ * Drop 102-disable-page-flipping-v2.patch: all the upstream bugs mentioned
+ in the patch are closed. If we get a spate of freeze bugs, start looking
+ here.
-- Christopher James Halse Rogers <r...@ubuntu.com> Mon, 19 Jul 2010
16:36:28 +0200
commit 3337454150555f9db3ea7af39f5a28625a7a8f58
Author: Christopher James Halse Rogers <christopher.halse.rog...@canonical.com>
Date: Fri Jul 23 11:27:11 2010 +0200
Revert "Re-enable page flipping. It looks like this should work now."
Sadly, this was a lie. Page flipping remains a bag of freeze.
This reverts commit 2e3c12b6e899c320dbf4f27b4568a782d364c4ca.
diff --git a/debian/changelog b/debian/changelog
index f519918..748f226 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -18,9 +18,6 @@ xserver-xorg-video-intel (2:2.12.0-1ubuntu1) maverick;
urgency=low
the ability to disable KMS.
+ 103-mbp-backlight-support.patch: Enables xrandr backlight control for
macbook's using the mbp_backlight module.
- * Drop 102-disable-page-flipping-v2.patch: all the upstream bugs mentioned
- in the patch are closed. If we get a spate of freeze bugs, start looking
- here.
-- Christopher James Halse Rogers <r...@ubuntu.com> Mon, 19 Jul 2010
16:36:28 +0200
diff --git a/debian/patches/102-disable-page-flipping-v2.patch
b/debian/patches/102-disable-page-flipping-v2.patch
new file mode 100644
index 0000000..7f9ee15
--- /dev/null
+++ b/debian/patches/102-disable-page-flipping-v2.patch
@@ -0,0 +1,38 @@
+Description: Disable kernel pageflipping support.
+ There seem to be a number of issues with pageflipping, particularly on
+ Gen 3 hardware.
+ .
+ Some of the required kernel patches which haven't made it upstream are in
+ this thread:
+ http://lists.freedesktop.org/archives/intel-gfx/2010-April/006464.html
+Bug: https://bugs.freedesktop.org/show_bug.cgi?id=28079
+Bug: https://bugs.freedesktop.org/show_bug.cgi?id=27883
+
+diff --git a/src/drmmode_display.c b/src/drmmode_display.c
+index 358baf4..30c9213 100644
+--- a/src/drmmode_display.c
++++ b/src/drmmode_display.c
+@@ -1458,8 +1458,8 @@ Bool drmmode_pre_init(ScrnInfoPtr scrn, int fd, int cpp)
+ sizeof(gp));
+ if (has_flipping) {
+ xf86DrvMsg(scrn->scrnIndex, X_INFO,
+- "Kernel page flipping support detected, enabling\n");
+- intel->use_pageflipping = TRUE;
++ "Kernel page flipping support detected, but forcibly
disabled.\n");
++ intel->use_pageflipping = FALSE;
+ drmmode->flip_count = 0;
+ drmmode->event_context.version = DRM_EVENT_CONTEXT_VERSION;
+ drmmode->event_context.vblank_handler = drmmode_vblank_handler;
+diff --git a/src/i830_dri.c b/src/i830_dri.c
+index 83d953d..a2b7ec2 100644
+--- a/src/i830_dri.c
++++ b/src/i830_dri.c
+@@ -1038,7 +1038,7 @@ Bool I830DRI2ScreenInit(ScreenPtr screen)
+
+ info.CopyRegion = I830DRI2CopyRegion;
+ #if DRI2INFOREC_VERSION >= 4
+- if (intel->use_pageflipping) {
++ if (intel->use_pageflipping || 1) {
+ info.version = 4;
+ info.ScheduleSwap = I830DRI2ScheduleSwap;
+ info.GetMSC = I830DRI2GetMSC;
diff --git a/debian/patches/series b/debian/patches/series
index 2b92675..99cf065 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
101_copy-fb.patch
+102-disable-page-flipping-v2.patch
103-mbp-backlight-support.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/e1ocen4-0000of...@alioth.debian.org
