debian/changelog | 9 +++++++ debian/patches/105_sandybridge_dri_disable.patch | 26 +++++++++++++++++++++++ debian/patches/series | 1 3 files changed, 36 insertions(+)
New commits: commit cf01cb003a84a0bc04ff61f0a207c1d49ea68fc9 Author: Robert Hooker <[email protected]> Date: Thu Sep 23 20:43:36 2010 -0400 Disable non-functional DRI on Sandybridge for maverick. diff --git a/debian/changelog b/debian/changelog index 60ac975..f8b981c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +xserver-xorg-video-intel (2:2.12.0-1ubuntu5) maverick; urgency=low + + * Disable DRI on Sandybridge chipsets. Support for them will not be released + until the Q42010 Intel releases, which will not be pulled into maverick. + Without this change, all 3D apps on these devices cause hangs. + (LP: #639667) + + -- Robert Hooker <[email protected]> Thu, 23 Sep 2010 20:03:59 -0400 + xserver-xorg-video-intel (2:2.12.0-1ubuntu4) maverick; urgency=low * debian/patches/101_copy-fb.patch: Explicitly disable copyfb functionality diff --git a/debian/patches/105_sandybridge_dri_disable.patch b/debian/patches/105_sandybridge_dri_disable.patch new file mode 100644 index 0000000..e27e8d2 --- /dev/null +++ b/debian/patches/105_sandybridge_dri_disable.patch @@ -0,0 +1,26 @@ +From 30cc87d498285a77127b7aba1381ef878ebe632a Mon Sep 17 00:00:00 2001 +From: Robert Hooker <[email protected]> +Date: Thu, 23 Sep 2010 20:01:24 -0400 +Subject: [PATCH] Disable non-functional DRI completely on Sandybridge. + +Revert after Intel 2010Q4 release that will support it. +--- + src/i830_driver.c | 2 ++ + 1 files changed, 2 insertions(+), 0 deletions(-) + +diff --git a/src/i830_driver.c b/src/i830_driver.c +index b8e0c0b..c9072d4 100644 +--- a/src/i830_driver.c ++++ b/src/i830_driver.c +@@ -1037,6 +1037,8 @@ I830ScreenInit(int scrnIndex, ScreenPtr screen, int argc, char **argv) + scrn->videoRam = device->regions[fb_bar].size / 1024; + + #ifdef DRI2 ++ if (IS_GEN6(intel)) ++ intel->directRenderingType = DRI_DISABLED; + if (intel->directRenderingType == DRI_NONE + && I830DRI2ScreenInit(screen)) + intel->directRenderingType = DRI_DRI2; +-- +1.7.2 + diff --git a/debian/patches/series b/debian/patches/series index e98f23d..12be815 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -2,3 +2,4 @@ 102-disable-page-flipping-v2.patch 103-mbp-backlight-support.patch 104_sandybridge_id_update.patch +105_sandybridge_dri_disable.patch -- To UNSUBSCRIBE, email to [email protected] with a subject of "unsubscribe". Trouble? Contact [email protected] Archive: http://lists.debian.org/[email protected]
