xserver-xorg-video-intel: Changes to 'ubuntu'
debian/changelog | 7 ++++-
debian/patches/102-disable-page-flipping-v2.patch | 28 ++++++++++++++++++++++
debian/patches/series | 1
3 files changed, 35 insertions(+), 1 deletion(-)
New commits:
commit a2c20984b8792ab39f4164b157e0925d2ca42a28
Author: Robert Hooker <sarvatt@ubuntu.com>
Date: Sat May 29 20:47:29 2010 -0400
Add 102-disable-page-flipping-v2.patch to fix frequent hangs caused by the 2.11 driver.
diff --git a/debian/changelog b/debian/changelog
index 783919d..eb1f14f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
xserver-xorg-video-intel (2:2.11.0-1ubuntu1) maverick; urgency=low
+ [ Christopher James Halse Rogers ]
* Merge from Debian experimental. Remaining Ubuntu changes:
- debian/apport-gpu-error-intel.py, debian/xserver-xorg-video-intel.udev,
debian/xserver-xorg-video-intel:
@@ -16,7 +17,11 @@ xserver-xorg-video-intel (2:2.11.0-1ubuntu1) maverick; urgency=low
At best it's redundant (as the kernel defaults to KMS), at worst it breaks
the ability to disable KMS.
- -- Christopher James Halse Rogers <raof@ubuntu.com> Thu, 27 May 2010 17:14:14 +1000
+ [ Robert Hooker ]
+ * Add 102-disable-page-flipping-v2.patch: Disables page flipping support which
+ is causing frequent hangs, but leaves the events.
+
+ -- Robert Hooker <sarvatt@ubuntu.com> Sat, 29 May 2010 20:41:01 -0400
xserver-xorg-video-intel (2:2.11.0-1) experimental; urgency=low
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..14ed642
--- /dev/null
+++ b/debian/patches/102-disable-page-flipping-v2.patch
@@ -0,0 +1,28 @@
+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 3e44212..d8a316c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
101_copy-fb.patch
+102-disable-page-flipping-v2.patch
Reply to: