xserver-xorg-video-intel: Changes to 'ubuntu'
debian/changelog | 6 ++-
debian/patches/108_sandybridge_disable_Xv.patch | 43 ++++++++++++++++++++----
debian/patches/series | 1
3 files changed, 42 insertions(+), 8 deletions(-)
New commits:
commit e4e2b65ace880f13e1a4971bc2ebf812d77265e2
Author: Robert Hooker <sarvatt@ubuntu.com>
Date: Mon Nov 8 11:29:47 2010 -0500
Update changelog.
diff --git a/debian/changelog b/debian/changelog
index 9b50e8c..8e8e83b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,10 @@ xserver-xorg-video-intel (2:2.13.0-1ubuntu1) natty; urgency=low
- 101_copy-fb.patch: Adds feature to driver so Xserver can draw
root windows with no background. This enables smooth boot with
Plymouth.
+ - 105_sandybridge_dri_disable.patch: Disable DRI on Sandybridge until it is
+ working (drop with mesa 7.10).
+ - 108_sandybridge_disable_Xv.patch: Disable Xv on Sandybridge until it is
+ supported. (Drop with intel 2.13.901).
- control: Add Recommends on intel-gpu-tools to xserver-xorg-video-intel
package for use by GPU hang scripts.
- xserver-xorg-video-intel.preinst.in, xserver-xorg-video-intel.postinst.in,
@@ -22,7 +26,7 @@ xserver-xorg-video-intel (2:2.13.0-1ubuntu1) natty; urgency=low
104_sandybridge_id_update.patch: Upstream
106_backport_vblank_on_server_regenerate_fix.patch: Upstream
- -- Robert Hooker <sarvatt@ubuntu.com> Mon, 01 Nov 2010 11:43:22 -0400
+ -- Robert Hooker <sarvatt@ubuntu.com> Mon, 08 Nov 2010 11:27:15 -0500
xserver-xorg-video-intel (2:2.13.0-1) experimental; urgency=low
commit f49ba5988d484e2d0ead54ba8e796bf7c14d428b
Author: Robert Hooker <sarvatt@ubuntu.com>
Date: Mon Nov 8 11:25:54 2010 -0500
Refresh 108_sandybridge_disable_Xv.patch
diff --git a/debian/patches/108_sandybridge_disable_Xv.patch b/debian/patches/108_sandybridge_disable_Xv.patch
index 0fe9f6e..9c3da0c 100644
--- a/debian/patches/108_sandybridge_disable_Xv.patch
+++ b/debian/patches/108_sandybridge_disable_Xv.patch
@@ -1,8 +1,34 @@
-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 {
+From 66596980133c76e2c1e81a6d76b949fb5cdbd1b1 Mon Sep 17 00:00:00 2001
+From: Matthias Hopf <mhopf@suse.de>
+Date: Thu, 30 Sep 2010 12:48:11 +0200
+Subject: [PATCH] Re-add XVideo option, as XVideo on SandyBridge freezes the chip.
+
+---
+ man/intel.man | 5 +++++
+ src/intel_driver.c | 6 +++++-
+ 2 files changed, 10 insertions(+), 1 deletions(-)
+
+diff --git a/man/intel.man b/man/intel.man
+index 31860f2..3f3b6f2 100644
+--- a/man/intel.man
++++ b/man/intel.man
+@@ -187,6 +187,11 @@ performance.
+ .IP
+ Default: enabled.
+ .TP
++.BI "Option \*qXVideo\*q \*q" boolean \*q
++Enable XVideo support.
++.IP
++Default: Enabled, except on SandyBridge
++.TP
+ .BI "Option \*qXvMC\*q \*q" boolean \*q
+ Enable XvMC driver. Current support MPEG2 MC on 915/945 and G33 series.
+ User should provide absolute path to libIntelXvMC.so in XvMCConfig file.
+diff --git a/src/intel_driver.c b/src/intel_driver.c
+index 79c850b..487f5f1 100644
+--- a/src/intel_driver.c
++++ b/src/intel_driver.c
+@@ -107,6 +107,7 @@ typedef enum {
OPTION_DEBUG_FLUSH_BATCHES,
OPTION_DEBUG_FLUSH_CACHES,
OPTION_DEBUG_WAIT,
@@ -10,7 +36,7 @@ index b8e0c0b..8585724 100644
} I830Opts;
static OptionInfoRec I830Options[] = {
-@@ -188,6 +189,7 @@ static OptionInfoRec I830Options[] = {
+@@ -125,6 +126,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},
@@ -18,7 +44,7 @@ index b8e0c0b..8585724 100644
{-1, NULL, OPTV_NONE, {0}, FALSE}
};
/* *INDENT-ON* */
-@@ -1077,7 +1079,9 @@ I830ScreenInit(int scrnIndex, ScreenPtr screen, int argc, char **argv)
+@@ -883,7 +885,9 @@ I830ScreenInit(int scrnIndex, ScreenPtr screen, int argc, char **argv)
* Set this so that the overlay allocation is factored in when
* appropriate.
*/
@@ -29,3 +55,6 @@ index b8e0c0b..8585724 100644
xf86DrvMsg(scrn->scrnIndex,
intel->pEnt->device->videoRam ? X_CONFIG : X_DEFAULT,
+--
+1.6.0.2
+
diff --git a/debian/patches/series b/debian/patches/series
index d3c6ea5..344701c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
101_copy-fb.patch
105_sandybridge_dri_disable.patch
+108_sandybridge_disable_Xv.patch
Reply to: