xorg-server: Changes to 'ubuntu'
debian/changelog | 6
debian/patches/150_config_file_preferred_mode.patch | 126 --------------------
debian/patches/150_edid_quirk_lp154w01.patch | 14 ++
debian/patches/series | 2
4 files changed, 18 insertions(+), 130 deletions(-)
New commits:
commit c8d46df73393ffd4b3ff9d4d9fba00e2bea8f63b
Author: Bryce Harrington <bryce@bryce@bryceharrington.org>
Date: Thu Feb 14 17:38:23 2008 -0800
150_config_file_preferred_mode.patch already exists as patch 43.
Adding 150_edid_quirk_lp154w01.patch to add a quirk for another phillips
monitor.
diff --git a/debian/changelog b/debian/changelog
index 759cd2f..ba75ffc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,13 +1,13 @@
xorg-server (2:1.4.1~git20080131-1ubuntu3) UNRELEASED; urgency=low
[Bryce Harrington]
- * Add 150_config_file_preferred_mode.patch to make user-specified modes
- preferred when set in xorg.conf. (LP: #151311)
+ * Add 150_edid_quirk_lp154w01.patch to fix font size on LGPhilipsLCD
+ LP154W01-TLAE (LP: #127827)
* Add 149_add_quirks_for_physical_screen_size_issues.patch to help
address various common EDID issues (like monitors that report in
centimeters instead of millimeters, etc.) (LP: #151311)
- -- Bryce Harrington <bryce@ubuntu.com> Thu, 14 Feb 2008 17:10:05 -0800
+ -- Bryce Harrington <bryce@ubuntu.com> Thu, 14 Feb 2008 17:37:01 -0800
xorg-server (2:1.4.1~git20080131-1ubuntu2) hardy; urgency=low
diff --git a/debian/patches/150_config_file_preferred_mode.patch b/debian/patches/150_config_file_preferred_mode.patch
deleted file mode 100644
index b9b8bb6..0000000
--- a/debian/patches/150_config_file_preferred_mode.patch
+++ /dev/null
@@ -1,126 +0,0 @@
-From: Keith Packard <keithp@koto.keithp.com>
-Date: Wed, 17 Oct 2007 03:42:28 +0000 (+0800)
-Subject: Make config file preferred mode override monitor preferred mode.
-X-Git-Url: http://gitweb.freedesktop.org/?p=xorg/xserver.git;a=commitdiff;h=feac0759522cbdc3e61ccfa373df735903c5cb27
-
-Make config file preferred mode override monitor preferred mode.
-
-Add a new even-more-preferred bit to each mode which is used to make config
-file preferences selected instead of the monitor preferred mode.
----
-
---- a/hw/xfree86/common/xf86str.h
-+++ b/hw/xfree86/common/xf86str.h
-@@ -142,6 +142,7 @@ typedef enum {
- # define M_T_DEFAULT 0x10 /* (VESA) default modes */
- # define M_T_USERDEF 0x20 /* One of the modes from the config file */
- # define M_T_DRIVER 0x40 /* Supplied by the driver (EDID, etc) */
-+# define M_T_USERPREF 0x80 /* mode preferred by the user config */
-
- /* Video mode */
- typedef struct _DisplayModeRec {
---- a/hw/xfree86/modes/xf86Crtc.c
-+++ b/hw/xfree86/modes/xf86Crtc.c
-@@ -711,7 +711,8 @@ xf86DefaultMode (xf86OutputPtr output, i
- for (mode = output->probed_modes; mode; mode = mode->next)
- {
- int dpi;
-- int preferred = (mode->type & M_T_PREFERRED) != 0;
-+ int preferred = (((mode->type & M_T_PREFERRED) != 0) +
-+ ((mode->type & M_T_USERPREF) != 0));
- int diff;
-
- if (xf86ModeWidth (mode, output->initial_rotation) > width ||
-@@ -1415,7 +1416,7 @@ xf86ProbeOutputModes (ScrnInfoPtr scrn,
- mode->prev = NULL;
- output->probed_modes = mode;
- }
-- mode->type |= M_T_PREFERRED;
-+ mode->type |= (M_T_PREFERRED|M_T_USERPREF);
- }
- else
- mode->type &= ~M_T_PREFERRED;
-@@ -1532,6 +1533,7 @@ xf86InitialConfiguration (ScrnInfoPtr sc
- xf86CrtcConfigPtr config = XF86_CRTC_CONFIG_PTR(scrn);
- int o, c;
- DisplayModePtr target_mode = NULL;
-+ int target_preferred = 0;
- Rotation target_rotation = RR_Rotate_0;
- xf86CrtcPtr *crtcs;
- DisplayModePtr *modes;
-@@ -1572,43 +1574,34 @@ xf86InitialConfiguration (ScrnInfoPtr sc
- }
-
- /*
-- * Let outputs with preferred modes drive screen size
-+ * User preferred > preferred > other modes
- */
- for (o = 0; o < config->num_output; o++)
- {
-- xf86OutputPtr output = config->output[o];
-+ xf86OutputPtr output = config->output[o];
-+ DisplayModePtr default_mode;
-+ int default_preferred;
-
-- if (enabled[o] &&
-- xf86OutputHasPreferredMode (output, width, height))
-+ if (!enabled[o])
-+ continue;
-+ default_mode = xf86DefaultMode (output, width, height);
-+ if (!default_mode)
-+ continue;
-+ default_preferred = (((default_mode->type & M_T_PREFERRED) != 0) +
-+ ((default_mode->type & M_T_USERPREF) != 0));
-+ if (default_preferred > target_preferred || !target_mode)
- {
-- target_mode = xf86DefaultMode (output, width, height);
-+ target_mode = default_mode;
-+ target_preferred = default_preferred;
- target_rotation = output->initial_rotation;
-- if (target_mode)
-- {
-- modes[o] = target_mode;
-- config->compat_output = o;
-- break;
-- }
-- }
-- }
-- if (!target_mode)
-- {
-- for (o = 0; o < config->num_output; o++)
-- {
-- xf86OutputPtr output = config->output[o];
-- if (enabled[o])
-- {
-- target_mode = xf86DefaultMode (output, width, height);
-- target_rotation = output->initial_rotation;
-- if (target_mode)
-- {
-- modes[o] = target_mode;
-- config->compat_output = o;
-- break;
-- }
-- }
-+ config->compat_output = o;
- }
- }
-+ if (target_mode)
-+ modes[config->compat_output] = target_mode;
-+ /*
-+ * Fill in other output modes
-+ */
- for (o = 0; o < config->num_output; o++)
- {
- xf86OutputPtr output = config->output[o];
---- a/hw/xfree86/modes/xf86Crtc.h
-+++ b/hw/xfree86/modes/xf86Crtc.h
-@@ -39,6 +39,9 @@
- #ifndef M_T_DRIVER
- #define M_T_DRIVER 0x40
- #endif
-+#ifndef M_T_USERPREF
-+#define M_T_USERPREF 0x80
-+#endif
- #ifndef HARDWARE_CURSOR_ARGB
- #define HARDWARE_CURSOR_ARGB 0x00004000
- #endif
diff --git a/debian/patches/150_edid_quirk_lp154w01.patch b/debian/patches/150_edid_quirk_lp154w01.patch
new file mode 100644
index 0000000..58b34e3
--- /dev/null
+++ b/debian/patches/150_edid_quirk_lp154w01.patch
@@ -0,0 +1,14 @@
+--- xorg-server-patched/hw/xfree86/modes/xf86EdidModes.c.orig 2008-02-14 17:21:03.000000000 -0800
++++ xorg-server-patched/hw/xfree86/modes/xf86EdidModes.c 2008-02-14 17:22:43.000000000 -0800
+@@ -110,6 +110,11 @@ static Bool quirk_detailed_h_in_cm (int
+ DDC->vendor.prod_id == 0)
+ return TRUE;
+
++ /* LP Bug #127827; "LGPhilipsLCD LP154W01-TLAE" */
++ if (memcmp (DDC->vendor.name, "LPL", 4) == 0 &&
++ DDC->vendor.prod_id == 10752)
++ return TRUE;
++
+ /* Bug #11603: Funai Electronics PM36B */
+ if (memcmp (DDC->vendor.name, "FCM", 4) == 0 &&
+ DDC->vendor.prod_id == 13600)
diff --git a/debian/patches/series b/debian/patches/series
index 25a6849..c5cf93f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -43,4 +43,4 @@
147_X86EMU-pass-the-correct-bus-dev-fn-tag-to-pci-emula.patch
148_dix_touchscreen_fixes.diff
149_add_quirks_for_physical_screen_size_issues.patch
-150_config_file_preferred_mode.patch
+150_edid_quirk_lp154w01.patch
Reply to: