xserver-xorg-video-intel: Changes to 'ubuntu'
debian/changelog | 4 +++
debian/patches/108_sandybridge_disable_Xv.patch | 31 ++++++++++++++++++++++++
debian/patches/series | 1
3 files changed, 36 insertions(+)
New commits:
commit 7ca28b1da50a35388a606a8e7d5272bfa77ca117
Author: Robert Hooker <sarvatt@ubuntu.com>
Date: Mon Oct 4 18:22:26 2010 -0400
Disable XVideo on Sandybridge.
diff --git a/debian/changelog b/debian/changelog
index 6a626fa..6312315 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,10 @@ xserver-xorg-video-intel (2:2.12.0-1ubuntu5.1) maverick; urgency=low
* Add 107-submit-batch-buffers-from-flush-callback-chain.patch:
Fixes a text rendering issue in many applications when compiz is
enabled. Backport of upstream commit 69d65f918. (LP: #644943, #635258)
+ * debian/patches/107_sandybridge_disable_Xv.patch: Disable Xv code
+ on sandybridge generation GPU's only, support does not exist in
+ this driver release and it attempts to use an old code path that
+ causes a GPU hang every time it is used. (LP: #654876)
-- Robert Hooker <robert.hooker@canonical.com> Mon, 04 Oct 2010 10:53:59 -0400
diff --git a/debian/patches/108_sandybridge_disable_Xv.patch b/debian/patches/108_sandybridge_disable_Xv.patch
new file mode 100644
index 0000000..0fe9f6e
--- /dev/null
+++ b/debian/patches/108_sandybridge_disable_Xv.patch
@@ -0,0 +1,31 @@
+diff --git a/src/i830_driver.c b/src/i830_driver.c
+index b8e0c0b..8585724 100644
+--- a/src/i830_driver.c
++++ b/src/i830_driver.c
+@@ -172,6 +172,7 @@ typedef enum {
+ OPTION_DEBUG_FLUSH_BATCHES,
+ OPTION_DEBUG_FLUSH_CACHES,
+ OPTION_DEBUG_WAIT,
++ OPTION_XVIDEO,
+ } I830Opts;
+
+ static OptionInfoRec I830Options[] = {
+@@ -188,6 +189,7 @@ static OptionInfoRec I830Options[] = {
+ {OPTION_DEBUG_FLUSH_BATCHES, "DebugFlushBatches", OPTV_BOOLEAN, {0}, FALSE},
+ {OPTION_DEBUG_FLUSH_CACHES, "DebugFlushCaches", OPTV_BOOLEAN, {0}, FALSE},
+ {OPTION_DEBUG_WAIT, "DebugWait", OPTV_BOOLEAN, {0}, FALSE},
++ {OPTION_XVIDEO, "XVideo", OPTV_BOOLEAN, {0}, FALSE},
+ {-1, NULL, OPTV_NONE, {0}, FALSE}
+ };
+ /* *INDENT-ON* */
+@@ -1077,7 +1079,9 @@ I830ScreenInit(int scrnIndex, ScreenPtr screen, int argc, char **argv)
+ * Set this so that the overlay allocation is factored in when
+ * appropriate.
+ */
+- intel->XvEnabled = TRUE;
++ intel->XvEnabled = xf86ReturnOptValBool(intel->Options,
++ OPTION_XVIDEO,
++ !IS_GEN6(intel));
+
+ xf86DrvMsg(scrn->scrnIndex,
+ intel->pEnt->device->videoRam ? X_CONFIG : X_DEFAULT,
diff --git a/debian/patches/series b/debian/patches/series
index 2fa3dd7..9d0230f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,3 +6,4 @@
105_sandybridge_dri_disable.patch
106_backport_vblank_on_server_regenerate_fix.patch
107-submit-batch-buffers-from-flush-callback-chain.patch
+108_sandybridge_disable_Xv.patch
Reply to: