diff -u xserver-xorg-video-intel-2.4.1/debian/patches/series xserver-xorg-video-intel-2.4.1/debian/patches/series --- xserver-xorg-video-intel-2.4.1/debian/patches/series +++ xserver-xorg-video-intel-2.4.1/debian/patches/series @@ -1,6 +1,6 @@ #01_fix_compiz_video.diff 01_gen_pci_ids.diff -#11_textured_video_option.patch +11_textured_video_option.patch 20_thinkpad_g40_quirk.patch 21_quirk_lenovo.patch 22_no_pipe_for_hotplug_detection.patch @@ -12,0 +13,2 @@ +100_update_quirks_to_2.6.patch +104_i830-vbt-timing-hack.patch diff -u xserver-xorg-video-intel-2.4.1/debian/patches/11_textured_video_option.patch xserver-xorg-video-intel-2.4.1/debian/patches/11_textured_video_option.patch --- xserver-xorg-video-intel-2.4.1/debian/patches/11_textured_video_option.patch +++ xserver-xorg-video-intel-2.4.1/debian/patches/11_textured_video_option.patch @@ -21,7 +21,9 @@ src/i830_video.c | 3 ++- 3 files changed, 8 insertions(+), 2 deletions(-) -[Updated to apply to the 2.3.1 driver -- bryce 6/12/08] +[Updated to apply to the 2.3.1 driver -- bryce Jun 12, 2008] +[Altered to default to 'true' so "TexturedVideo" is on by default, but can + be disabled if desired -- bryce Nov 12, 2008] diff -Nurp xserver-xorg-video-intel-2.3.1-1ubuntu1~bwh3-patched/src/i830.h xserver-xorg-video-intel-2.3.1-1ubuntu1~bwh3-working/src/i830.h --- xserver-xorg-video-intel-2.3.1-1ubuntu1~bwh3-patched/src/i830.h 2008-06-12 16:03:38.000000000 -0700 @@ -49,7 +51,7 @@ {OPTION_LVDSFIXEDMODE, "LVDSFixedMode", OPTV_BOOLEAN, {0}, FALSE}, {OPTION_TRIPLEBUFFER, "TripleBuffer", OPTV_BOOLEAN, {0}, FALSE}, {OPTION_FORCEENABLEPIPEA, "ForceEnablePipeA", OPTV_BOOLEAN, {0}, FALSE}, -+ {OPTION_TEXTURED_VIDEO, "TexturedVideo", OPTV_BOOLEAN, {0}, FALSE}, ++ {OPTION_TEXTURED_VIDEO, "TexturedVideo", OPTV_BOOLEAN, {0}, TRUE}, #ifdef INTEL_XVMC {OPTION_XVMC, "XvMC", OPTV_BOOLEAN, {0}, TRUE}, #endif @@ -57,7 +59,7 @@ pI830->XvDisabled = !xf86ReturnOptValBool(pI830->Options, OPTION_XVIDEO, TRUE); -+ pI830->TexturedXvEnabled = OVERLAY_NOEXIST(pI830) || xf86ReturnOptValBool(pI830->Options, OPTION_TEXTURED_VIDEO, FALSE); ++ pI830->TexturedXvEnabled = OVERLAY_NOEXIST(pI830) || xf86ReturnOptValBool(pI830->Options, OPTION_TEXTURED_VIDEO, TRUE); + #ifdef I830_XV if (xf86GetOptValInteger(pI830->Options, OPTION_VIDEO_KEY, diff -u xserver-xorg-video-intel-2.4.1/debian/changelog xserver-xorg-video-intel-2.4.1/debian/changelog --- xserver-xorg-video-intel-2.4.1/debian/changelog +++ xserver-xorg-video-intel-2.4.1/debian/changelog @@ -1,3 +1,45 @@ +xserver-xorg-video-intel (2:2.4.1-1ubuntu11~810um1) intrepid; urgency=low + + * Rebuild against changed libdrm. + + -- Steve Kowalik Tue, 21 Apr 2009 16:37:18 +1000 + +xserver-xorg-video-intel (2:2.4.1-1ubuntu10.4) intrepid-proposed; urgency=low + + * Update 104_i830-vbt-timing-hack.patch to final version taken upstream. + Fixes incorrect modeline logic on certain models of monitors after the + last release, resulting in incorrect resolution detection and/or + screen corruption. + (LP: #320893) + + -- Bryce Harrington Mon, 30 Mar 2009 11:01:52 -0700 + +xserver-xorg-video-intel (2:2.4.1-1ubuntu10.3) intrepid-proposed; urgency=low + + * i830-vbt-timing-hack.patch: Adjust h and vblank end to fix issue on + Dell Studio 15 and other similar hardware. Fixes issue where X + comes up with an unusable white screen on the LVDS. + (LP: #297245) + + -- Bryce Harrington Tue, 13 Jan 2009 16:37:33 -0800 + +xserver-xorg-video-intel (2:2.4.1-1ubuntu10.2) intrepid-proposed; urgency=low + + * 100_update_quirks_to_2.6.patch: + - Sync up latest quirks from upstream git tree (roughly up to 2.6). + Adds handful of pipe-A and ignore-lvds quirks. See + https://wiki.ubuntu.com/X/Quirks for details. (LP: #316672) + + -- Bryce Harrington Tue, 13 Jan 2009 01:00:52 -0800 + +xserver-xorg-video-intel (2:2.4.1-1ubuntu10.1) intrepid-proposed; urgency=low + + * Re-enable 11_textured_video_option.patch, but change logic so it is + enabled by default. This allows people seeing issues with it to + turn it off if they wish. (LP: #278318) + + -- Bryce Harrington Wed, 12 Nov 2008 14:39:03 -0800 + xserver-xorg-video-intel (2:2.4.1-1ubuntu10) intrepid; urgency=low * 28_stolen_memory_counting_g4x.patch: only in patch2: unchanged: --- xserver-xorg-video-intel-2.4.1.orig/debian/patches/100_update_quirks_to_2.6.patch +++ xserver-xorg-video-intel-2.4.1/debian/patches/100_update_quirks_to_2.6.patch @@ -0,0 +1,47 @@ +diff -Nurp patched/src/i830_quirks.c working/src/i830_quirks.c +--- patched/src/i830_quirks.c 2009-01-13 00:24:30.000000000 -0800 ++++ working/src/i830_quirks.c 2009-01-13 00:31:24.000000000 -0800 +@@ -216,6 +216,7 @@ static void quirk_ivch_dvob (I830Ptr pI8 + /* keep this list sorted by OEM, then by chip ID */ + static i830_quirk i830_quirk_list[] = { + /* Aopen mini pc */ ++ { PCI_CHIP_I915_GM, 0xa0a0, SUBSYS_ANY, quirk_ignore_lvds }, + { PCI_CHIP_I945_GM, 0xa0a0, SUBSYS_ANY, quirk_ignore_lvds }, + { PCI_CHIP_I965_GM, 0xa0a0, SUBSYS_ANY, quirk_ignore_lvds }, + { PCI_CHIP_I965_GM, 0x8086, 0x1999, quirk_ignore_lvds }, +@@ -280,6 +281,8 @@ static i830_quirk i830_quirk_list[] = { + { PCI_CHIP_I915_GM, 0x103c, 0x099c, quirk_ignore_tv }, + /* HP Compaq 6730s has no TV output */ + { PCI_CHIP_GM45_GM, 0x103c, 0x30e8, quirk_ignore_tv }, ++ /* HP Compaq 2730p needs pipe A force quirk (LP: #291555) */ ++ { PCI_CHIP_GM45_GM, 0x103c, 0x30eb, quirk_pipea_force }, + + /* Thinkpad G40 needs pipe A force quirk (See LP: #240457) */ + { PCI_CHIP_I855_GM, 0x1014, 0x0543, quirk_pipea_force }, +@@ -297,12 +300,16 @@ static i830_quirk i830_quirk_list[] = { + { PCI_CHIP_I855_GM, 0x1028, 0x014f, quirk_pipea_force }, + /* Dell Inspiron 510m needs pipe A force quirk */ + { PCI_CHIP_I855_GM, 0x1028, 0x0164, quirk_pipea_force }, ++ /* Toshiba Satellite A30 needs pipe A force quirk */ ++ { PCI_CHIP_I855_GM, 0x1179, 0xff00 , quirk_pipea_force }, + /* Toshiba Protege R-205, S-209 needs pipe A force quirk */ + { PCI_CHIP_I915_GM, 0x1179, 0x0001, quirk_pipea_force }, + /* Intel 855GM hardware (See LP: #216490) */ + { PCI_CHIP_I855_GM, 0x1028, 0x00c8, quirk_pipea_force }, + /* Intel 855GM hardware (See Novell Bugzilla #406123) */ + { PCI_CHIP_I855_GM, 0x10cf, 0x1215, quirk_pipea_force }, ++ /* Intel 855GM mv890 hardware (see LP: #305269) */ ++ { PCI_CHIP_I855_GM, 0x8086, 0x3582, quirk_ignore_lvds }, + /* HP Pavilion ze4944ea needs pipe A force quirk (See LP: #242389) */ + { PCI_CHIP_I855_GM, 0x103c, 0x3084, quirk_pipea_force }, + +@@ -333,6 +340,9 @@ static i830_quirk i830_quirk_list[] = { + { PCI_CHIP_I855_GM, SUBSYS_ANY, SUBSYS_ANY, quirk_pipea_force }, + { PCI_CHIP_845_G, SUBSYS_ANY, SUBSYS_ANY, quirk_pipea_force }, + ++ /* Asus Eee Box has no LVDS */ ++ { PCI_CHIP_I945_GME, 0x1043, 0x1252, quirk_ignore_lvds }, ++ + { 0, 0, 0, NULL }, + }; + only in patch2: unchanged: --- xserver-xorg-video-intel-2.4.1.orig/debian/patches/104_i830-vbt-timing-hack.patch +++ xserver-xorg-video-intel-2.4.1/debian/patches/104_i830-vbt-timing-hack.patch @@ -0,0 +1,33 @@ +commit 57a02b50c60c10a25ff0f3cd93af9f37fa0d1b11 +Author: Jesse Barnes +Date: Mon Jan 26 14:58:28 2009 -0800 + + Fixup bogus VBT modes when detected + + Several VBT modes out in the wild have H or VSyncEnd values greater than + the H or VTotal value. This clearly ends up creating a bad mode, + causing some panels to either ignore the timing or display some sort of + corrupt image. + + Check for these cases and fix them up by default, making things work for + several Dell and Sony machines. + + Fixes FDO bug #17292. + +diff --git a/src/i830_bios.c b/src/i830_bios.c +index 72408f0..6baacd4 100644 +--- a/src/i830_bios.c ++++ b/src/i830_bios.c +@@ -135,6 +135,12 @@ parse_panel_data(I830Ptr pI830, struct bdb_header *bdb) + fixed_mode->Clock = _PIXEL_CLOCK(timing_ptr) / 1000; + fixed_mode->type = M_T_PREFERRED; + ++ /* Some VBTs have bogus h/vtotal values */ ++ if (fixed_mode->HSyncEnd > fixed_mode->HTotal) ++ fixed_mode->HTotal = fixed_mode->HSyncEnd + 1; ++ if (fixed_mode->VSyncEnd > fixed_mode->VTotal) ++ fixed_mode->VTotal = fixed_mode->VSyncEnd + 1; ++ + xf86SetModeDefaultName(fixed_mode); + + pI830->lvds_fixed_mode = fixed_mode;