xserver-xorg-video-intel: Changes to 'debian-lenny'
debian/changelog | 8 ++++++++
debian/patches/03_sdvo_lvds.diff | 38 ++++++++++++++++++++++++++++++++++++++
debian/patches/series | 1 +
3 files changed, 47 insertions(+)
New commits:
commit 273c7f54b138560473597a1893d0f987b6d884d8
Author: Julien Cristau <jcristau@debian.org>
Date: Tue May 11 15:51:20 2010 +0200
Add support for SDVO LVDS.
Backport from upstream git support for SDVO LVDS outputs, as found on
asus eeetop (ET1602). Thanks to Eric Estievenart for the patch (closes:
#520018).
diff --git a/debian/changelog b/debian/changelog
index c6ed098..90fb519 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+xserver-xorg-video-intel (2:2.3.2-2+lenny7) UNRELEASED; urgency=low
+
+ * Backport from upstream git support for SDVO LVDS outputs, as found on asus
+ eeetop (ET1602). Thanks to Eric Estievenart for the patch
+ (closes: #520018).
+
+ -- Julien Cristau <jcristau@debian.org> Tue, 11 May 2010 15:49:32 +0200
+
xserver-xorg-video-intel (2:2.3.2-2+lenny6) unstable; urgency=high
* Remove the Cappuccino SlimPRO SP625F quirk added in -2+lenny5.
diff --git a/debian/patches/03_sdvo_lvds.diff b/debian/patches/03_sdvo_lvds.diff
new file mode 100644
index 0000000..45854fd
--- /dev/null
+++ b/debian/patches/03_sdvo_lvds.diff
@@ -0,0 +1,38 @@
+Subject: Bug#520018: xserver-xorg-video-intel: X won't start on 945GME (asus et1602)
+From: Eric Estievenart <eric.estievenart@free.fr>
+
+The inter xorg driver does not work on asus eeetop (ET1602).
+It reports the following error:
+(EE) intel(0): SDVO: No active TMDS outputs (0x4000)
+
+Such a bug has been fixed in more recent xorg releases
+(see for example:
+[1] https://bugs.freedesktop.org/show_bug.cgi?id=11645
+[2] http://cgit.freedesktop.org/xorg/driver/xf86-video-intel/commit/?id=59b0fbb9be880d489374b141f818948a2721a2ef
+The patch described in [2] can be backported with a slight modification to
+xserver-xorg-video-intel 2:2.3.2-2+lenny6,
+(by replacing dev_priv->controlled_output with dev_priv->active_outputs),
+and indeed the X server will start on such hardware.
+
+I think that this patch can be added safely into debian/patches.
+Sincerely.
+
+Index: xserver-xorg-video-intel/src/i830_sdvo.c
+===================================================================
+--- xserver-xorg-video-intel.orig/src/i830_sdvo.c
++++ xserver-xorg-video-intel/src/i830_sdvo.c
+@@ -1320,6 +1320,14 @@
+ dev_priv->active_outputs = SDVO_OUTPUT_RGB1;
+ output->subpixel_order = SubPixelHorizontalRGB;
+ name_prefix="VGA";
++ } else if (dev_priv->caps.output_flags & SDVO_OUTPUT_LVDS0) {
++ dev_priv->active_outputs = SDVO_OUTPUT_LVDS0;
++ output->subpixel_order = SubPixelHorizontalRGB;
++ name_prefix="LVDS";
++ } else if (dev_priv->caps.output_flags & SDVO_OUTPUT_LVDS1) {
++ dev_priv->active_outputs = SDVO_OUTPUT_LVDS1;
++ output->subpixel_order = SubPixelHorizontalRGB;
++ name_prefix="LVDS";
+ }
+ else
+ {
diff --git a/debian/patches/series b/debian/patches/series
index 588e77a..8362dbe 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
01_gen_pci_ids.diff
02_965_no_exa_composite.diff
+03_sdvo_lvds.diff
Reply to: