ChangeLog | 1077 ++++++++++++- configure.ac | 32 debian/changelog | 7 debian/control | 2 man/intel.man | 2 src/Makefile.am | 4 src/bios_reader/bios_reader.c | 1 src/common.h | 1 src/drmmode_display.c | 31 src/i810_reg.h | 1 src/i830.h | 41 src/i830_accel.c | 15 src/i830_batchbuffer.c | 9 src/i830_bios.c | 3 src/i830_crt.c | 3 src/i830_debug.c | 2 src/i830_display.c | 24 src/i830_dri.c | 253 +++ src/i830_driver.c | 310 +-- src/i830_exa.c | 51 src/i830_hdmi.c | 20 src/i830_hwmc.c | 8 src/i830_hwmc.h | 5 src/i830_lvds.c | 9 src/i830_memory.c | 17 src/i830_quirks.c | 16 src/i830_sdvo.c | 19 src/i830_tv.c | 89 - src/i830_video.c | 28 src/i830_video.h | 7 src/i965_hwmc.c | 317 +++ src/i965_hwmc.h | 25 src/i965_render.c | 453 +++-- src/i965_video.c | 1131 ++++++++------ src/xvmc/I810XvMC.c | 54 src/xvmc/Makefile.am | 123 + src/xvmc/addidct.g4i | 152 + src/xvmc/backward.g4b | 1472 ++++++++++++++++++ src/xvmc/block_clear.g4i | 140 + src/xvmc/dual_prime.g4a | 223 ++ src/xvmc/dual_prime.g4b | 2486 +++++++++++++++++++++++++++++++ src/xvmc/dual_prime_igd.g4a | 223 ++ src/xvmc/dual_prime_igd.g4b | 1142 ++++++++++++++ src/xvmc/f_b.g4b | 2886 ++++++++++++++++++++++++++++++++++++ src/xvmc/field_backward.g4a | 124 + src/xvmc/field_backward.g4b | 1341 ++++++++++++++++ src/xvmc/field_backward_igd.g4a | 124 + src/xvmc/field_backward_igd.g4b | 669 ++++++++ src/xvmc/field_f_b.g4a | 223 ++ src/xvmc/field_f_b.g4b | 2486 +++++++++++++++++++++++++++++++ src/xvmc/field_f_b_igd.g4a | 223 ++ src/xvmc/field_f_b_igd.g4b | 1142 ++++++++++++++ src/xvmc/field_forward.g4a | 121 + src/xvmc/field_forward.g4b | 1340 ++++++++++++++++ src/xvmc/field_forward_igd.g4a | 121 + src/xvmc/field_forward_igd.g4b | 668 ++++++++ src/xvmc/forward.g4b | 1471 ++++++++++++++++++ src/xvmc/frame_backward.g4a | 69 src/xvmc/frame_backward.g4b | 716 ++++++++ src/xvmc/frame_backward_igd.g4a | 69 src/xvmc/frame_backward_igd.g4b | 374 ++++ src/xvmc/frame_f_b.g4a | 131 + src/xvmc/frame_f_b.g4b | 1257 +++++++++++++++ src/xvmc/frame_f_b_igd.g4a | 131 + src/xvmc/frame_f_b_igd.g4b | 573 +++++++ src/xvmc/frame_forward.g4a | 65 src/xvmc/frame_forward.g4b | 715 ++++++++ src/xvmc/frame_forward_igd.g4a | 65 src/xvmc/frame_forward_igd.g4b | 373 ++++ src/xvmc/i965_xvmc.c | 760 +++++++++ src/xvmc/i965_xvmc.h | 2 src/xvmc/intel_batchbuffer.h | 37 src/xvmc/intel_xvmc.c | 88 - src/xvmc/intel_xvmc.h | 1 src/xvmc/ipicture.g4a | 166 ++ src/xvmc/ipicture.g4b | 125 + src/xvmc/motion_field_uv.g4i | 46 src/xvmc/motion_field_uv_igd.g4i | 46 src/xvmc/motion_field_y.g4i | 45 src/xvmc/motion_field_y_igd.g4i | 45 src/xvmc/motion_frame_uv.g4i | 29 src/xvmc/motion_frame_uv_igd.g4i | 29 src/xvmc/motion_frame_y.g4i | 57 src/xvmc/motion_frame_y_igd.g4i | 57 src/xvmc/null.g4a | 57 src/xvmc/null.g4b | 17 src/xvmc/read_field_x0y0_uv.g4i | 74 src/xvmc/read_field_x0y0_uv_igd.g4i | 40 src/xvmc/read_field_x0y0_y.g4i | 83 + src/xvmc/read_field_x0y0_y_igd.g4i | 48 src/xvmc/read_field_x0y1_uv.g4i | 78 src/xvmc/read_field_x0y1_uv_igd.g4i | 43 src/xvmc/read_field_x0y1_y.g4i | 86 + src/xvmc/read_field_x0y1_y_igd.g4i | 51 src/xvmc/read_field_x1y0_uv.g4i | 75 src/xvmc/read_field_x1y0_uv_igd.g4i | 40 src/xvmc/read_field_x1y0_y.g4i | 83 + src/xvmc/read_field_x1y0_y_igd.g4i | 48 src/xvmc/read_field_x1y1_uv.g4i | 172 ++ src/xvmc/read_field_x1y1_uv_igd.g4i | 75 src/xvmc/read_field_x1y1_y.g4i | 166 ++ src/xvmc/read_field_x1y1_y_igd.g4i | 78 src/xvmc/read_frame_x0y0_uv.g4i | 73 src/xvmc/read_frame_x0y0_uv_igd.g4i | 39 src/xvmc/read_frame_x0y0_y.g4i | 109 + src/xvmc/read_frame_x0y0_y_igd.g4i | 50 src/xvmc/read_frame_x0y1_uv.g4i | 79 src/xvmc/read_frame_x0y1_uv_igd.g4i | 44 src/xvmc/read_frame_x0y1_y.g4i | 113 + src/xvmc/read_frame_x0y1_y_igd.g4i | 54 src/xvmc/read_frame_x1y0_uv.g4i | 75 src/xvmc/read_frame_x1y0_uv_igd.g4i | 41 src/xvmc/read_frame_x1y0_y.g4i | 110 + src/xvmc/read_frame_x1y0_y_igd.g4i | 51 src/xvmc/read_frame_x1y1_uv.g4i | 159 + src/xvmc/read_frame_x1y1_uv_igd.g4i | 71 src/xvmc/read_frame_x1y1_y.g4i | 264 +++ src/xvmc/read_frame_x1y1_y_igd.g4i | 105 + uxa/uxa-accel.c | 30 uxa/uxa-glyphs.c | 16 uxa/uxa-priv.h | 11 uxa/uxa-render.c | 39 uxa/uxa-unaccel.c | 236 +- uxa/uxa.c | 82 - 124 files changed, 30971 insertions(+), 1232 deletions(-)
New commits: commit e18f8828668d9415947db5a0ecc977ff7108bc2c Author: Julien Cristau <[email protected]> Date: Fri Jan 9 02:58:12 2009 +0100 Update libdrm-dev build-dep to 2.4.3. diff --git a/debian/changelog b/debian/changelog index 9ab6ba7..f06a042 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ xserver-xorg-video-intel (2:2.5.99.2-1) UNRELEASED; urgency=low * New upstream release. + * Update libdrm-dev build-dep to 2.4.3. -- Julien Cristau <[email protected]> Fri, 09 Jan 2009 02:56:44 +0100 diff --git a/debian/control b/debian/control index 002e456..d185802 100644 --- a/debian/control +++ b/debian/control @@ -17,7 +17,7 @@ Build-Depends: x11proto-randr-dev (>= 1.2), x11proto-render-dev, x11proto-xinerama-dev, - libdrm-dev (>= 2.4.1), libdrm-intel1, + libdrm-dev (>= 2.4.3), x11proto-xf86dri-dev, libpciaccess-dev (>= 0.8.0+git20071002), dpkg-dev (>= 1.14.17), commit 7e3383d6646646345391533c5ab0e89a727f88f4 Author: Julien Cristau <[email protected]> Date: Fri Jan 9 02:57:18 2009 +0100 Update changelogs diff --git a/ChangeLog b/ChangeLog index 9faef62..84d9414 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,654 @@ -commit 0d2bf2742eca175a9c92fe939ddb202f63594af1 +commit 4447973345a2a7af20ba1d6cb18c5f1ed8949d00 +Author: Zhenyu Wang <[email protected]> +Date: Thu Jan 8 14:34:11 2009 +0800 + + Bump version 2.5.99.2 + +commit 21c2a0a75bec887413cddde46351b6d87469993f +Author: Eric Anholt <[email protected]> +Date: Tue Jan 6 10:55:59 2009 -0800 + + Always enable KMS if server's new enough, and remove option. + + The API should be stable at this point, and we don't want to allow mistakes. + (cherry picked from commit 934008a2cbcec0c790580750c672c0367a9e4c55) + +commit bb415fd714323f36199a9bef890d885733f2e046 +Author: Eric Anholt <[email protected]> +Date: Mon Jan 5 23:21:07 2009 -0800 + + Fix pin leakage with EXA GTT-mapping shortcut, and crash with UXA on KMS. + (cherry picked from commit 342120be0956bfc12822d1ffbfbd8aaabf3e922f) + +commit ca3e9afdeeb2ef7d145330cbc696afb8d9324dce +Author: Eric Anholt <[email protected]> +Date: Mon Jan 5 23:28:50 2009 -0800 + + Disable DRI2 buffer tiling on non-965, as those need fence regs for 2D blits. + + This fixes glReadPixels failure on single-channel 915GM, as the software code + for readpixels was actually the only code in the driver doing tiling against + these buffers (everything else says "rely on fence registers", since the 2D + blits don't have a "don't rely on fence registers" option). + (cherry picked from commit 9a5082d2920c1a212fe935b5a093013e8035c321) + +commit 3b03f200d3f8a8f3c3bbdd4f1ca6d8f98d754936 +Author: Keith Packard <[email protected]> +Date: Mon Dec 15 15:49:01 2008 -0800 + + FatalError on batchbuffer map failure + + Yes, it would be nice to do something other than crash here. + + Signed-off-by: Keith Packard <[email protected]> + (cherry picked from commit 7736b65be4fb4d5c59d7aedb1e64da976bb10ae9) + +commit a6fda34a12292a415f89a97d70f74c51d729b659 +Author: Keith Packard <[email protected]> +Date: Mon Dec 15 15:43:34 2008 -0800 + + uxa: handle uxa_prepare_access failure + + uxa_prepare_access may fail to map the pixmap into user space. Recover from + this without crashing. + + Signed-off-by: Keith Packard <[email protected]> + (cherry picked from commit 632f816c72cb4b48b690fd92d1cc1d5a9c9285c7) + +commit dd4cda21488913e1d01fcee3debda8f15f3f8517 +Author: Keith Packard <[email protected]> +Date: Mon Dec 15 15:41:28 2008 -0800 + + Handle drm_bo_map failure in 965 video and composite paths. + + These two paths allocate a number of objects directly. + + Signed-off-by: Keith Packard <[email protected]> + (cherry picked from commit 90b28a56553d809374fa6d9b9529b7a8b583488c) + +commit 48499068f98b09ba14ee48281f110f626f16ad5f +Author: Henry unbongo <[email protected]> +Date: Mon Dec 29 13:54:38 2008 -0800 + + Add support for SDVO LVDS. + (cherry picked from commit 59b0fbb9be880d489374b141f818948a2721a2ef) + +commit fac43181af0ad59fa6d06e26d369d886ce221c10 +Author: Zhenyu Wang <[email protected]> +Date: Wed Dec 31 22:56:57 2008 +0800 + + UXA: Fallback to dri_bo_map() if pin failed + + This fixes VT switch issue with UXA after Eric's + aae4008096399a0e84abc7c016b35092caf9db25 on 2D side. + (cherry picked from commit 1f61e97904dfe5f8c08bb9f284cfdfe878f7e541) + +commit 8dfbd9ea1733768bf528e04a660a1ac478c3249e +Author: Eric Anholt <[email protected]> +Date: Mon Dec 29 13:42:44 2008 -0800 + + Don't touch the pipestat regs for detecting FIFO underrun. The kernel owns them. + + Since we don't perform any synchronization with the kernel on these regs, we + could race with the kernel to write stale values and end up not having vblank + interrupts enabled when somebody was waiting on one. + (cherry picked from commit 830bf916724afd21b7947f797c22a8c8aab7a0a4) + +commit d00c69f9cb95bb9bbe5dcb5f7a740e3bd2c00e2a +Author: Kristian Høgsberg <[email protected]> +Date: Mon Dec 15 14:54:20 2008 -0500 + + Quiet some KMS warnings. + (cherry picked from commit e6479f96e5d8da39fcbb5376c4a66a1f924ec4e4) + +commit fde2990e26ffb0736e78a82178a31df8807cf1ed +Author: Eric Anholt <[email protected]> +Date: Wed Dec 17 14:25:22 2008 -0800 + + uxa: Do a hack to use the aperture mapping instead of bo_map in sw fallbacks. + + Because of how fallbacky the uxa rendering core is, and our inability (without + wfb in userland or page faulting in the kernel) to tell the kernel just where + we're going to fall back, the clflush overhead can become outrageous, for + example with emacs and xcompmgr. Instead of using drm_intel_bo_map, pin the + buffer and do the fallback to the aperture mapping. This gets us the bad old + performance that fb is designed for, instead of bad new performance. + (cherry picked from commit aae4008096399a0e84abc7c016b35092caf9db25) + +commit 6371dbbee3051d7ac614f5d7a794519a4c04deeb +Author: Eric Anholt <[email protected]> +Date: Mon Dec 29 10:41:02 2008 -0800 + + Add PCI write posting to LeaveVT path when we're about to wait on write results. + (cherry picked from commit 3544bbe22d8cf2640289e1e4febe755a47f26631) + +commit c40fdef11420fadc1a6d7a3d63dea8b85ce402f2 +Author: Eric Anholt <[email protected]> +Date: Mon Dec 29 09:51:45 2008 -0800 + + Rely on libdrm 2.4.3 and stop checking for xf86drmMode.h. + (cherry picked from commit 8464fc285d7b22fd45b7af616fd52aa15e16638a) + +commit 785d20d93f66310880f8cea0bf6c2ccf544a0e29 +Author: Eric Anholt <[email protected]> +Date: Mon Dec 22 16:49:57 2008 -0800 + + Remove old mergedfb includes and defines, which bother spatch. + (cherry picked from commit c1dde7ac06ce6470c74198b2560ee67d28fb0aea) + +commit 2c23c0c39b06669c68f8fefda90b033715a803cf +Author: Zhenyu Wang <[email protected]> +Date: Tue Dec 30 00:55:30 2008 +0800 + + Bug #18004: Add Aopen 915GM LVDS quirk + (cherry picked from commit 75799d2834be84b016391ec95b221df32380e3e7) + +commit 94a77b62510d8db5cd21ef40b8d03a36cd0c0af2 +Author: Zhenyu Wang <[email protected]> +Date: Mon Dec 29 21:17:44 2008 +0800 + + Don't count vertex buffer in second aperture size check + + With batch flush notify vertex buffer will be unreferenced, + so don't count it in later aperture check. Also adding + uninitialized vertex buffer check in batch flush notify. + (cherry picked from commit cfaaf6af777ad8e56da5a077bdc01f4f2d7bc4d6) + +commit 1b897abd6c8500dc6dcaac548ab7d531f37522c8 +Author: Dave Airlie <[email protected]> +Date: Mon Dec 29 12:50:25 2008 +1000 + + intel/kms: disable overlay when it needs physical address + + We can't do phy address allocations, need kernel support for this. + + Signed-off-by: Dave Airlie <[email protected]> + (cherry picked from commit b710a688a7383df320f9d4e765b48331310a4d1d) + +commit f0e9e54c96ac58cab9ea9d6b83739c84d1ae13d7 +Author: Dave Airlie <[email protected]> +Date: Mon Dec 29 12:48:11 2008 +1000 + + intel: don't call enter/leave VT for KMS enabled systems + + Signed-off-by: Dave Airlie <[email protected]> + (cherry picked from commit 649374b88b330838133d78be1953ce8b18ddd2c6) + +commit 59358ecbbeceb9a2ce5a33787941c2e67fee4218 +Author: Dave Airlie <[email protected]> +Date: Mon Dec 29 12:47:30 2008 +1000 + + exa: fix map gtt call to use current API + (cherry picked from commit 408f7139354a942f29334795b5480a0b6bb6142a) + +commit 649b32a5dc941a688f4671b903774ea2ea97d2f2 +Author: Dave Airlie <[email protected]> +Date: Mon Dec 29 11:51:58 2008 +1000 + + modeset: transformPresent is a new API member + (cherry picked from commit 6b9f421b792c701e909d81ae2b6e6a47fb069b0b) + +commit b076d399344e5b6495e069342f7f862c810c8ece +Author: Dave Airlie <[email protected]> +Date: Mon Dec 29 11:34:51 2008 +1000 + + modeset: fix xf86CrtcRotate API change across server versions + (cherry picked from commit a320541e51818833a6a445707835fbf70e9babd4) + +commit 892cb5db6fd4c5cc692bc74a2615860f27e9feff +Author: Ma Ling <[email protected]> +Date: Mon Dec 22 10:35:52 2008 +0800 + + SDVO: reset pixel repeat in avi frame + + For #19115, the root cause is avi_if.u.avi.PR in + i830_sdvo_set_avi_infoframe() belongs to element for + interlaced mode based on CEA_861B, but currently we + don't support interlaced mode. So it should be set as 0. + (cherry picked from commit e38fd84fcccc18284b649a60b4cfd8e24eaf059d) + +commit 5586aa24ebfbd7333c3438a7c7e4810bc548ff1b +Author: Peter Alfredsen <[email protected]> +Date: Fri Dec 19 08:10:06 2008 +0800 + + xvmc: fix up needed libs + (cherry picked from commit 74bc420940de4ed02705211ddebbc4033c032242) + +commit 304dddf6578c55ce7324d930cfb9b3ba605a007a +Author: Robert Noland <[email protected]> +Date: Wed Dec 17 09:27:30 2008 +0800 + + Fix drmOpen for non-linux 965 XvMC + + drmOpen by name only works on linux after falling back to groping around + in /proc. This doesn't work on other OS. + + Signed-off-by: Robert Noland <[email protected]> + (cherry picked from commit ed267072db7c58ee16a458fd3dc24ce3a2d0061d) + +commit 621859803c0dcb893ea3f3d95d36b4c51a08cbe3 +Author: Eric Anholt <[email protected]> +Date: Sun Dec 14 16:09:25 2008 -0800 + + uxa: Correctly prepare/finishaccess of stipple in ValidateGC (and only it) + + This avoids prepare/finish_access_gc overhead when we're not changing things + (since GCTile is already handled) and get us the RW flag for the prepare on + of the stipple pixmap so thing will be synced correctly. + (cherry picked from commit ecdd706873c1f990f4a78fbaecf7380411edabcd) + +commit 83f3c376b5942e134047a220e6e5f2432ffc492c +Author: Zhenyu Wang <[email protected]> +Date: Tue Dec 16 09:26:09 2008 +0800 + + Bump version 2.5.99.1 + +commit f1681971157c83a68fe76a8561220fcebecf80f8 +Author: Zou Nan hai <[email protected]> +Date: Fri Dec 12 11:18:25 2008 -0800 + + Update binary versions of the dual-prime kernels + + Signed-off-by: Keith Packard <[email protected]> + (cherry picked from commit f3e59e59b54696667b127c82327e16b14d7bab22) + +commit fb84568d66aa9fe083da8ad34c1a847849622bd9 +Author: Zhenyu Wang <[email protected]> +Date: Fri Dec 12 18:27:29 2008 +0800 + + Don't warn on ring enabled in GEM + (cherry picked from commit 80d588e9c49719ec494e705edfc14c78908bbc3f) + +commit c755187b695cd9093084fcf59bce57f00d959fb1 +Author: Zhenyu Wang <[email protected]> +Date: Fri Dec 12 18:00:09 2008 +0800 + + Fix directRenderingType check + + Don't miss classic texture memory allocation in DRI. + (cherry picked from commit 60c4ee9ece8ea57e61b1590dfeb69d08555e465c) + +commit 1e5713fc4f7fc900f2f04f48e940c14d0cc3e74d +Author: Zou Nan hai <[email protected]> +Date: Thu Dec 11 15:41:59 2008 +0800 + + [965-xvmc] fix dual prime kernel, flush issue on G4x + (cherry picked from commit edf765155497d89ecac328a5b268ecf60e2f377c) + +commit 005127b5825993d2fe3c36e3a01a37ea6904739e +Author: Bryce Harrington <[email protected]> +Date: Thu Dec 11 09:38:27 2008 +0800 + + Pipe-A quirk for HP 2730p (bug #18852) + (cherry picked from commit 83377b543defdca7226d7c1a7794e4ff3d8b4c84) + +commit d5ed8674127c5612df35510ce560dd2938558601 +Author: Bryce Harrington <[email protected]> +Date: Thu Dec 11 09:34:15 2008 +0800 + + PipeA quirk for Quanta/W251U (launchpad bug #244242) + (cherry picked from commit 6c4e134a1a30785c2e5c6d57b21fde54a2dd3413) + +commit dd284392ce4792d20c2fcd09bbb6b8e168978d30 +Author: Zhenyu Wang <[email protected]> +Date: Wed Dec 10 10:54:31 2008 +0800 + + Try to always probe SDVOC on 965G/965GM + + Detect bit of SDVOC is reserved on 965G/965GM, instead of ignore SDVOC + this trys to always probe it on these chipsets. + (cherry picked from commit 1e974ff6b8446ecd64677b3c9aba60ca850923cc) + +commit 5c659cbcf33f56878d14d5e74747870ce29d76bf +Author: Zhenyu Wang <[email protected]> +Date: Wed Dec 10 10:36:07 2008 +0800 + + bug #17395: Quirk CRT for Sony VGC-LT71DB + (cherry picked from commit f5f67e1b54e67b4bfc3db3482b2693211be81d63) + +commit dbb84f166b00d288fa81dcf86cab011177690a11 +Author: Keith Packard <[email protected]> +Date: Tue Dec 9 21:51:14 2008 -0800 + + Add RandR 1.3 panning support by supporting the crtc set_origin function + + RandR 1.3 panning support can use the regular mode setting interface, but + that's really slow. Providing set_origin makes it nice and snappy. + + Signed-off-by: Keith Packard <[email protected]> + (cherry picked from commit d8b764fbd27dc9c8b28386093931b8d38855bd19) + +commit e807834863d6d3c3779fc3513e13c6a99f645d96 +Author: Zhenyu Wang <[email protected]> +Date: Tue Dec 9 19:19:58 2008 +0800 + + Remove Cappuccino SlimPRO SP625F 855GM LVDS quirk + + It breaks bug #18462 on IBM 855GM with same subdevice ids. + (cherry picked from commit 0fe61b0b7e3bbe8ced1b0ad2be72c438d200c64b) + +commit 46249d548f581aafa06a5188cba7a9b94cf2916d +Author: Carl Worth <[email protected]> +Date: Fri Dec 5 15:42:53 2008 -0800 + + Set vertex_buffer_bo to NULL after unreference. + + Which is just being tidy. We initially were looking at this code + path due to a report of a crash on server shutdown which started + after this unreference call was added. Setting this to NULL + apparently didn't avoid the crash, but it's a good thing to do + regardless. + (cherry picked from commit bea98cdfd93fc1181a06c51e57fcab227ff4827e) + +commit 178a1629a89ed35b94cd25408063eeaa38f7e59b +Author: Carl Worth <[email protected]> +Date: Thu Dec 4 11:41:02 2008 -0800 + + Don't smash fixed_mode if skip_panel_detect is set. + + Without this change, setting LVDSFixedMode to false is not effective + as i830_bios_init calls i830_parse_panel_data which in turns sets + a fixed_mode. To fix this we still call parse_panel_data to set + the various lvds_options but we return before setting fixed_mode. + (cherry picked from commit ce7efc2e3676c8f80206415480dda91e5e021396) + +commit a13bb74af9d0dcfa5a6c9991711f46d258b962e1 +Author: Carl Worth <[email protected]> +Date: Wed Dec 3 13:49:52 2008 -0800 + + i965: Add batch_flush_notify hook to create new vertex-buffer bo + + This avoids mapping a buffer object which is being referenced + by a batch that has already been flushed, (which is a terribly + expensive operation). + + On my machine this brings the performance of x11perf -aa10text + from 85k back to 150k, (where it was before a recent kernel + upgrade). Also, before this patch, when I used my X server + actively performance would drop as low as 15k---hopefully that + bug is gone with this change. + (cherry picked from commit e8b95efbf5d9c3a5b75b2bb8b5b51844b5fcdfbc) + +commit 6ca0d7e6ff05bff2bb88bfae64c2d79ac115bd38 +Author: Zhenyu Wang <[email protected]> +Date: Mon Dec 8 10:33:13 2008 +0800 + + Fix DRI2 compiling warning + (cherry picked from commit 768f317cf0da4cd6682af2e71e71c3e130e05182) + +commit e0149c6189e422d74453144260317cdb30c86dcc +Author: Zhenyu Wang <[email protected]> +Date: Mon Dec 8 10:30:12 2008 +0800 + + Fix TV compiling warning + (cherry picked from commit 95596f51503bb468364719aec9083d59999e34b7) + +commit f98ca2a0bdbe49f06b367a3f9c2bc01cdb7ce90a +Author: Kristian Høgsberg <[email protected]> +Date: Sat Dec 6 21:20:52 2008 -0500 + + Make sure DRI/DRI2 can initialize properly with KMS. + (cherry picked from commit c47b6d1def917fad5ad2b5a3e4167edfd354f2c8) + +commit f41c3d7ad99d9ca8a5ec52d074c0dcc3d9d31acd +Author: Kristian Høgsberg <[email protected]> +Date: Sat Dec 6 19:19:21 2008 -0500 + + Simplify crtc preinit a bit. + (cherry picked from commit 70af658d4e94cc372f9e9c831611f70b3c1cecab) + +commit f05a0c9628a2696c8719a41cfcb7663db3383019 +Author: Kristian Høgsberg <[email protected]> +Date: Sat Dec 6 19:17:39 2008 -0500 + + Fix KMS compilation. + (cherry picked from commit 3ad9c9a82d7b359b9b711070628e6ff07a2aa9f7) + +commit 1f74f7491508973240a649e9b480d435b013d847 +Author: Eric Anholt <[email protected]> +Date: Fri Dec 5 12:21:53 2008 -0800 + + uxa: Reject solid/copy to under-8bpp destinations. + + EXA wouldn't create pixmaps for under-8bpp, but UXA does. Fixes + mis-rendering in xfwm, evolution message compose, firefox link + drag'n'drop, and I'm sure more. Big thanks to Pierre Willenbrock for + debugging the issue! + + Bug #18050 + (cherry picked from commit 2e3c098c5ed9a8451713dc754a5f086992249336) + +commit b9ca7dcd0d6521c33d4b3beb09d9841411406657 +Author: Eric Anholt <[email protected]> +Date: Fri Dec 5 12:13:26 2008 -0800 + + uxa: Add in EnableDisableFBAccess handling like examodule.c did. + + This fixes assertion failures when rendering text while VT switched. + (cherry picked from commit 261c20a479f6ec1e94c2ba801323072227cc3ade) + +commit 93485f521b330e98d40b181139a54a5cd00e2b91 +Author: Eric Anholt <[email protected]> +Date: Thu Dec 4 15:18:08 2008 -0800 + + Remove the extra memory allocation for 965 video state now that it's all in BOs. + (cherry picked from commit caecd6031e416705b1f0a7051535211feaebdedd) + +commit 0972c5eeb5c2f2a31c92296b6de009adba1f861f +Author: Eric Anholt <[email protected]> +Date: Thu Dec 4 15:10:49 2008 -0800 + + Emit proper relocations to pixmaps in BOs in i965 video. + (cherry picked from commit 48c113ade26d5ad64999cd5cc288495c10e02fc4) + +commit 87da69ba18c6535fa5faa959a49a0d47c91c7dfe +Author: Eric Anholt <[email protected]> +Date: Thu Dec 4 15:02:12 2008 -0800 + + Move i965 video surface state and binding table to BOs. + (cherry picked from commit ae2cd8b75e41393e072e27064ecefecf1aa1bc6c) + +commit 213ec0b1bdcdc37db73b67eab7f30188a66c62c1 +Author: Eric Anholt <[email protected]> +Date: Thu Dec 4 14:30:56 2008 -0800 + + Move i965 video vertex data to BOs. + + This eliminates extra syncing when clipping is involved. + (cherry picked from commit 1b3c3c9d79305abe1785fdaef26a950dafa8890f) + +commit 733297f2ed8dd60c2077aae81a1c051524a3af04 +Author: Eric Anholt <[email protected]> +Date: Thu Dec 4 14:26:09 2008 -0800 + + Move remaining i965 video programs to BOs. + (cherry picked from commit 84825972597042f0aa6784594dace96be96a0234) + +commit 17d0249f984601d433ac7c5def2374b989eca166 +Author: Eric Anholt <[email protected]> +Date: Thu Dec 4 14:20:21 2008 -0800 + + Move i965 video wm and sampler state to BOs. + (cherry picked from commit 40671132cb3732728703c6444f4577467fa9223f) + +commit ba608105842e1089a74ca822f284ce00932aae04 +Author: Eric Anholt <[email protected]> +Date: Thu Dec 4 13:22:12 2008 -0800 + + Stop allocating unused scratch space for i965 video. + (cherry picked from commit 48803eb7463ad14f3109f67fcf4ccff4362baaa2) + +commit b8ce83013241dfad286f0e61bcaa7bc9b9b16828 +Author: Eric Anholt <[email protected]> +Date: Thu Dec 4 13:18:06 2008 -0800 + + Move i965 video vs/sf state to BOs. + (cherry picked from commit f3fe46b557a4dd7e212c2790fb47142d375c1c75) + +commit 0883f374c707f12a3c9ae8fcda3ff4f53b8e8db8 +Author: Eric Anholt <[email protected]> +Date: Thu Dec 4 13:11:13 2008 -0800 + + Move i965 video cc state to BOs. + (cherry picked from commit 4b9d3eac57a972c055c4acd7a10dfe8aa918131c) + +commit fadb1555b3dc088cadb6efb51c1bccade313d4ea +Author: Eric Anholt <[email protected]> +Date: Thu Dec 4 12:53:37 2008 -0800 + + Move I965DisplayVideoTextured unit state setup to separate functions. + (cherry picked from commit 176e92d89fdfb199780014722feab6ac25836dcc) + +commit 0354ccaf9dccc7ee8cb92fb3ffb983481e45117e +Author: Eric Anholt <[email protected]> +Date: Thu Dec 4 11:44:35 2008 -0800 + + Move I965DisplayVideoTextured surface/sampler setup to separate functions. + (cherry picked from commit 61929f4c641e2ecb145ad2b22f7092d40e31ae6d) + +commit 46ddcb4e7399bd94c86fab38b2d0c8d823e97e5d +Author: Eric Anholt <[email protected]> +Date: Thu Dec 4 11:37:38 2008 -0800 + + Move debug code for I965DisplayVideoTextured to separate functions. + (cherry picked from commit 73d03cb93ca761ee555b87558882e26bd2f10d91) + +commit b156b3165e1aae5df0353737d0335ac2e653f5fd +Author: Julien Cristau <[email protected]> +Date: Wed Dec 3 04:35:38 2008 +0100 + + Don't unconditionally define DRI2 + + xorg-server.h will define it if the server has dri2 support. + +commit 8d7cbab267e8fbcb2fcf90b18346b60607277266 +Author: Zhenyu Wang <[email protected]> +Date: Thu Dec 4 18:43:03 2008 +0800 + + Fix maxium backlight level restored issue + + The origin check for bring back max value for '0' + backlight level is ok for legacy or combo control method + as '0' mostly doesn't act in ideal lowest level. But it + breaks in using kernel control method which should provide + a reasonable backlight range. + + This is tested fine on T61 with thinkpad_acpi module. + +commit 32e7d47925b445a85847d77651b258e117aaaffe +Author: Zhenyu Wang <[email protected]> +Date: Thu Dec 4 09:24:31 2008 +0800 + + Disable XvMC on DRI2 for now + +commit 293f6232c6c0ce12802a2123edfab4551d25e266 +Author: Dave Airlie <[email protected]> +Date: Wed Dec 3 16:51:25 2008 -0800 + + uxa: don't call composite routines with no buffer. + + We can get a case with gnome-terminal + links, where we get two arrays + of glyphs all with 0 width and 0 heights in them. If this happens + we manage to get to this case without any buffer setup and segfault. + + (cherry picked from commit 717c7492a0f6ba3fb3eabda33515881eef314155) + +commit 457a680afd0d8f835131ea72be0c3c618c2892c7 +Author: Eric Anholt <[email protected]> +Date: Wed Dec 3 13:17:26 2008 -0800 + + Enable tiling for DRI2 back/depth buffers. + + This results in allocation overhead for small (8x8-128x128 or so) pixmaps with + DRI2, but we're interested in looking at tiling them in general in the near + future, anyway. + +commit b662ecccb5c036fcc4aa19026642bde0a1ca2ac8 +Author: Eric Anholt <[email protected]> +Date: Wed Dec 3 10:50:33 2008 -0800 + + Re-enable composite accel on 965 with UXA. + + This was blocked on getting 965 render aware of BO pixmaps, which is happily + now the case. + +commit d426f799f541cb32fab134f2af068c6cd31923d9 +Author: Paulo Cesar Pereira de Andrade <[email protected]> +Date: Wed Dec 3 14:59:21 2008 -0200 + + Include <X11/Xfuncproto.h> prior to including "edid.h" from the sdk. + +commit 07f5a8223187c1abc79c104d2fa5859a54cecd30 +Author: Robert Lowery <[email protected]> +Date: Wed Dec 3 09:48:23 2008 +0800 + + TV: add support to set TV margins in xorg.conf + +commit 00ae7a571b6413aa2530e4f1310f8f4646631946 +Author: Eric Anholt <[email protected]> +Date: Tue Dec 2 13:08:23 2008 -0800 + + UXA: Add support for tiled front/back/depth by cutting over to the GTT map. + +commit 34d54db945c67a2fee0a38cc9eafc463b8413669 +Author: Eric Anholt <[email protected]> +Date: Tue Dec 2 13:01:56 2008 -0800 + + Remove DRI_MM defines which are always true now. + +commit f7540df184a75a749cabcfa2da8974d3d0714ea6 +Merge: 5f34702... ee87f7b... +Author: Keith Packard <[email protected]> +Date: Mon Dec 1 19:06:09 2008 -0800 + + Merge commit 'origin/dri2' + +commit 5f347020a52b583e19d333361ea7bf2591255899 +Author: Paulo Cesar Pereira de Andrade <[email protected]> +Date: Sat Nov 29 02:35:59 2008 -0200 + + Export libIntelXvMC and libI80XvMC symbols. + + This is a side effect of adding the visibility flags to XORG_CFLAGS. + +commit ec7fd3d1b477928f9bffde1a72d7f3fdea89e629 +Merge: d978cd4... baec75a... +Author: Zou Nan hai <[email protected]> +Date: Thu Nov 27 10:48:09 2008 +0800 + + Merge branch '965-xvmc' + + Conflicts: + + src/common.h + src/i830_hwmc.c + src/i830_video.c + +commit d978cd4b453ea588ed2fc2f2cb4ec26856fe00d4 +Author: Wu Fengguang <[email protected]> +Date: Thu Nov 20 00:47:25 2008 -0800 + + refresh batch_bo reference after intel_batch_flush() + + The call into intel_batch_flush() will invalidate the pI830->batch_bo + stored in bo_table[0]. Fix it by re-read the refreshed value. + + Signed-off-by: Wu Fengguang <[email protected]> + Signed-off-by: Eric Anholt <[email protected]> + +commit ee87f7becc2138348ec0d948829db6e86cee86da +Merge: 3dd7f0f... a5b1e62... +Author: Kristian Høgsberg <[email protected]> +Date: Wed Nov 12 16:40:37 2008 -0500 + + Merge commit 'origin/master' into dri2 + + Conflicts: + src/i830_dri.c + src/i830_driver.c + src/i830_memory.c + +commit 30c29627c859f1f6780aa652d6de4fa985b63dd0 Author: Jesse Barnes <[email protected]> Date: Thu Nov 13 12:35:02 2008 -0800 @@ -7,13 +657,64 @@ Date: Thu Nov 13 12:35:02 2008 -0800 We need @DRM_LIBS@ in order to find drm_intel if installed in a non-standard path. -commit 76e71ddfd4f4b9fb240458ea4c9183b139d50b88 +commit 42ec6938bdea3a5b065a4248fdca5f031415191e +Author: Ma Ling <[email protected]> +Date: Fri Nov 7 14:23:41 2008 +0800 + + enable Intel G35 SDVO HDMI audio output + + Set the SDVO_AUDIO_ENABLE bit to enable SDVO HDMI audio output of the + Intel G35 chipset. + + Signed-off-by: Ma Ling <[email protected]> + Signed-off-by: Wu Fengguang <[email protected]> + +commit 42b3903c3fda95a7c536cb957d8163d8dc54a9a1 +Author: Wu Fengguang <[email protected]> +Date: Fri Nov 7 14:23:40 2008 +0800 + + enable Intel G45 integrated HDMI audio output + + Enable audio output for the integrated HDMI of Intel G45 chipset + by introducing the SDVO_AUDIO_ENABLE bit. + + Signed-off-by: Wu Fengguang <[email protected]> + +commit 293f4a8b6d1ca8a47d14c4d4b5904b85a8167e12 +Author: Wu Fengguang <[email protected]> +Date: Thu Nov 13 09:50:37 2008 +0800 + + introduce i830_hdmi_priv.has_hdmi_sink + + HDMI is compatible with DVI, and we've seen many boards that + use HDMI port for DVI output. + + So Zhenyu proposed this flag: i830_hdmi_priv.has_hdmi_sink + to indicate the presence of HDMI capable monitors. + + Signed-off-by: Wu Fengguang <[email protected]> + +commit 667923559219429b0c5fec12a0164f7eba1f8f2d Author: Jesse Barnes <[email protected]> -Date: Tue Nov 11 11:50:50 2008 -0800 +Date: Tue Nov 11 12:55:06 2008 -0800 + + Default to FULL_ASPECT panel fitting + + Now that 8xx is fixed, we should be able to preserve aspect ratio by + default. + + Fixes fdo bz #18033. + +commit 65cd0fbb018b2c18f1571dc0924c7d92eaf794ad +Author: Zhenyu Wang <[email protected]> +Date: Tue Nov 11 09:36:50 2008 +0800 - Update version to 2.5.1 in preparation for release + TV: fix contrast and saturation for 915/945G + + 915/945G uses exponent-mantissa format instead of + fixed-point format on 965G. -commit a580641cb3fa04c7bbd15f5bc0011cec314375e9 +commit a5b1e62337d4e8840347bb186db48697f0690a19 Author: Zhenyu Wang <[email protected]> Date: Fri Nov 7 16:06:26 2008 +0800 @@ -21,7 +722,7 @@ Date: Fri Nov 7 16:06:26 2008 +0800 Reported by Yang Sheng <[email protected]> -commit 98c9a08257386fa97720f51bc82822b764d5f6bc +commit 9942cfa6dcc70a09ea38f738b1e73e3f005080b9 Author: Keith Packard <[email protected]> Date: Thu Nov 6 15:04:27 2008 -0800 @@ -33,13 +734,22 @@ Date: Thu Nov 6 15:04:27 2008 -0800 Signed-off-by: Keith Packard <[email protected]> -commit d8e59840201f7c869a5c267dad22f3babc414926 +commit 226efa7c74c0ed8a7b974a3727c5d7322c8ef815 +Author: Zhenyu Wang <[email protected]> +Date: Wed Oct 29 22:41:20 2008 +0800 + + TV: subcarrier fix for NTSC and PAL + + Using subcarrier DDA values from spec give more close result to + standard frequency. + +commit 3651341292d90b7ded4c3f013bcb0f46537a113a Author: Zhenyu Wang <[email protected]> Date: Wed Oct 29 20:41:46 2008 +0800 TV: fix timing parameters for PAL, 480p, 1080i -commit 5a42dd3bda2a4620be7192cab0f1e68d22267f0f +commit b404afb755b608b02bcf0be1f8fe8a38d3d7bc1e Author: Zhenyu Wang <[email protected]> Date: Wed Oct 29 20:32:18 2008 +0800 @@ -47,7 +757,7 @@ Date: Wed Oct 29 20:32:18 2008 +0800 Driver should keep those fields according with spec. -commit 558eaa44fbe3b1301757bcdb13137d38d06832b4 +commit 2ae91f0ffdadfb393d526b94e21914a31aa14232 Author: Zhenyu Wang <[email protected]> Date: Wed Oct 29 20:26:44 2008 +0800 @@ -57,19 +767,19 @@ Date: Wed Oct 29 20:26:44 2008 +0800 on TV screen. Setting fixed point modifier to default 1.0 makes picture on TV look nicer. -commit feeef621d1e3eec7012238d4db47c00c19abbaac +commit c4cab00ef7f57fc27776f53263aacec2edf6f959 Author: Zhenyu Wang <[email protected]> Date: Wed Oct 29 20:26:03 2008 +0800 TV: white space cleanup -commit d24fcca4e3251098119ca2a50dc73ab3ad2bd6b6 +commit b130f94f26111e1a12ce869292915504588d0369 Author: Zhenyu Wang <[email protected]> Date: Thu Nov 6 10:14:00 2008 +0800 SDVO: fix more command definition errors -commit 7938adce1c848beb83db59eb5fa95bf77c41269c +commit 3ab979da5c867fb862e33a80b973a35d56d56a55 Author: Zhenyu Wang <[email protected]> Date: Mon Nov 3 16:05:28 2008 +0800 @@ -79,31 +789,31 @@ Date: Mon Nov 3 16:05:28 2008 +0800 This only adds command and doesn't enable monitor power state setting yet. -commit f649c198f93847747f3d740b422f340788a687c5 +commit f558a4972d1cca03785da025170259c61541ee63 Author: Zhenyu Wang <[email protected]> Date: Mon Nov 3 16:01:40 2008 +0800 SDVO: add GetScaledHDTVResolutionSupport command -commit 83855865ec0a7a220e9dfca7db41a703ab169eca +commit cd8cbff5d7921d2f4fdac106c3d54414310af94d Author: Zhenyu Wang <[email protected]> Date: Mon Nov 3 15:20:18 2008 +0800 SDVO: fix sdvo tv format and sdtv resolution request/reply definition -commit 6a3fe3c8492e6dca4b56d81fa1c0406696d085d8 +commit 61672b8c458ecf449138c51aeb12cf24dbbd59d9 Author: Zhenyu Wang <[email protected]> Date: Mon Nov 3 14:59:53 2008 +0800 SDVO: add HDMI audio encrypt change bit for GetInterruptEventSource command -commit 97498f7e6233f574d537405ab097c9edc36e4290 +commit 45fb04474d0e67643a633dcc3aeb4efe7fd71ea1 Author: Zhenyu Wang <[email protected]> Date: Mon Nov 3 14:51:14 2008 +0800 SDVO: fix wrong order of sdvo version's major/minor -commit 179e99463d981487e60ee98f09b5083cf267bea8 +commit 5cbf1e72711e906b5309694045b56933e14dca06 Author: Zhenyu Wang <[email protected]> Date: Thu Nov 6 09:46:54 2008 +0800 @@ -113,23 +823,107 @@ Date: Thu Nov 6 09:46:54 2008 +0800 And it can also apply fixes for GM45 too, which is missing with origin define. -- To UNSUBSCRIBE, email to [email protected] with a subject of "unsubscribe". Trouble? Contact [email protected]
