xserver-xorg-video-intel: Changes to 'debian-experimental'
ChangeLog | 2176 ++++++++++++++++++++++++++++++-------
Makefile.am | 6
configure.ac | 28
debian/changelog | 17
debian/control | 2
debian/patches/01_gen_pci_ids.diff | 8
man/Makefile.am | 20
man/intel.man | 121 +-
src/Makefile.am | 18
src/bios_reader/bios_reader.c | 94 +
src/common.h | 17
src/drmmode_display.c | 338 +++--
src/drmmode_display.h | 73 -
src/i810.h | 1
src/i810_driver.c | 94 -
src/i810_reg.h | 19
src/i830.h | 140 +-
src/i830_accel.c | 9
src/i830_batchbuffer.c | 3
src/i830_bios.c | 36
src/i830_bios.h | 41
src/i830_crt.c | 16
src/i830_debug.c | 103 +
src/i830_display.c | 703 +++++++++--
src/i830_display.h | 3
src/i830_dri.c | 400 ------
src/i830_driver.c | 674 ++++-------
src/i830_exa.c | 190 ++-
src/i830_lvds.c | 152 ++
src/i830_memory.c | 656 ++++-------
src/i830_quirks.c | 45
src/i830_render.c | 2
src/i830_ring.h | 14
src/i830_sdvo.c | 446 +++++--
src/i830_sdvo_regs.h | 58
src/i830_tv.c | 295 ++++-
src/i830_video.c | 337 ++---
src/i830_video.h | 4
src/i830_xaa.c | 75 -
src/i915_render.c | 11
src/i915_video.c | 11
src/i965_hwmc.c | 9
src/i965_render.c | 1043 +++++++++--------
src/i965_video.c | 405 +++---
src/xvmc/Makefile.am | 2
src/xvmc/intel_xvmc.c | 7
uxa/uxa-accel.c | 76 +
uxa/uxa-glyphs.c | 40
uxa/uxa-priv.h | 38
uxa/uxa-render.c | 15
uxa/uxa-unaccel.c | 52
uxa/uxa.c | 39
uxa/uxa.h | 3
53 files changed, 5837 insertions(+), 3348 deletions(-)
New commits:
commit 2d07e2ef544c45332d400984ed84fda500ac763d
Author: Brice Goglin <bgoglin@debian.org>
Date: Sat Apr 11 22:36:25 2009 +0200
Prepare changelog for upload
diff --git a/debian/changelog b/debian/changelog
index 7f6d878..e4d7bbb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
-xserver-xorg-video-intel (2:2.6.99.903-1) UNRELEASED; urgency=low
+xserver-xorg-video-intel (2:2.6.99.903-1) experimental; urgency=low
* New upstream release candidate.
* Bump build-dep on libdrm-dev to 2.4.6.
- -- Brice Goglin <bgoglin@debian.org> Sat, 11 Apr 2009 22:45:09 +0200
+ -- Brice Goglin <bgoglin@debian.org> Sat, 11 Apr 2009 22:45:57 +0200
xserver-xorg-video-intel (2:2.6.3-1) unstable; urgency=low
commit b0bba20bdcd73948be5a0728a14dba5856f1ea53
Author: Brice Goglin <bgoglin@debian.org>
Date: Sat Apr 11 18:49:54 2009 +0200
New upstream release candidate
diff --git a/ChangeLog b/ChangeLog
index 827d3a3..9f1b5ee 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,47 +1,877 @@
-commit f04552cdbcb110c876816dfda577803e6c92fb6a
+commit 121bd7ff7cfd9a43fbb61fa56f06ba2d2b55035e
+Author: Carl Worth <cworth@cworth.org>
+Date: Fri Apr 10 14:08:00 2009 -0700
+
+ Increment version to 2.6.99.903 for release
+
+commit ec8ef3b2984cef581ea7fa745a76fe6f97a952dd
+Author: Jesse Barnes <jbarnes@virtuousgeek.org>
+Date: Wed Apr 8 15:49:00 2009 -0700
+
+ Don't enable kernel execbuf fencing w/EXA
+
+ If we enable kernel execbuf fence register management, it's best if the
+ kernel manages all fence registers. This works fine if the accel
+ method is managing pixmaps or doesn't use offscreen pixmaps. However
+ with EXA, pixmap accesses are done relative to the framebuffer BAR
+ mapping (pI830->FbBase) and the Screen pixmap address. So if we try to
+ set the screen pixmap to point at a GTT mapped (and therefore properly
+ fenced) address, later calls to intel_get_pixmap_offset() will call
+ into EXA, which will use the pseudo-random pixmap addr and the EXA
+ offscreen base addr (which is really just FbBase) to calculate the
+ offset. This will fail. So disable kernel fence reg management in the
+ EXA case (this is easier than adding proper EXA pixmap management to
+ xf86-video-intel, and makes more sense since we'll be removing EXA soon
+ anyway).
+
+ Fixes FDO #21027.
+
+ Also happens to fix FDO #21029 (as tested by Carl Worth <cworth@cworth.org).
+ (cherry picked from commit 620e97bbd6a811ad69b8ac94df1fe2c9edf65549)
+
+commit 404fdcc5bc9dd32d39112d8a49a5617dbb886a40
+Author: Shuang He <shuang.he@intel.com>
+Date: Tue Apr 7 12:31:07 2009 -0700
+
+ Fix value for MI_WAIT_FOR_PIPEA_SCAN_LINE_WINDOW
+
+ Since the change to scan-line based video sync, (rather than vblank-
+ based), we've only been getting tear-free video on one of the two
+ pipes. This fixes that bug by using the correct constant for waiting
+ on PIPEA.
+ (cherry picked from commit 0a0731c11d10392cdc55ecc04e4e3575c8b3fe57)
+
+commit 7b74b77557aa4100017ef3f9d344fb4071ae8470
+Author: Carl Worth <cworth@cworth.org>
+Date: Mon Apr 6 14:36:33 2009 -0700
+
+ Don't clip video to CRTC in the case of textured video
+
+ Since we're not limited by a single overlay plane on a single pipe,
+ we want to not clip at all, (so that the correct video appears on
+ both pipes).
+
+ This fixes bug #20980 which shows a video spanning two pipes
+ being rendered incorrectly.
+ (cherry picked from commit 940c2aad4d174b6609bdc49f8c99a4bc37926516)
+
+commit d8ce818c4e4ca0c348c16ead1b747165bce4bedb
+Author: Zhenyu Wang <zhenyu.z.wang@intel.com>
+Date: Tue Apr 7 10:53:08 2009 +0800
+
+ quirk LVDS on ibase MB890 855GM board
+
+ fix bug #19529
+ (cherry picked from commit 63b4b5efac936c674dedad8125a8dbac4f000908)
+
+commit 3e5586cace98f73a9f8403a6446d380899ecbce9
+Author: Carl Worth <cworth@cworth.org>
+Date: Mon Apr 6 14:02:08 2009 -0700
+
+ Fix new video sync-to-blank code for multi-head
+
+ We need to account for a non-zero Y offset for the CRTC. Without
+ this, we don't sync to the correct region, so tearing becomes
+ visible again.
+ (cherry picked from commit 5d9d9a2e466474a0508a15b294a91507ccb3ccc1)
+
+commit 4e9b75175be791c6098ef79be8e04a8c3baa40f9
+Author: Ma Ling <ling.ma@intel.com>
+Date: Tue Mar 17 10:33:15 2009 +0800
+
+ Use best PLL timing values for G4X platform
+
+ construct function to find precise parameters from internal spreadsheet
+ table on G4X platform.
+
+ Signed-off-by: Ma Ling <ling.ma@intel.com>
+ (cherry picked from commit 7c94227dd4fa2164bebb36234958053bf1d26c12)
+
+commit 3428e2fd4be337359278f7ab1dc0d9945d6fee34
+Author: Ma Ling <ling.ma@intel.com>
+Date: Tue Mar 17 10:41:02 2009 +0800
+
+ Define documented PLL timing limits for G4X platform
+
+ These timings on G4X platform were specified by internal spreadsheet from the chipset group.
+
+ Signed-off-by: Ma Ling <ling.ma@intel.com>
+ (cherry picked from commit 48db5bde9298f1126dfb42f4be8a3d61166abfd8)
+
+commit 3b29eb99259ea7b84bd41bff623b027dbe28ffba
+Author: Carl Worth <cworth@cworth.org>
+Date: Mon Apr 6 11:31:20 2009 -0700
+
+ Remove support for 'auto'(-1) value of XV_SYNC_TO_VBLANK
+
+ We previously had a heurstic here where we would only sync to vblank
+ for windows that covered more than 25% of the screen. We don't need
+ this anymore since the new approach to sync, (WAIT_FOR_SCANLINE_WINDOW),
+ is not excessively costly for small windows.
+ (cherry picked from commit 3d4ee3cac1d63dfdf7b54c8ba577f3b77637499f)
+
+commit 5dd2777ce836bdf55b53ed763728705d4d686673
+Author: Carl Worth <cworth@cworth.org>
+Date: Mon Apr 6 11:16:40 2009 -0700
+
+ Use WAIT_FOR_SCAN_LINE instead of WAIT_FOR_VBLANK
+
+ Either way, the goal is tear-free video playing. But waiting for
+ a scan-line window not only has the advantage of being cheaper
+ for small windows, but also avoids hanging the GPU in the case
+ of the pipe getting turned off, (by screensaver, for example),
+ while a batch is waiting for a VBLANK that will never occur.
+
+ This fixes that GPU hang.
+ (cherry picked from commit bc3312fd7c03d09a231dfebfe390fe668ad15d1e)
+
+commit 5944f5e32511984b11decc0df6074600e1989934
+Author: Jesse Barnes <jbarnes@virtuousgeek.org>
+Date: Fri Apr 3 11:15:18 2009 -0700
+
+ Fix offset in begin_gtt_access case
+
+ Don't use bo->virtual in the begin_gtt_access case, use the framebuffer
+ mapping and bo offset instead.
+
+ Reviewed-by: Eric Anholt <eric@anholt.net>
+ Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
+ (cherry picked from commit 6cd914ef315036ce8e91c7b6492994353e8ed2d8)
+
+commit 633c24bc20ed96b1f9ef954bfd722e3ab504ea93
+Author: Zhenyu Wang <zhenyu.z.wang@intel.com>
+Date: Wed Apr 1 10:11:35 2009 +0800
+
+ SDVO: fix output flag dumping for unknown type
+
+ Found by Hugo Jacques <hugo.jacques@verint.com>
+ (cherry picked from commit fad714c40078d22fff82dc0692a344f66ddf9680)
+
+commit 6501f8e5e91f3f87348d590e42a4860fea2cfddc
+Author: Hugo Jacques <hugo.jacques@verint.com>
+Date: Wed Apr 1 10:10:05 2009 +0800
+
+ SDVO: add composite TV out support
+ (cherry picked from commit 00de1757dd5776962bdd4c8968181878c2ebf4c9)
+
+commit 10b5014c42dc055d9559ee112cc7a017e887d813
+Author: Jesse Barnes <jbarnes@virtuousgeek.org>
+Date: Tue Mar 31 07:50:10 2009 -0700
+
+ Match GTT unmap with map in KMS rotation case
+
+ Missed this when the GTT unmap call was added. If we don't do this we
+ trigger an assertion in libdrm, since the buffer has never been mapped
+ normally.
+
+ Fixes bug #20943.
+
+ Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
+ (cherry picked from commit 087f72e1f5d7d11b8795ba80a842874f5a9bb01d)
+
+commit 26cab64654bdf68095412d0aaba157774d1ca16b
+Author: Zhenyu Wang <zhenyu.z.wang@intel.com>
+Date: Tue Mar 31 13:49:44 2009 +0800
+
+ Disable LVDS detect methods
+
+ Both methods ACPI lid and SWF bit have issues in LVDS detect from
+ wider testing. Fallback to origin code.
+ (cherry picked from commit 4f046af760b92c07f59664359453933fb5358e3d)
+
+commit d43016865c670d9281c6b664094fb41a252fbdc0
+Author: Albert Damen <albrt@gmx.net>
+Date: Mon Mar 30 11:38:02 2009 -0700
+
+ Non-GEM allocations incorrectly force TILE_NONE (bug 20797)
+
+ With -intel 2.6.3 performance was very bad when using a non gem enabled kernel
+ (2.6.27) and EXA. For example sauerbraten ran with 4 fps and screensaver GLBlur
+ with 1 fps. With -intel 2.6.1 performance was good using the same kernel.
+
+ Git bisecting led me to commit f1ed73c1ef3e3daa9f695194dcc813167cbcb53d (in 2.6
+ branch) "Make i830_allocate_memory take tiling parameters" as first bad commit.
+
+ Using gdb I found tiling was set exactly the same in 2.6.3 as in 2.6.1, so that
+ was good (TILE_XMAJOR for front, back and depth buffers).
+ Looking further I found the line mem->tiling = TILE_NONE; (line 961 in
+ src/i830_memory.c) at the end of i830_allocate_memory suspicious, as
+ mem->tiling now already gets set via i830_allocate_aperture and some buffers do
+ have tiling. Removing that line indeed fixed the performance issue. Now
+ sauerbraten runs with 30+ fps and GLBlur runs smoothly.
+ (cherry picked from commit e964d4e53af3a47de6d09c884be1cc0044d03bea)
+
+commit 556391cbce8146eab5e570277245e5881256e9be
+Author: Jesse Barnes <jbarnes@virtuousgeek.org>
+Date: Mon Mar 30 11:27:56 2009 -0700
+
+ Require libdrm 2.4.6 for GTT unmap support
+
+ Need the new functions available.
+ (cherry picked from commit 51cf8a453c2bc2e8604bfc41a649e971c1ba5026)
+
+commit f6f59ee2533e786906dc9a32cf7072f2d2796201
+Author: Jesse Barnes <jbarnes@virtuousgeek.org>
+Date: Mon Mar 30 09:53:40 2009 -0700
+
+ Tiling fixes, third set
+
+ Hopefully this concludes the fixes necessary to deal with the various
+ combinations of kernel and user level tiling. We have several cases to
+ handle:
+ 1) KMS (kernel handles all tiling)
+ 2) UMS w/memory management + kexec fencing (kernel handles all tiling)
+ 3) UMS w/memory mangement but no kexec fencing (userland handles tiling)
+ 4) UMS w/o memory management (userland handles tiling)
+
+ For cases (1) & (2) we can use GTT mapping, which will give us good
+ performance and take care of allocating fence registers as needed. It's
+ important *not* to have userland set up fence regs in this case, since
+ the kernel will be using all of them.
+
+ For case (3), we use the begin/end GTT map functions provided by libdrm,
+ in combination with pinning and fence register setup in i830_memory.c to
+ deal with tiled surfaces. This also gives us good performance and
+ correctness.
+
+ For case (4) we use the old style virtual mapping + offset for dealing
+ with surfaces; note that UXA doesn't seem to work in this configuration
+ regardless of these fixes.
+
+ Fixes bug #20803.
+
+ Reviewed-by: Eric Anholt <eric@anholt.net>
+ Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
+ (cherry picked from commit 8dabcc40747bfd478f296728741240241698f165)
+
+commit a03feab1b7ce511e1704bee96c83290d1c7b2785
+Author: Zhenyu Wang <zhenyu.z.wang@intel.com>
+Date: Wed Mar 25 11:13:52 2009 +0800
+
+ Disable LVDS config parsing from VBT for now
+
+ As wider tests showed that this doesn't work for all VBIOS, so
+ disable it for now and reenable it after we get reliable method.
+ (cherry picked from commit 375b2e40fcb17e94538a75392950e2533c1bb031)
+
+commit 767524888840d7e06f6b5d6fa720b21d882d4625
+Author: Ma, Ling <ling.ma@intel.com>
+Date: Wed Mar 25 14:39:46 2009 +0800
+
+ disable center mode for 965GM and G4X platform
+
+ When disabling VGA mode, usually we don't need to touch VGA center mode.
+ However because of hardware reason, for Cresline, Cantiga & Eaglelake platform,
+ we have to disable center mode as well. The patch fixed bug- TV Out strobing regression,
+ reported by Robert Lowery in intel-gfx@lists.freedesktop.org mailing list.
+
+ Signed-off-by: Ma Ling <ling.ma@intel.com>
+ (cherry picked from commit b5b377806422c9538fa9f846819ad253c1a50846)
+
+commit 948fa20bd639752af3a6f1b30a0b2b356d0bc9a5
+Author: Kalev Lember <kalev@smartlink.ee>
+Date: Fri Mar 20 02:21:41 2009 +0200
+
+ Fix VT switch with XV overlay video enabled.
+
+ drm_intel_bo_unpin() was called with NULL argument.
+
+ Signed-off-by: Kalev Lember <kalev@smartlink.ee>
+ (cherry picked from commit 74d0713e002a9781ed00fdd10eb6f75907ae796c)
+
+commit 79aebcb7f6b7f0bed6cdce34e2e3086dc6bf9b3c
+Author: Rémi Cardona <remi@gentoo.org>
+Date: Fri Nov 14 13:55:52 2008 +0100
+
+ clean up man page generation and remove all traces of the i810 driver
+
+ The i810 compatibility symlink has been broken since libpciaccess, so just
+ let it die.
+ (cherry picked from commit b345b4e6adf00f8b2626e5c2563fc159e2295cc5)
+
+commit 3afc0d100c6897f9d17756043e92a3e6cccc099f
+Author: Jesse Barnes <jbarnes@virtuousgeek.org>
+Date: Fri Mar 20 12:33:22 2009 -0700
+
+ Don't manage fences part two
+
+ Don't try to clear fences that were never installed. Missed this bit in
+ the last fix for #20265.
+ (cherry picked from commit 48b91e066878db63a1558e4cd3e6d12ff9c49197)
+
+commit e2465249a90b9aefe6d7a96eb56a51fde54698a0
+Author: Jesse Barnes <jbarnes@nietzche.localdomain>
+Date: Thu Mar 19 13:25:29 2009 -0700
+
+ Don't install fences if the kernel is managing them
+
+ If execbuffer is setting up fences, it also means that the kernel is
+ managing them at pin time, so installing one in the 2D driver in that
+ case is an error. The fence should stick around as long as the buffer
+ is pinned (the kernel won't steal these), though it will be freed at
+ leavevt and re-allocated at entervt.
+
+ On 965+ chips, the pin ioctl will *not* install a fence reg, but that's
+ also ok because all 965+ operations include tiling bits, and sw
+ fallbacks will be protected by prepare/finish access hooks, which will
+ either access the backing store or use the GTT, which will ensure proper
+ fencing at fault time.
+
+ Fixes #20265.
+
+ Acked-by: Eric Anholt <eric@anholt.net>
+ (cherry picked from commit 636d252f3b1eac687f7b11952e949c383cb86ed4)
+
+commit 1883d912c75238e73b3662580e08d3455d2efb33
+Author: Kristian Høgsberg <krh@redhat.com>
+Date: Wed Mar 11 11:10:57 2009 -0400
+
+ Drop Legacy3D option, only use fixed texture space with non-gem.
+
+ With this change, we always expect the 3D driver to use GEM textures
+ when the 2D driver uses GEM. When GEM is not available or disabled,
+ we fall back to legacy fixed textures.
+ (cherry picked from commit 73db44e7ac524e84e5f0fda2d60069a9e954ad1b)
+
+commit db3675ceaf96342b339026022b1f2c13b5086ad4
+Author: Ma Ling <ling.ma@intel.com>
+Date: Thu Mar 19 09:10:19 2009 -0700
+
+ Set SSC frequency for 8xx chips correctly
+
+ All 8xx class chips have the 66/48 split, not just 855.
+
+ Fixes #18358.
+ (cherry picked from commit 85e6b528582c2397ee9eb2132cd0d05ce12eb43d)
+
+commit e03403e55ffb11302ffd354e7a5fb1704eb9edbd
+Author: Jesse Barnes <jbarnes@nietzche.localdomain>
+Date: Wed Mar 18 20:19:44 2009 -0700
+
+ Re-enable disabled outputs after rotation
+
+ The server may have made a DPMS call before doing rotation, so after we
+ do the mode set with the rotated framebuffer, we need to re-enable the
+ corresponding output(s).
+
+ Fixes bug #20573.
+ (cherry picked from commit bedc894a565ce3c7a50990e3f78953fc2432ad40)
+
+commit f76a16d5b1d47430d60d1aa6c5f034c46a8be228
+Author: Jesse Barnes <jbarnes@virtuousgeek.org>
+Date: Wed Mar 18 09:36:58 2009 -0700
+
+ Create known output configuration at EnterVT time
+
+ Since we added the pipe A force quirk (leaving pipe A on all the time),
+ DPMS calls to disable it have silently returned, leaving the pipe on.
+ If another driver (like vesafb) has enabled it, we may end up with a bad
+ configuration, leading to hangs or blank screens at VT switch time.
+
+ Fixes bug #19603.
+ (cherry picked from commit 6deb26ae7bd796e88a5dd90df5f6c35fbc44e798)
+
+commit b6b56f6d3710dc31bace15c0a1db1b21e0f2f20c
+Author: Keith Packard <keithp@keithp.com>
+Date: Mon Mar 2 07:39:41 2009 -0800
+
+ Use CopyArea to load glyphs from per-glyph pixmap to cache pixmap
+
+ With glyphs sitting in per-glyph pixmaps, there's no reason to use the CPU
+ to move them to the cache pixmap, and lots of reasons to use the accelerator.
+
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+ (cherry picked from commit fe08b81d0f5d6f96e0124e6286bd24aba6e140ad)
+ (also includes revert from fe08b81d0f5d6f96e0124e6286bd24aba6e140ad)
+ (and revert from from 78a60e1b66fe2e8449702dd43d9b062d279af8f1)
+
+ The reverts simply eliminate some unrelated changes accidentally included
+ with the first commit.
+
+commit 238c2c40afd9f8b61479b8640d53f20d52fd7ddf
+Author: Zhenyu Wang <zhenyu.z.wang@intel.com>
+Date: Mon Mar 16 10:19:39 2009 +0800
+
+ TV: fix contrast and saturation for 945G
+
+ Bug #20670.
+ (cherry picked from commit 1a6e70cd98abc63f24f710819961c24601afb59b)
+
+commit 14e09995a74b296acda33bb6c833b432075cd873
+Author: Zhenyu Wang <zhenyu.z.wang@intel.com>
+Date: Mon Mar 16 09:30:22 2009 +0800
+
+ TV: force TV as connected with TV_Connector option
+
+ In order to bypass failure in TV load detect, TV_Connector option
+ will always force TV as connected with user specified connector type.
+ (cherry picked from commit 4e95327323e3d081b565147f7738eb49c28542bc)
+
+commit 72ab5ee2e1b459772641f3b6e347ef9389f24195
+Author: Kalev Lember <kalev@smartlink.ee>
+Date: Fri Mar 13 21:32:08 2009 +0200
+
+ Fix Xv crash with overlay video.
+
+ Bug #20585.
+ (cherry picked from commit 2026c57cf0a352d9e6f9d208cfb7d4d550614477)
+
+commit d7e1543a618c54f1baeea7dd1ac54bb37e309fec
+Author: Jesse Barnes <jbarnes@virtuousgeek.org>
+Date: Fri Mar 13 12:21:34 2009 -0700
+
+ Use UXA when KMS is active
+
+ EXA doesn't support KMS, so force UXA on if KMS is detected. And warn
+ the user if they've specified something other than UXA in their
+ xorg.conf.
+
+ Fixes bug #20620.
+ (cherry picked from commit 3ef9d85371a97ea5baee0c47787b3bb3cdaf5135)
+
+commit e87bcd19a608aa964d6ea43ca5a19aed2efc818d
+Author: Zhenyu Wang <zhenyu.z.wang@intel.com>
+Date: Thu Mar 12 16:32:02 2009 +0800
+
+ Revert "SDVO: Switch control bus only before DDC access"
+
+ This reverts commit ddedf19f889da2ce6d69a3afce4665e2245682fa.
+
+ After i2c STOP, control bus will return back to internal
+ registers. So this brings back to origin code that we switch
+ to DDC bus before START. But it's ideal to only issue DDC
+ bus switch after STOP, not before every START, which might eliminate
+ some complains from SDVO device, that will be another patch later.
+ (cherry picked from commit dc3ff0b514b609448025680778f0e95e1980a5d8)
+
+commit 53b10efdb78c19d73689bff85f8d11863139b8b8
+Author: Zhenyu Wang <zhenyu.z.wang@intel.com>
+Date: Thu Mar 12 16:31:01 2009 +0800
+
+ SDVO: reset privates before output setup
+
+ For multifunction encoder, forget to reset these values
+ will cause wrong output type in later mode setting
+ operations.
+ (cherry picked from commit c6b0135d209bdad3dbc641d0e264596eaf6f99d3)
+
+commit 490cb578aef761e3fdd0a559bec36cdab96e6b2a
+Author: Dan Nicholson <dbn.lists@gmail.com>
+Date: Tue Mar 10 20:16:03 2009 -0700
+
+ Fix dist of xvmc sources
+
+ The XVMC AM_CONDITIONAL is only needed around the library expression.
+ None of the other definitons will cause anything to be built without
+ libXvMC, but they're needed for 'make dist'.
+
+ Signed-off-by: Dan Nicholson <dbn.lists@gmail.com>
+ (cherry picked from commit 28e7f0d71fa09e15a68ab4f0de169474b6235093)
+
+commit af97292c9df4e5178d5c8742f87ea8123d6e2243
+Author: Zhenyu Wang <zhenyu.z.wang@intel.com>
+Date: Tue Mar 10 14:21:36 2009 +0800
+
+ SDVO: fix pixel multiplier setting for TV
+
+ We should use preferred input timing's clock for correct
+ pixel multiplier setting, otherwise we might get inconsistent
+ multiplier setting on pipe and SDVO device for some modes.
+ (cherry picked from commit 2fcf4fcccfe7cfa1425985d21a144137eca07f4e)
+
+commit 419499d622ba10177b760da5324f0507ac146e9a
+Author: Eric Anholt <eric@anholt.net>
+Date: Mon Mar 9 20:06:30 2009 -0700
+
+ Fix XV with non-GEM kernels by allocating a larger fake bufmgr.
+
+ Ideally we'd not be using the EXA offscreen memory manager and just hand all
+ that memory to the fake bufmgr for non-GEM, but the fake bufmgr's too slow for
+ that, at least currently. So compromise and take enough memory that it will
+ succeed at XV allocations but hopefully not anger tiny-aperture systems too
+ much.
+
+ Bug #20563.
+ (cherry picked from commit fb6e00f40f713a87c760fc7603159ed11ea9b0d5)
+
+commit 1d19b024dba970e4b24daccb898101f77d5529ff
+Author: Carl Worth <cworth@cworth.org>
+Date: Tue Mar 10 17:15:54 2009 -0700
+
+ Increment version number to 2.6.99.902
+
+ This is a version number increment for the new release-candidate
+ tar file. As can be seen in the git history, there are no code
+ changes here. Instead, the incremented version simply captures
+ the fact that unlike .901, the .902 tar file has been built
+ correctly. Specifically, it was built this time on a system with
+ xmvclib present so all the necessary source files for building
+ against xmvclib are now included in the tar file.
+
+commit 4e334ef33c38e2e930958a4b68d79f1860bb9efa
+Author: Carl Worth <cworth@cworth.org>
+Date: Mon Mar 9 18:27:47 2009 -0700
+
+ Increment version number to 2.6.99.901 for 2.7-rc1
+
+ It sure seems like a bizarre numbering scheme to me, but it also
+ seems like the x.org way of doing things, (at least for now).
+
+commit dc12c4b3eb297b2f225409eacf1f3cd521453ab6
+Author: Eric Anholt <eric@anholt.net>
+Date: Sat Mar 7 23:22:54 2009 -0800
+
+ Flip the update_dri_buffers test around to only run when DRI1 is active.
+
+ Fixes segfaults at startup with DRI2 and load detection, or with DRI disabled
+ entirely.
+
+commit 646e12a9783d1d48ef21841f0909287a876731a4
+Author: Xiang, Haihao <haihao.xiang@intel.com>
+Date: Mon Mar 9 10:59:36 2009 +0800
+
+ typo in intel.man
+
+commit 73aa23d9150121a4e4b70a78cab910acd164abf5
+Author: Eric Anholt <eric@anholt.net>
+Date: Fri Dec 5 13:06:05 2008 -0800
+
+ DRI1: Update sarea (and other information) when CRTC configuration changes.
+
+ Bug #14423.
+
+ Signed-off-by: Eric Anholt <eric@anholt.net>
+
+commit abb213d933ac0d808fc10d4f8d88d7b8cef76346
+Author: Eric Anholt <eric@anholt.net>
+Date: Fri Mar 6 14:33:46 2009 -0800
+
+ Document the UXA AccelMethod.
+
+ Signed-off-by: Eric Anholt <eric@anholt.net>
+
+commit 568297d327cc321f1186afc54b38d08db3f2914d
+Author: Eric Anholt <eric@anholt.net>
+Date: Thu Jan 22 17:08:19 2009 -0800
+
+ Don't allocate the render power saving context in KMS mode.
+
+ That would be the kernel's job if it chooses to do it.
+
+ Signed-off-by: Eric Anholt <eric@anholt.net>
+
+commit 4e1144108424a4525bbd97c3d5a56de06760bdd9
+Author: Eric Anholt <eric@anholt.net>
+Date: Fri Mar 6 14:30:05 2009 -0800
+
+ unused variable warning fix.
+
+ Signed-off-by: Eric Anholt <eric@anholt.net>
+
+commit 043a76a040d4576b7a8397dca805466a99bfcdd6
+Author: Eric Anholt <eric@anholt.net>
+Date: Fri Mar 6 14:29:22 2009 -0800
+
+ clean up arguments to i830_allocate_framebuffer since zaphod removal.
+
+ Signed-off-by: Eric Anholt <eric@anholt.net>
+
+commit b23f57b310b693f56af273526383221a4f8b96f5
+Author: Eric Anholt <eric@anholt.net>
+Date: Thu Jan 22 17:17:09 2009 -0800
+
+ Use REGION_EQUAL in place of a local implementation.
+
+ Signed-off-by: Eric Anholt <eric@anholt.net>
+
+commit 6b61f9945f54df7469f2b2d702b621d4d6064c3f
+Author: Eric Anholt <eric@anholt.net>
+Date: Thu Jan 22 17:19:04 2009 -0800
+
+ nuke unused define.
+
+ Signed-off-by: Eric Anholt <eric@anholt.net>
+
+commit c3a747cb54acc1b037b559313e6a2113ae2ac4c7
+Author: Dan Nicholson <dbn.lists@gmail.com>
+Date: Wed Nov 26 09:57:24 2008 -0800
+
+ man: Put option defaults on separate indented line
+
+ The groff .IP macro is used to put the option defaults in a new indented
+ paragraph so they are separated from the explanations.
+
+ Signed-off-by: Dan Nicholson <dbn.lists@gmail.com>
+ [anholt: hand-applied due to conflicts. mistakes are my own]
+ Signed-off-by: Eric Anholt <eric@anholt.net>
+
+commit d2af21a66d7e1d1dd62c6aa8fb41d3fd6045bcd7
+Author: Eric Anholt <eric@anholt.net>
+Date: Fri Feb 27 23:38:00 2009 -0800
+
+ Remove configurable support for disabling XV.
+
+ google shows one instance of this being used a year and a half ago.
+
+commit 755757669f0cad670cfa084d33d7c3e928d27855
+Author: Eric Anholt <eric@anholt.net>
+Date: Fri Feb 27 22:57:15 2009 -0800
+
+ Remove configured SW cursor support.
+
+ Any time we actually need SW cursors, it gets enabled automatically.
+
+commit 917b20ead3cacf1e88314f20edde6a02b97b96d7
Author: Eric Anholt <eric@anholt.net>
-Date: Mon Mar 2 11:18:27 2009 -0800
+Date: Fri Feb 27 23:01:28 2009 -0800
- Bump version to 2.6.3.
+ Remove StolenOnly support.
+
+ We rely on having AGPGART present to successfully allocate video memory as
+ we configure it by default. Admit that fact, and remove support for
+ non-AGPGART/KMS setups.
-commit c0d91bd3ffea329058b63e648d2eae05edd9ad8a
+commit 73b7190421132ad73179c3fb7bb0e06c427dce5c
Author: Eric Anholt <eric@anholt.net>
-Date: Mon Mar 2 11:17:27 2009 -0800
+Date: Fri Feb 27 22:51:22 2009 -0800
+
+ intel: Nuke shared-entity support (zaphod mode).
+
+ It's been broken for years now, and KMS offers a much better chance of getting
+ this working sensibly without making a mess of the 2D driver.
+
+commit e9d6bbbe0b41e29c58a79844decd81771da85dd4
+Author: Eric Anholt <eric@anholt.net>
+Date: Tue Mar 3 16:45:03 2009 -0800
+
+ remove more page flipping leftovers.
+
+commit 1cc9b1423c5df591c615ef9588b6eefd81448f80
+Author: Lukáš Hejtmánek <xhejtman@ics.muni.cz>
+Date: Fri Mar 6 14:44:03 2009 -0500
+
+ Fix another VT switch leak
+
+ The batch_bo buffer object is reallocated on enter VT, so we need to
+ unref it on leave vt.
+
+ Signed-off-by: Lukas Hejtmanek <xhejtman@ics.muni.cz>
+
+commit 67fef27f4b76490be085d232aba0ca9cbb3c5e59
+Author: Xiang, Haihao <haihao.xiang@intel.com>
+Date: Fri Mar 6 09:40:07 2009 +0800
+
+ Xv: free tearing on textured video
+
+ Add an Xv attribute XV_SYNC_TO_VBLANK which has three values -1(auto), 0(off)
+ and 1(on) to control whether textured adapter synchronizes the screen
+ update to the vblank. The default value is -1(auto).
+
+commit 0d20bbbc2005a51f427a9ae6b6a66dbbb101dbab
+Author: Zhenyu Wang <zhenyu.z.wang@intel.com>
+Date: Thu Feb 19 14:24:24 2009 +0800
+
+ SDVO: handle multifunction encoder (try 2)
+
+ For SDVO encoder that advertise multiple functions,
+ we have to get attached display to determine current
+ output, and update output's name according with
+ current type.
+
+commit d4c64f01b9429a8fb314e43f40d1f02bb8aab30f
+Author: Lukas Hejtmanek <xhejtman@ics.muni.cz>
+Date: Wed Mar 4 17:33:27 2009 -0500
+
+ Fix serious memory leak at Enter/LeaveVT
+
+ This fixes huge memory leak at each VT switch (about 600 BOs + 6MB
+ of RSS of Xserver).
+
+commit 095a001f755201d3c19335b67a84c57b1d080a83
+Author: Kristian Høgsberg <krh@redhat.com>
+Date: Wed Mar 4 17:10:24 2009 -0500
+
+ Use drmSetMaster() and drmDropMaster() in enter/leave VT
+
+ This allows multiple X server to use DRI and makes it possible to run
+ multiple X servers under KMS. This requires a 2.6.29 kernel to work.
+ On older kernels it will just log a warning and DRI will fail to
+ initialize for the second X server.
+
+commit 14bb61e0c2e28725a2f6167d3263649bc845be18
+Author: Zhenyu Wang <zhenyu.z.wang@intel.com>
+Date: Mon Mar 2 16:55:45 2009 +0800
+
+ SDVO: only check digital monitor when EDID exists
+
+commit 42e34e90e2e4048b38481cab61cef46f932eada7
+Author: Zhenyu Wang <zhenyu.z.wang@intel.com>
+Date: Tue Mar 3 22:55:35 2009 +0800
+
+ TV: add property control for TV attributes
+
+ This is based on Jesse's origin patch for bug #12763.
+ But export integer range to user instead of hardware float
+ point format, and fix different real format on 965G and 945G
+ for contrast and saturation.
+
+commit aa9da5e393c804019720503fe58bdd247fe1eabd
+Author: Zhenyu Wang <zhenyu.z.wang@intel.com>
+Date: Tue Mar 3 20:26:19 2009 +0800
+
+ TV: add option to set TV connector type
+
+ This can let user override non-stable driver TV load detect,
+ and set connector type manually, e.g for s-video to component
+ converter, this patch seems must needed to use HD modes.
+
+commit ab1ef05cc0fd5ba9768c26cc51bc2c7b52baa45f
+Author: Zhenyu Wang <zhenyu.z.wang@intel.com>
+Date: Thu Feb 19 20:23:02 2009 +0800
+
+ TV: update output and crtc modes when TV format change (try 3)
+
+ This is to fix bug #16566, change TV format will cause BadMatch
+ error when crtc config apply. Everytime when we change TV format,
+ we may generate a new list of modelines as TV clock changed. After
+ randr get info request, new modelines will be probed and randr output's
+ modes will be renewed too. But crtc's mode failed to be updated,
+ as it never can find a matching mode now within new modes list.
+ So get info will return an invalid crtc's mode, later set crtc
+ config will pass that info, and xserver catches a bad match.
+
+ This patch trys to refresh output modes and setup crtc's mode
+ with new modelines in TV format change. So get info would be
+ sure to turn valid crtc mode that reference in current new modelines.
+
+commit a67a911a93ff3c0b3d2e6f6fb20c0787b9d4d41d
+Author: Zhenyu Wang <zhenyu.z.wang@intel.com>
+Date: Thu Feb 19 01:00:33 2009 +0800
+
+ TV: sort input mode lines
+
+commit bd360e7517835626bee54bec968cdc78908c6545
+Author: Adam Jackson <ajax@redhat.com>
+Date: Mon Mar 2 10:33:35 2009 -0500
+
+ KMS: Wire up output DPMS.
+
+commit 2d0aa553609a0e64fa4b2e755b9b1e244e5c3fa1
+Author: Zhenyu Wang <zhenyu.z.wang@intel.com>
+Date: Mon Mar 2 15:26:44 2009 +0800
+
+ Skip LVDS config parsing on pre-9xx chips.
+
+ 855GM laptops seems pretty broken when parsing this block.
+
+commit 55359ef9ab0a2be42a55e0279835f76a191d6c74
+Author: Zhenyu Wang <zhenyu.z.wang@intel.com>
+Date: Fri Feb 27 09:02:30 2009 +0800
+
+ Update driver feature block definition for missed fields
+
+commit 38a7683561cee7fffab174c2a166bfd51b51ba27
+Author: Eric Anholt <eric@anholt.net>
+Date: Fri Feb 27 22:55:44 2009 -0800
+
+ warnings cleanup
+
+commit 5bfd73cd31ba197a62f549cdbad1a1270b571027
+Author: Eric Anholt <eric@anholt.net>
+Date: Fri Feb 27 19:09:49 2009 -0800
Only allocate pixmaps aligned for tiling when requested by DRI2 GetBuffers.
This saves massive quantities of memory on pre-965 since the DRI2 tiling
enable caused the minimum size of any pixmap to be 1MB.
- (cherry picked from commit 5bfd73cd31ba197a62f549cdbad1a1270b571027)
-commit 5441be42649e4f969ac16c323de2fb5ed93b271a
+commit f53bdad1412f841075232455837578f00709c6ef
+Author: Shaohua Li <shaohua.li@intel.com>
+Date: Mon Feb 23 15:19:23 2009 +0800
+
+ Intel video driver patch
+
+ This is the intel video driver patch for a new chip, which is G33-like
+ and has some clocking setting related register changes. This patch adds
+ the pci id and DPLx/FPx register changes.
+
+ The gtt tool should just work to me, as the chip hasn't any changes
+ against G33 on this side.
+
+ Signed-off-by: Shaohua Li <shaohua.li@intel.com>
+ Signed-off-by: Eric Anholt <eric@anholt.net>
+
+commit 22dc9a5580d77cc4707bfb8e19474e611a06ae9a
+Author: Eric Anholt <eric@anholt.net>
+Date: Tue Feb 24 18:22:20 2009 -0800
+
+ Fix UXA for server 1.4.
+
+commit cb1f7ec0876746c1b52b63cdb508544e9e4e32e3
+Author: Eric Anholt <eric@anholt.net>
+Date: Tue Feb 24 21:23:59 2009 -0800
+
+ uxa: Fix composite fallback debug printing of main memory versus bo info.
+
+ It was just printing whether it was a pixmap (it is), instead of whether the
+ pixmap was offscreen.
+
+commit 635eaa511f28fb673fe306e46ed5370e78a8a534
+Author: Eric Anholt <eric@anholt.net>
+Date: Tue Feb 24 21:48:11 2009 -0800
+
+ Regard the screen pixmap as suitable for acceleration.
+
+ With UXA on the fake bufmgr, the screen pixmap doesn't have a BO and so
+ no acceleration was occurring.
+
+commit 70e0261208654c6c875ad462da2734c6aa9eeb96
Author: Eric Anholt <eric@anholt.net>
Date: Tue Feb 24 20:54:05 2009 -0800
Disable fb resizing for DRI1-only server so that DRI1 can initialize.
- (cherry picked from commit 70e0261208654c6c875ad462da2734c6aa9eeb96)
-commit 93ae6c7f8cadb60d479e626ddd2a67d7cb2cc4c0
+commit d7aa330db31100b7cb54d8165f9a4b94329ece32
Author: Eric Anholt <eric@anholt.net>
-Date: Tue Feb 24 13:59:17 2009 -0800
+Date: Tue Feb 24 20:34:10 2009 -0800
+
+ Fix up i915 composite and common solid/copy code to use check_aperture.
+
+ This could fix complaints about binding BOs and resulting failure to render.
+
+commit a625a07022ea7f6757b288fcc2ffb9e27c7f8341
+Author: Xiang, Haihao <haihao.xiang@intel.com>
+Date: Wed Feb 25 16:48:22 2009 +0800
- Bump version to 2.6.2 for release.
+ XvMC: fix broken xvmc on 965
-commit 626a54870fd3c5038c7bdae5d9085fe98f73885b
+commit f6d8ae69b0f97e696c142f06c8038f336ed024f9
+Author: Zhenyu Wang <zhenyu.z.wang@intel.com>
+Date: Wed Feb 25 09:57:00 2009 +0800
+
+ Use LVDS config in Driver feature BDB for integrated LVDS check
+
+ The LVDS config bits in VBT driver feature block is used by vendor
+ to identify the board implement of integrated LVDS/eDP or SDVO LVDS.
+ And video bios uses these bits for LVDS enabling or not. So check
+ these bits for integrated LVDS might eliminate more quirks.
+
+commit 8718551f14e064b461e80a583597f0ea9fb8ca9f
+Author: Zhenyu Wang <zhenyu.z.wang@intel.com>
+Date: Wed Feb 25 09:54:03 2009 +0800
+
+ Update LVDS config bits definition in driver feature block
+
+ ALL_LVDS is actually not defined before and include GM45.
+ Embedded DP bit will be used for newer chips.
+
+commit 9d8e5c21a1688b915bf39261d4c3b0bf2906daef
Author: Eric Anholt <eric@anholt.net>
Date: Tue Feb 24 14:05:15 2009 -0800
Fix distcheck from drmmode_display.h deletion.
- (cherry picked from commit 9d8e5c21a1688b915bf39261d4c3b0bf2906daef)
-
-commit aa6997ecd5383ee94c8ac9cfca4a1b58820e098c
-Author: Kristian Høgsberg <krh@redhat.com>
-Date: Tue Feb 24 13:58:20 2009 -0500
-
- Update kms to work with drmModeModeInfo API update.
- (cherry picked from commit a6b31f38ebf470c61de0e10b0ce2af0d7ee1684b)
-commit 97b3ab47c6eec98baf7566e7290c6030934ad956
+commit f4e2f522a5c5b03ea530b9eb67e9d1a9a96274ce
Author: Eric Anholt <eric@anholt.net>
Date: Sat Feb 21 20:36:58 2009 -0800
@@ -49,16 +879,61 @@ Date: Sat Feb 21 20:36:58 2009 -0800
This was hit by xv86vm's SwitchMode path, and for that the CRTC offsets
get set at mode setting time anyway.
- (cherry picked from commit 53108994616d9751ac3a29fd61eb269cfaeab967)
-commit f3f21a0e45060aa7b333e026938325af133b014c
+commit 170f00e161931fdaa8c2812fc710649e1d6d977a
+Author: Kristian Høgsberg <krh@redhat.com>
+Date: Tue Feb 24 14:07:23 2009 -0500
+
+ Remove a handful of unused variable warnings.
Reply to: