xorg-server: Changes to 'ubuntu'
debian/changelog | 9 ++++
debian/patches/166_fix_lpl_monitors.diff | 38 ++++++++++++++++++
debian/patches/167_xf86AutoConfig_geode_addition.diff | 17 ++++++++
debian/patches/series | 2
4 files changed, 66 insertions(+)
New commits:
commit dc75a96a5287b89b588cf96c1d6359d38f950e39
Author: Timo Aaltonen <tjaalton@cc.hut.fi>
Date: Tue Apr 22 14:58:45 2008 +0300
167_xf86AutoConfig_geode_addition.diff: Autodetect geode video devices (LP: #219630)
diff --git a/debian/changelog b/debian/changelog
index c6e95a0..db4959d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,8 +2,10 @@ xorg-server (2:1.4.1~git20080131-1ubuntu10) UNRELEASED; urgency=low
* 166_fix_lpl_monitors.diff:
- fix LPL monitors properly (LP: #204065)
+ * 167_xf86AutoConfig_geode_addition.diff:
+ - Autodetect geode video devices (LP: #219630)
- -- Timo Aaltonen <tepsipakki@ubuntu.com> Tue, 22 Apr 2008 10:13:42 +0300
+ -- Timo Aaltonen <tepsipakki@ubuntu.com> Tue, 22 Apr 2008 11:56:55 +0300
xorg-server (2:1.4.1~git20080131-1ubuntu9) hardy; urgency=low
diff --git a/debian/patches/167_xf86AutoConfig_geode_addition.diff b/debian/patches/167_xf86AutoConfig_geode_addition.diff
new file mode 100644
index 0000000..f0cafb7
--- /dev/null
+++ b/debian/patches/167_xf86AutoConfig_geode_addition.diff
@@ -0,0 +1,17 @@
+--- hw/xfree86/common/xf86AutoConfig.c.orig 2008-02-01 05:31:28.000000000 +0200
++++ hw/xfree86/common/xf86AutoConfig.c 2008-04-19 20:05:41.000000000 +0300
+@@ -160,12 +160,13 @@ videoPtrToDriverName(pciVideoPtr info)
+ {
+ /*
+ * things not handled yet:
+- * amd/cyrix/nsc
++ * cyrix/nsc. should be merged into geode anyway.
+ * xgi
+ */
+
+ switch (info->vendor)
+ {
++ case 0x1022: return "geode";
+ case 0x1142: return "apm";
+ case 0xedd8: return "ark";
+ case 0x1a03: return "ast";
diff --git a/debian/patches/series b/debian/patches/series
index 4ba340a..ca38a31 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -61,3 +61,4 @@
164_fix_context_sharing.diff
165_fedora_xserver-1.5.0-xaa-option-inversion.patch
166_fix_lpl_monitors.diff
+167_xf86AutoConfig_geode_addition.diff
commit 9af2c2200557d7725efaf69e8c52d9d7eecc8b71
Author: Timo Aaltonen <tjaalton@cc.hut.fi>
Date: Tue Apr 22 10:19:24 2008 +0300
166_fix_lpl_monitors.diff: fix LPL monitors properly (LP: #204065)
diff --git a/debian/changelog b/debian/changelog
index 07266b1..c6e95a0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xorg-server (2:1.4.1~git20080131-1ubuntu10) UNRELEASED; urgency=low
+
+ * 166_fix_lpl_monitors.diff:
+ - fix LPL monitors properly (LP: #204065)
+
+ -- Timo Aaltonen <tepsipakki@ubuntu.com> Tue, 22 Apr 2008 10:13:42 +0300
+
xorg-server (2:1.4.1~git20080131-1ubuntu9) hardy; urgency=low
* debian/patches/series,
diff --git a/debian/patches/166_fix_lpl_monitors.diff b/debian/patches/166_fix_lpl_monitors.diff
new file mode 100644
index 0000000..06028b2
--- /dev/null
+++ b/debian/patches/166_fix_lpl_monitors.diff
@@ -0,0 +1,38 @@
+From: Dave Airlie <airlied@redhat.com>
+Date: Thu, 27 Mar 2008 05:18:39 +0000 (+1000)
+Subject: quirk: fix LPL monitors properly.
+X-Git-Url: http://gitweb.freedesktop.org/?p=xorg/xserver.git;a=commitdiff;h=c747030a49dd289e873e2b686cd129d840e55468
+
+quirk: fix LPL monitors properly.
+
+no point having a h cm fix when we really want to copy the sizes from the
+other place.
+
+RH BZ 435216
+---
+
+--- a/hw/xfree86/modes/xf86EdidModes.c
++++ b/hw/xfree86/modes/xf86EdidModes.c
+@@ -108,13 +108,6 @@ static Bool quirk_prefer_large_75 (int s
+
+ static Bool quirk_detailed_h_in_cm (int scrnIndex, xf86MonPtr DDC)
+ {
+- /* Bug #10304: "LGPhilipsLCD LP154W01-A5" */
+- /* Bug #12784: "LGPhilipsLCD LP154W01-TLA2" */
+- /* Red Hat #435216 "LGPhilipsLCD LP154W01-TLAE" */
+- if (memcmp (DDC->vendor.name, "LPL", 4) == 0 &&
+- (DDC->vendor.prod_id == 0 || DDC->vendor.prod_id == 0x2a00))
+- return TRUE;
+-
+ /* Bug #11603: Funai Electronics PM36B */
+ if (memcmp (DDC->vendor.name, "FCM", 4) == 0 &&
+ DDC->vendor.prod_id == 13600)
+@@ -137,7 +130,7 @@ static Bool quirk_detailed_use_maximum_s
+ {
+ /* Bug #10304: LGPhilipsLCD LP154W01-A5 */
+ if (memcmp (DDC->vendor.name, "LPL", 4) == 0 &&
+- DDC->vendor.prod_id == 0)
++ (DDC->vendor.prod_id == 0 || DDC->vendor.prod_id == 0x2a00))
+ return TRUE;
+
+ return FALSE;
diff --git a/debian/patches/series b/debian/patches/series
index dda7722..4ba340a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -60,3 +60,4 @@
163_fix_untrusted_access.diff
164_fix_context_sharing.diff
165_fedora_xserver-1.5.0-xaa-option-inversion.patch
+166_fix_lpl_monitors.diff
Reply to: