xserver-xorg-video-intel: Changes to 'debian-unstable'
.gitignore | 26
ChangeLog | 7504 ++++++++++++++++++
Makefile.am | 7
Makefile.in | 33
README | 280
README.sgml | 133
aclocal.m4 | 288
autogen.sh | 12
config.guess | 75
config.h.in | 24
config.sub | 40
configure | 8786 +++++++++++-----------
configure.ac | 109
debian/changelog | 66
debian/control | 28
debian/patches/10-overlay_fix_lockup.patch | 63
debian/patches/11-xv_lockup.patch | 30
debian/patches/20-i915_bios.patch | 20
debian/patches/series | 3
debian/rules | 6
debian/xserver-xorg-video-i810.install | 2
debian/xserver-xorg-video-i810.install.hurd-i386 | 1
debian/xserver-xorg-video-i810.links | 1
debian/xserver-xorg-video-i810.manpages | 1
debian/xserver-xorg-video-intel.install | 2
debian/xserver-xorg-video-intel.install.hurd-i386 | 1
debian/xserver-xorg-video-intel.links | 1
debian/xserver-xorg-video-intel.manpages | 1
debian/xsfbs/xsfbs.mk | 28
ltmain.sh | 126
man/Makefile.am | 13
man/Makefile.in | 52
man/i810.man | 217
man/intel.man | 196
mkinstalldirs | 89
src/.gitignore | 6
src/Makefile.am | 149
src/Makefile.in | 363
src/bios_reader/.gitignore | 2
src/bios_reader/Makefile.am | 13
src/bios_reader/Makefile.in | 500 +
src/bios_reader/bios_dumper.c | 98
src/bios_reader/bios_reader.c | 163
src/brw_structs.h | 2
src/ch7017/Makefile.am | 15
src/ch7017/Makefile.in | 516 +
src/ch7017/ch7017.c | 304
src/ch7017/ch7017_module.c | 36
src/ch7017/ch7017_reg.h | 150
src/ch7xxx/Makefile.am | 16
src/ch7xxx/Makefile.in | 517 +
src/ch7xxx/ch7xxx.c | 308
src/ch7xxx/ch7xxx.h | 31
src/ch7xxx/ch7xxx_module.c | 35
src/ch7xxx/ch7xxx_reg.h | 80
src/common.h | 74
src/exa_sf.g4a | 45
src/exa_sf_mask.g4a | 78
src/exa_sf_mask_prog.h | 25
src/exa_sf_prog.h | 17
src/exa_sf_rotation.g4a | 55
src/exa_sf_rotation_prog.h | 20
src/exa_wm_maskca.g4a | 228
src/exa_wm_maskca_prog.h | 95
src/exa_wm_maskca_srcalpha.g4a | 228
src/exa_wm_maskca_srcalpha_prog.h | 95
src/exa_wm_masknoca.g4a | 228
src/exa_wm_masknoca_prog.h | 95
src/exa_wm_nomask.g4a | 169
src/exa_wm_nomask_prog.h | 70
src/exa_wm_rotation.g4a | 184
src/exa_wm_rotation_prog.h | 70
src/fix.5c | 14
src/i2c_vid.h | 16
src/i810.h | 5
src/i810_accel.c | 3
src/i810_dri.c | 30
src/i810_dri.h | 2
src/i810_driver.c | 97
src/i810_reg.h | 1130 ++
src/i810_video.c | 4
src/i810_wmark.c | 17
src/i830.h | 670 +
src/i830_3d.c | 10
src/i830_accel.c | 705 -
src/i830_bios.c | 245
src/i830_bios.h | 116
src/i830_common.h | 6
src/i830_crt.c | 375
src/i830_cursor.c | 796 -
src/i830_debug.c | 837 ++
src/i830_debug.h | 34
src/i830_dga.c | 442 -
src/i830_display.c | 1418 +++
src/i830_display.h | 42
src/i830_dri.c | 639 +
src/i830_dri.h | 4
src/i830_driver.c | 8268 +++-----------------
src/i830_dvo.c | 328
src/i830_exa.c | 527 +
src/i830_i2c.c | 387
src/i830_lvds.c | 532 +
src/i830_memory.c | 3175 +++----
src/i830_modes.c | 815 --
src/i830_randr.c | 355
src/i830_reg.h | 120
src/i830_render.c | 633 +
src/i830_rotate.c | 1239 ---
src/i830_sdvo.c | 1321 +++
src/i830_sdvo.h | 35
src/i830_sdvo_regs.h | 329
src/i830_tv.c | 1697 ++++
src/i830_video.c | 1542 ---
src/i830_video.h | 31
src/i830_xaa.c | 880 ++
src/i915_3d.c | 38
src/i915_3d.h | 27
src/i915_reg.h | 12
src/i915_render.c | 481 +
src/i915_video.c | 113
src/i965_render.c | 1161 ++
src/i965_video.c | 865 ++
src/ivch/Makefile.am | 15
src/ivch/Makefile.in | 516 +
src/ivch/ivch.c | 234
src/ivch/ivch_module.c | 64
src/ivch/ivch_reg.h | 97
src/local_xf86Rename.h | 23
src/packed_yuv_sf.g4a | 28
src/packed_yuv_wm.g4a | 30
src/reg_dumper/.gitignore | 1
src/reg_dumper/Makefile.am | 12
src/reg_dumper/Makefile.in | 527 +
src/reg_dumper/main.c | 105
src/reg_dumper/reg_dumper.h | 89
src/reg_dumper/xprintf.c | 60
src/sil164/Makefile.am | 16
src/sil164/Makefile.in | 517 +
src/sil164/sil164.c | 245
src/sil164/sil164.h | 31
src/sil164/sil164_module.c | 38
src/sil164/sil164_reg.h | 74
src/tv.5c | 128
src/wm_prog.h | 2
src/xvmc/.gitignore | 6
src/xvmc/I810XvMC.c | 309
src/xvmc/Makefile.am | 6
src/xvmc/Makefile.in | 37
148 files changed, 39096 insertions(+), 20026 deletions(-)
New commits:
commit df06d8d99e7710db346323e2d31b185bf78b8f34
Author: Julien Cristau <jcristau@debian.org>
Date: Fri Apr 20 08:55:26 2007 +0200
Update and install the upstream ChangeLog.
diff --git a/ChangeLog b/ChangeLog
index 14b85d3..8a84ecb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,9 +1,341 @@
+commit 31bf269afed0a830e79cbbd9d4b1ee9843af326c
+Author: Keith Packard <keithp@neko.keithp.com>
+Date: Thu Apr 19 20:03:41 2007 -0700
+
+ Update version to 2.0.0
+
+commit 60e891915af7d0f522c9c3f966599fa07779f7aa
+Author: Keith Packard <keithp@neko.keithp.com>
+Date: Thu Apr 19 14:02:23 2007 -0700
+
+ Eliminate LinearAlloc option and code.
+
+ With the fixes to the 2D frame buffer allocation that allows up to 65536
+ lines of 2D frame buffer in XAA mode, the old linear allocation hacks are no
+ longer necessary.
+
+commit cca389769001c657435f056e1f1c26b0f52a48bd
+Author: Keith Packard <keithp@neko.keithp.com>
+Date: Thu Apr 19 13:15:23 2007 -0700
+
+ Clean up 1.2 xserver build support.
+
+ Convert relative X server source path to absolute. Check for local copies
+ of needed header files before building, rather than requiring server source.
+ Remove extra duplicate -I elements in AM_CFLAGS in sub directories.
+
+commit 07797fee88d6be0dfb30394a419dd86f8a3c9095
+Author: Keith Packard <keithp@neko.keithp.com>
+Date: Thu Apr 19 13:01:37 2007 -0700
+
+ Fix mismatching braces when XF86DRI_MM is not defined.
+
+ A closing brace was left inside #ifdef XF86DRI_MM while the matching
+ open brace was outside.
+
+commit 163c565527e8cda1f5a47c7fd63f04c80feaf3c7
+Author: Keith Packard <keithp@neko.keithp.com>
+Date: Thu Apr 19 13:00:03 2007 -0700
+
+ Use I2C delay function instead of usleep.
+
+ usleep isn't always available, and we have an existing delay mechanism
+ available to use.
+
+commit 378ceea3d9ddbec7a08ac2f07f9a8cd9cf3cef36
+Author: Wang Zhenyu <zhenyu.z.wang@intel.com>
+Date: Thu Apr 19 17:30:28 2007 +0800
+
+ Fix mem list order and remove extra unbind call when free memory
+
+commit db4b9e18810990e8900bdf54aa3091b876ea2658
+Author: Alan Hourihane <alanh@fairlite.demon.co.uk>
+Date: Wed Apr 18 13:52:08 2007 +0100
+
+ Fix return status
+
+commit 3f5111940e35989d334aa99cd1b0eb26293ebf1b
+Author: Alan Hourihane <alanh@fairlite.demon.co.uk>
+Date: Wed Apr 18 13:27:59 2007 +0100
+
+ Update read_response to include the try on PENDING status
+
+ and remove it from get attached displays call.
+
+commit 902388fa06f85486fe8010807ab53e4926cc979a
+Author: Eric Anholt <eric@anholt.net>
+Date: Tue Apr 17 14:21:25 2007 -0700
+
+ Don't try to init the XAA linear region unless we allocated memory for it.
+
+ Reported by JM Ibanez
+
+commit 8abecae202b609375b6754dbd5ecce3d59036daf
+Author: Eric Anholt <eric@anholt.net>
+Date: Tue Apr 17 12:28:43 2007 -0700
+
+ Fix i852 EXA Composite acceleration setup.
+
+ Reported by JM Ibanez.
+
+commit 2dbe8d678b02b724c4f06255383f49bb4c2708b0
+Author: Timo Aaltonen <tjaalton@cc.hut.fi>
+Date: Mon Apr 16 14:14:19 2007 -0700
+
+ Fix build against xserver 1.2.
+
+commit a089ac11beb4c801928c17780401e913bc0d5257
+Author: Eric Anholt <eric@anholt.net>
+Date: Tue Apr 17 11:01:05 2007 -0700
+
+ Add all the possible ivch slave addresses (still commented out).
+
+commit 37ee68a95ca8c86ebe9abafaaf55b060dd2a2f73
+Author: Eric Anholt <eric@anholt.net>
+Date: Tue Apr 17 10:50:02 2007 -0700
+
+ Bug #10438: Fix 965 XV when sourcing from less than the full image.
+
+ Bob deinterlacing in MythTV, and the zoom options in totem would result in
+ attempting to source from outside the video instead of scaling appropriately.
+
+commit ac9181c014638dbeb334b40b4029d0ccb2b7a0fc
+Author: Alan Hourihane <alanh@fairlite.demon.co.uk>
+Date: Tue Apr 17 16:30:17 2007 +0100
+
+ Check for the PENDING message when reading the attached
+ displays. Ensures the command has completed before continuing.
+
+ (probably need to check PENDING in other SDVO calls too)
+
+commit ab5bdee8a62c842ae32aaef57eb841ebcb644d2b
+Author: Wang Zhenyu <zhenyu.z.wang@intel.com>
+Date: Tue Apr 17 16:23:46 2007 +0800
+
+ EXA: fix i830 render
+
+ Fix tex blend pipeline in case that src/mask pict has no
+ alpha. Unmask color buffer write disable bits. These make
+ rendercheck run fine on 855GM.
+
+commit 1a29750b8dba1371d7d0802744cdf2f3bfa83c13
+Author: Wang Zhenyu <zhenyu.z.wang@intel.com>
+Date: Mon Apr 16 16:21:39 2007 +0800
+
+ EXA: fix 830/845G pict format
+
+ Fallback in 830/845G when pict format is a8, x8r8g8b8 or
+ x8b8g8r8. The hw doesn't support them.
+
+commit 3a634bbd198650c1597dec4306d99928374c30f3
+Author: Wang Zhenyu <zhenyu.z.wang@intel.com>
+Date: Mon Apr 16 15:14:49 2007 +0800
+
+ EXA: Add i830 supported pict format XRGB8888, XBGR8888
+
+commit 3bcb9a0b4ba7f3df346b5708617a7aafcbe2490a
+Author: Wang Zhenyu <zhenyu.z.wang@intel.com>
+Date: Mon Apr 16 14:27:49 2007 +0800
+
+ EXA: i830 render misc fix and cleanups
+
+ Try to map texture stream when setup texture map, and use
+ correct order in load_immediate_1 cmd, which fixed crash on
+ 845GV. Also remove some flush cmds.
+
+commit 64c30cf896f8bde3ee74c92b970132ab91b418cd
+Author: Wang Zhenyu <zhenyu.z.wang@intel.com>
+Date: Mon Apr 16 13:58:50 2007 +0800
+
+ Update intel.man with 965GM chipset support
+
+commit b67adb6de34cede0e31f02f26cd5ec7b1adfa586
+Author: Wang Zhenyu <zhenyu.z.wang@intel.com>
+Date: Fri Apr 13 22:34:52 2007 +0800
+
+ Fix crash on G965 XAA with LinearAlloc option
+
+ We should alloc xaa_linear mem in LinearAlloc case, otherwise
+ we get crash when initializing xf86 fb manager.
+
+commit b5b243e4120d6a048fb6bbe8814fe3184271e9d9
+Author: Eric Anholt <eric@anholt.net>
+Date: Thu Apr 12 12:34:23 2007 -0700
+
+ Add license headers to 965 programs.
+
+commit 08cd5f9b0f086e51112008d50de48556372899f9
+Author: Eric Anholt <eric@anholt.net>
+Date: Tue Apr 10 11:26:46 2007 -0700
+
+ Bug #10520: i810 manpage not installed despite users expecting it to be there.
+
+ Install it as an alias to intel.4x, since we're letting people load the driver
+ as "i810" still.
+
+commit bf9771e9711361632afe3abeeedca7ce03497005
+Author: Eric Anholt <eric@anholt.net>
+Date: Mon Apr 9 15:26:05 2007 -0700
+
+ Don't use extended regexps in sed when not necessary.
+
+ Some seds require a flag to enable extended regexps.
+
+commit 656fbd952542ba5ddc9b018071008ceb38b1bd19
+Author: Brice Goglin <brice.goglin@ens-lyon.org>
+Date: Mon Apr 9 13:06:46 2007 -0700
+
+ Bug #10515: Fix module version number with more than one digit per field.
+
+commit aa850d3c633a510d787ee59e538e26e5c3acbf4a
+Author: Eric Anholt <eric@anholt.net>
+Date: Mon Apr 9 11:44:25 2007 -0700
+
+ Turn off ALWAYS_SYNC in EXA.
+
+ This slipped in as a debugging aid, and never got turned off. The driver
+ appears to work fine without it on an i915 system, and for the non-default EXA
+ option, we'd rather see issues found than continue running with debugging aids
+ and hiding them behind bad performance.
+
+commit d2e75d8acde2541b85a0050d9e47182c1db7fc2c
+Author: Eric Anholt <eric@anholt.net>
+Date: Mon Apr 9 11:34:57 2007 -0700
+
+ Avoid a magic number and correct a (currently harmless) ifdef in ResetState().
+
+commit 9ed446e12bd21b7c8222c6e63a03a8e2ec6b97e2
+Author: Eric Anholt <eric@anholt.net>
+Date: Tue Apr 3 11:39:48 2007 -0700
+
+ It's 2007 now. Didn't I get the memo?
+
+commit d9d05b553ca1f98efc230ef13f34576122311ac1
+Author: Eric Anholt <eric@anholt.net>
+Date: Tue Apr 3 00:15:02 2007 -0700
+
+ Bump version to 1.9.94 for 2.0 RC4.
+
+commit eb45315b07624cb0506d539f523728a651efb798
+Author: Eric Anholt <eric@anholt.net>
+Date: Mon Apr 2 18:20:33 2007 -0700
+
+ Move README to being a plain old text file.
+
+commit 9b78208f1ef1a8ee98f2aa139956659169e234ab
+Author: Eric Anholt <eric@anholt.net>
+Date: Mon Apr 2 18:20:15 2007 -0700
+
+ Move a bunch of debugging verbosity under Option "ModeDebug".
+
+commit 9ea83d440d6b9e30d4627e34168226a6b4b2a841
+Author: Eric Anholt <eric@anholt.net>
+Date: Mon Apr 2 11:39:27 2007 -0700
+
+ Update README source for new release notes.
+
+commit c6d0bf9fb6033339159d98dc2b9fe44759ad9de5
+Author: Eric Anholt <eric@anholt.net>
+Date: Mon Apr 2 10:09:43 2007 -0700
+
+ Remove long-stale TODO file.
+
+commit c59e5895a0ea1f219c8f63a02b429a024bd1ed66
+Author: Dave Airlie <airlied@linux.ie>
+Date: Mon Apr 2 07:18:04 2007 +1000
+
+ make warning info only so ppl don't go reporting stupid bugs
+
+commit e119eaabb2ad1ffc1d83f18199f49c52ec71b0fe
+Author: Eric Anholt <eric@anholt.net>
+Date: Fri Mar 30 17:09:18 2007 -0700
+
+ Warnings cleanup in ch7xxx.
+
+commit fd98e88d1a6e0e8d35bda868e7afcb78d2d11524
+Author: Eric Anholt <eric@anholt.net>
+Date: Fri Mar 30 17:07:29 2007 -0700
+
+ Finish off some function renaming that was missed before.
+
+ Thanks to alanc for catching this.
+
+commit 274b99e5e750228eba9a67773725a40ebaa9bf56
+Author: Eric Anholt <eric@anholt.net>
+Date: Fri Mar 30 17:06:43 2007 -0700
+
+ Don't forget the warnings CFLAGS in subdirectories.
+
+commit aa6a9abb34e93780c07563ab5b21d8c064ea0a1c
+Merge: 670c852... 107ac12...
+Author: Keith Packard <keithp@neko.keithp.com>
+Date: Fri Mar 30 12:10:17 2007 -0700
+
+ Merge branch 'crestline-qa'
+
+commit 670c8521f18f01b9ea899ceb68d2a3dbb884b199
+Author: Eric Anholt <eric@anholt.net>
+Date: Thu Mar 29 13:43:31 2007 -0700
+
+ Add missing file for old server compatibility build.
+
+commit 89c84f939f2dbed1d03a5f0e1daae23a229e47bc
+Author: Eric Anholt <eric@anholt.net>
+Date: Thu Mar 29 13:40:52 2007 -0700
+
+ Whitespace cleanup in Makefile.
+
+commit 6cd3b2c2de4596886aab85988b16cf63e8887add
+Author: Wang Zhenyu <zhenyu.z.wang@intel.com>
+Date: Tue Mar 27 15:34:32 2007 +0800
+
+ EXA: i830 fix blend action
+
+ i830_get_blend_cntl() has already added S8 offset.
+
+commit 35b3dd881a333569ce20ddf36b915b095757a1ba
+Author: Wang Zhenyu <zhenyu.z.wang@intel.com>
+Date: Tue Mar 27 15:33:43 2007 +0800
+
+ EXA: fix i830 componentAlpha support
+
+ Pick fix from i915 render, change tex blend pipeline for CA.
+
+commit df96d9a11d038ad64673022ce14c24223b3bd34c
+Author: Wang Zhenyu <zhenyu.z.wang@intel.com>
+Date: Tue Mar 27 15:32:53 2007 +0800
+
+ EXA: fix i830 texture setup
+
+ Use LOAD_IMM_2 helper cmd for tex setup. Enable RepeatNormal
+ support. Fix A8 format, i830 can support it now.
+
+commit aa78e67553ffe8ca986330f0ee49b5414c71a71f
+Merge: 768821b... 2191634...
+Author: Eric Anholt <eric@anholt.net>
+Date: Mon Mar 26 22:00:36 2007 -0700
+
+ Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/driver/xf86-video-intel
+
+commit 107ac12867eda6b86212159db15c640d3490f2da
+Merge: 6548817... 2191634...
+Author: Nian Wu <nian.wu@intel.com>
+Date: Tue Mar 27 12:51:45 2007 +0800
+
+ Merge git://proxy01.pd.intel.com:9419/git/xorg/driver/xf86-video-intel into crestline
+
commit 768821bd3832aad01e44856199e60c6b7726a83b
Author: Eric Anholt <eric@anholt.net>
Date: Mon Mar 26 21:27:54 2007 -0700
Bump version to 1.9.93 for 2.0RC3.
+commit 2191634dd67b3219bb88f365bcf951d5a58140e8
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date: Mon Mar 26 14:58:41 2007 -0700
+
+ Add Solaris to list of OS'es with agpgart in man page
+
commit 1c809f92467f97b098bcc89d66e60f6f88d9bade
Author: Eric Anholt <eric@anholt.net>
Date: Mon Mar 26 13:03:28 2007 -0700
@@ -28,6 +360,13 @@ Date: Mon Mar 26 12:45:23 2007 -0700
While here, update a few other bits as well.
+commit 654881794ae1ad7214e85091b9015ae0fbdc5ddc
+Merge: 6de3edc... d572771...
+Author: Nian Wu <nian.wu@intel.com>
+Date: Mon Mar 26 17:00:11 2007 +0800
+
+ Merge git://proxy01.pd.intel.com:9419/git/xorg/driver/xf86-video-intel into crestline
+
commit d5727717c9141be28a69b1154ccd23c23207f8f6
Author: Keith Packard <keithp@guitar.keithp.com>
Date: Sun Mar 25 23:44:59 2007 -0700
@@ -37,6 +376,13 @@ Date: Sun Mar 25 23:44:59 2007 -0700
This allows the driver to report the set of valid formats in the property
data.
+commit 6de3edcb52e6258f1af75e4f4bef73de1698445d
+Merge: d874aa3... 1e6e675...
+Author: Nian Wu <nian.wu@intel.com>
+Date: Sat Mar 24 17:00:13 2007 +0800
+
+ Merge git://proxy01.pd.intel.com:9419/git/xorg/driver/xf86-video-intel into crestline
+
commit 1e6e675524461ef0eb1983de89e2877426571a55
Author: Keith Packard <keithp@neko.keithp.com>
Date: Fri Mar 23 23:42:52 2007 -0700
@@ -64,6 +410,13 @@ Date: Fri Mar 23 14:34:27 2007 -0700
AdjustFrame is strictly for legacy compatibility; calling it on EnterVT
wrecks crtc positions.
+commit d874aa31599da4777438cc51469afe9b66601f55
+Merge: 94dbc37... 26f32ef...
+Author: Nian Wu <nian.wu@intel.com>
+Date: Fri Mar 23 17:00:12 2007 +0800
+
+ Merge git://proxy01.pd.intel.com:9419/git/xorg/driver/xf86-video-intel into crestline
+
commit 26f32ef680a19e63af4b7c8c84141fe32263f298
Author: Keith Packard <keithp@guitar.keithp.com>
Date: Fri Mar 23 01:17:58 2007 -0700
@@ -83,6 +436,13 @@ Date: Fri Mar 23 01:08:08 2007 -0700
split the input resolution from the tv format. Add properties to set the
blank area on all four sides of the image.
+commit 94dbc3725358d63fe0ac8e6749489c993d24ede2
+Merge: 28af380... 20b2685...
+Author: Nian Wu <nian.wu@intel.com>
+Date: Thu Mar 22 17:00:15 2007 +0800
+
+ Merge git://proxy01.pd.intel.com:9419/git/xorg/driver/xf86-video-intel into crestline
+
commit 20b26854abdacb6dc45cba2d81d515b2e47e25f1
Author: Wang Zhenyu <zhenyu.z.wang@intel.com>
Date: Thu Mar 22 10:33:15 2007 +0800
@@ -95,6 +455,32 @@ Date: Thu Mar 22 10:33:15 2007 +0800
not do this. This also cleans up vertex elements state
and makes vertex buffer order looks "normal".
+commit 28af380ab133eb14d21dc650c77bdbab66576255
+Merge: 300e893... e06c5f7...
+Author: Nian Wu <nian.wu@intel.com>
+Date: Wed Mar 21 17:00:04 2007 +0800
+
+ Merge branch 'crestline' of git://otc-graphics.jf.intel.com/git/xorg/driver/xf86-video-intel into crestline
+
+commit e06c5f727fb2e2de111ac9e691a877c56d2ca1b4
+Merge: 0202399... 3025fa0...
+Author: Wang Zhenyu <zhenyu.z.wang@intel.com>
+Date: Wed Mar 21 15:04:21 2007 +0800
+
+ Merge branch 'master' into crestline
+
+commit 02023998663cc7f0735fadfb1719d93dc2e5a112
+Author: Eric Anholt <eric@anholt.net>
+Date: Wed Mar 21 00:00:56 2007 -0700
+
+ Whitespace and symbolic reg names cleanup in i830_panel_fitter_pipe().
+
+commit 3e9ec78b4f54defb9986e11e6f2ac3475755849d
+Author: Eric Anholt <eric@anholt.net>
+Date: Tue Mar 20 23:58:48 2007 -0700
+
+ Set the panel fitter to the right pipe on Crestline.
+
commit 3025fa0fb2bf5ace7076796e45e2560fe8410e8d
Author: Wang Zhenyu <zhenyu.z.wang@intel.com>
Date: Wed Mar 21 14:50:45 2007 +0800
@@ -104,6 +490,25 @@ Date: Wed Mar 21 14:50:45 2007 +0800
The new sf/wm should handle the texture sampling only in
rotated case. Also fix possible hole in VUE slot.
+commit a50009604152bf9237c40bd098b3b1da3d018929
+Merge: 0a612e7... 2239448...
+Author: Eric Anholt <eric@anholt.net>
+Date: Tue Mar 20 23:32:19 2007 -0700
+
+ Merge branch 'master' into crestline
+
+ Conflicts:
+
+ src/i810_reg.h
+ src/i830_display.c
+
+commit 300e893cec19dca48e00ee25014b8714dc13b278
+Merge: 96e8699... 0202399...
+Author: Nian Wu <nian.wu@intel.com>
+Date: Wed Mar 21 08:55:50 2007 +0800
+
+ Merge branch 'crestline' of git://otc-graphics.jf.intel.com/git/xorg/driver/xf86-video-intel into crestline
+
commit 223944878cf38f86580df5a7d3102d86cfc061b9
Author: Eric Anholt <eric@anholt.net>
Date: Tue Mar 20 14:33:53 2007 -0700
@@ -117,6 +522,27 @@ Date: Tue Mar 20 14:33:53 2007 -0700
- Restore the LVDS register at the appropriate point (before DPLLs are
re-programmed.
+commit 96e86994f3d1b4938e99a751454ee99bebfe40d3
+Merge: f465c23... 0a612e7...
+Author: Nian Wu <nian.wu@intel.com>
+Date: Tue Mar 20 13:11:09 2007 +0800
+
+ Merge branch 'crestline' of git://otc-graphics.jf.intel.com/git/xorg/driver/xf86-video-intel into crestline
+
+commit 0a612e7115ff993bb8e9a00df13c0b0d20122fd6
+Merge: 8bb6778... 4c4faf2...
+Author: Wang Zhenyu <zhenyu.z.wang@intel.com>
+Date: Tue Mar 20 11:34:40 2007 +0800
+
+ Merge branch 'master' of git://proxy.ims.intel.com:9419/git/xorg/driver/xf86-video-intel into crestline
+
+ Conflicts:
+
+ src/i830_display.c
+
+ Change LVDS output and postread like upstream. This might
+ need to be retested on 965GM LVDS.
+
commit 4c4faf260eb4dad1b1919c6168fa9ef477b98a39
Author: Eric Anholt <eric@anholt.net>
Date: Mon Mar 19 13:36:37 2007 -0700
@@ -337,6 +763,13 @@ Date: Tue Mar 13 09:53:35 2007 -0700
Fix uninitialized string use in SDVO non-TMDS case.
+commit f465c23750adf908c0ea874f95aad98ebd2f1015
+Merge: d33e8da... 1ed3843...
+Author: Nian Wu <nian.wu@intel.com>
+Date: Tue Mar 13 17:00:44 2007 +0800
+
+ Merge git://proxy01.pd.intel.com:9419/git/xorg/driver/xf86-video-intel into crestline
+
commit 1ed3843f73a0d8efa405daff3483ebe70bf6134f
Author: Eric Anholt <eric@anholt.net>
Date: Mon Mar 12 17:47:32 2007 -0700
@@ -386,6 +819,13 @@ Date: Sat Mar 10 16:15:33 2007 +0100
Remove unused have3DWindows from pI830.
+commit d33e8daa6874ced978d2a1f687c48922555f2524
+Merge: 58aeb87... 797aa6f...
+Author: Nian Wu <nian.wu@intel.com>
+Date: Mon Mar 12 09:03:52 2007 +0800
+
+ Merge git://proxy01.pd.intel.com:9419/git/xorg/driver/xf86-video-intel into crestline
+
commit 797aa6fcb1231587bde1efb47bc8430c4c8d8110
Author: Dave Airlie <airlied@linux.ie>
Date: Sun Mar 11 12:58:50 2007 +1100
@@ -448,6 +888,13 @@ Date: Wed Mar 7 13:00:03 2007 -0800
Bug #10157: Fix cursor corruption on server regen.
+commit 58aeb87f2e335d15eba73ce9dd1982e867c52403
+Merge: a4e7e81... 81722a2...
+Author: Nian Wu <nian.wu@intel.com>
+Date: Wed Mar 7 16:02:03 2007 -0500
+
+ Merge git://proxy01.pd.intel.com:9419/git/xorg/driver/xf86-video-intel into crestline
+
commit a5f0522b1d34236278861fe15bac2df099f0a2c7
Author: Alan Hourihane <alanh@fairlite.demon.co.uk>
Date: Wed Mar 7 15:49:47 2007 +0000
@@ -488,6 +935,13 @@ Date: Tue Mar 6 13:57:04 2007 -0800
setting the Y tiling flag in the new version broke the depth buffer, so just
switch the depth buffer to X tiling, which appears to work fine.
+commit a4e7e814a24dbe30a33e6ad45baeb41d190a2724
+Merge: 862088b... 4042b27...
+Author: Nian Wu <nian.wu@intel.com>
+Date: Tue Mar 6 16:01:40 2007 -0500
+
+ Merge git://proxy01.pd.intel.com:9419/git/xorg/driver/xf86-video-intel into crestline
+
commit 30bb719ca0abc2599ffb89e59f297fa9a0a00c3c
Author: Eric Anholt <eric@anholt.net>
Date: Tue Mar 6 12:23:43 2007 -0800
@@ -509,6 +963,13 @@ Date: Tue Mar 6 16:54:16 2007 +0100
Not sure how I missed this before... Thanks to Todd Merrill for reporting.
+commit 862088ba6a91d3e7cf8d37126b1d9f4ee03a1f73
+Merge: 11e9158... d717d9d...
+Author: Nian Wu <nian.wu@intel.com>
+Date: Tue Mar 6 07:43:16 2007 -0500
+
+ Merge git://proxy01.pd.intel.com:9419/git/xorg/driver/xf86-video-intel into crestline
+
commit 1e1b45fa6ed1683cba4ae73ac98933e74c3ab9d6
Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Tue Mar 6 10:28:41 2007 +0100
@@ -583,6 +1044,20 @@ Date: Tue Mar 6 12:44:04 2007 +0800
I think this is a safe way to work around any possible chip
error.
+commit 11e91586169b4f4bf2b41c0e0e620a69670c2f07
+Merge: a24962a... 0150270...
+Author: Nian Wu <nian.wu@intel.com>
+Date: Mon Mar 5 16:00:20 2007 -0500
+
+ Merge git://proxy01.pd.intel.com:9419/git/xorg/driver/xf86-video-intel into crestline
+
+commit a24962af9ed39fabca0152cae1265a29fe6237d3
+Merge: 35e9310... 8bb6778...
+Author: Nian Wu <nian.wu@intel.com>
+Date: Mon Mar 5 16:00:11 2007 -0500
+
+ Merge branch 'crestline' of git://otc-graphics.jf.intel.com/git/xorg/driver/xf86-video-intel into crestline
+
commit 50aa09425f54c4eeca7f8b0fae9579209b10b9c4
Merge: d717d9d... c2c6255...
Author: Keith Packard <keithp@neko.keithp.com>
@@ -600,6 +1075,19 @@ Date: Sat Mar 3 23:12:54 2007 -0800
(from RandR 1.1, XFree86-VidModeExtension or XFree86-DGA) has been included
in the X server now, so remove it from this driver.
+commit 35e9310ef59873877422dcaf9a65b38789fc8ad6
+Merge: c8e6f0b... b27fa2c...
+Author: Nian Wu <nian.wu@intel.com>
+Date: Mon Mar 5 09:01:55 2007 -0500
+
+ Merge branch 'modesetting' of git://proxy01.pd.intel.com:9419/git/xorg/driver/xf86-video-intel into crestline
+
+commit 8bb677889d3f71cde671f17a3589939acad2c3b3
+Author: Eric Anholt <eric@anholt.net>
+Date: Mon Mar 5 05:08:51 2007 -0800
+
+ Fix 965GM SDVO by not setting fields in SDVO[BC] which have new meanings.
+
commit 330815251dee808754b328cd2fd60db39f2460eb
Merge: 50ba1ff... 0150270...
Author: Michel Dänzer <michel@tungstengraphics.com>
@@ -624,6 +1112,13 @@ Date: Mon Mar 5 12:57:21 2007 +0100
It takes the offset and size in pages, not bytes.
+commit a0c83af3430b6705ab2ecae59085d1c74e890c19
+Merge: c0f99b4... bc20b54...
+Author: Eric Anholt <eric@anholt.net>
+Date: Mon Mar 5 03:37:53 2007 -0800
+
+ Merge branch 'modesetting' into crestline
+
commit 7358642e64ab6d13bc1dc1a44703ee66d715ff61
Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Mon Mar 5 11:53:09 2007 +0100
@@ -699,6 +1194,13 @@ Date: Sun Mar 4 17:11:40 2007 -0800
origin is always interpreted by the shadow copying code, the frame buffer
itself doesn't move.
+commit c8e6f0bac13e0e407f9771b1bbf126f023c1511b
+Merge: 0ed5a2f... c0f99b4...
+Author: Nian Wu <nian.wu@intel.com>
+Date: Sun Mar 4 09:00:12 2007 -0500
+
+ Merge branch 'crestline' of git://otc-graphics.jf.intel.com/git/xorg/driver/xf86-video-intel into crestline
+
commit 7d08f720a95499e8d00dcd7174f06731de420017
Merge: dd24d2a... 435d355...
Author: Keith Packard <keithp@neko.keithp.com>
@@ -715,6 +1217,29 @@ Date: Sat Mar 3 22:46:31 2007 -0800
Add xf86CrtcConfigFuncs to xf86CrtcConfigInit
Add canGrow option to xf86InitialConfiguration
+commit c0f99b4962553e560a5cb882a5060d95db5477a4
+Author: Keith Packard <keithp@gamba.jf.intel.com>
+Date: Sat Mar 3 22:36:46 2007 -0800
+
+ LVDS dither control moved from PFIT to LVDS register for Crestline
+
+ The LVDS register now contains lots of new controls for dual-channel LVDS control
+ along with dither enabling. The PFIT register has a lot fewer controls as a result.
+
+commit 0fa3d4f51b5ee0dba3882fd74b6ac4e7da708f8f
+Merge: 10655c4... fd52d63...
+Author: Keith Packard <keithp@gamba.jf.intel.com>
+Date: Sat Mar 3 21:02:17 2007 -0800
+
+ Merge branch 'modesetting' into crestline
+
+commit 0ed5a2fdcfe9674175aa9af155c20695ef41cadc
+Merge: 7ba80cc... fd52d63...
+Author: Nian Wu <nian.wu@intel.com>
+Date: Sat Mar 3 09:00:20 2007 -0500
+
+ Merge branch 'modesetting' of git://proxy01.pd.intel.com:9419/git/xorg/driver/xf86-video-intel into crestline
+
commit fd52d635603b7093c5a2b7fa9c987cf59f9be27c
Author: Eric Anholt <eric@anholt.net>
Date: Fri Mar 2 13:44:57 2007 -0800
@@ -739,12 +1264,26 @@ Date: Fri Mar 2 11:03:16 2007 -0800
Fix a crash when an ARGB cursor allocation had failed.
+commit 7ba80cc3a5e0f469e3ee55c7537fdc952cd85911
+Merge: 9796cb7... d5df52b...
+Author: Nian Wu <nian.wu@intel.com>
+Date: Fri Mar 2 09:01:46 2007 -0500
+
+ Merge branch 'modesetting' of git://proxy01.pd.intel.com:9419/git/xorg/driver/xf86-video-intel into crestline
+
commit d5df52be59a7dd950e73336ce5698e73480108b0
Author: Eric Anholt <eric@anholt.net>
Date: Thu Mar 1 08:35:13 2007 -0800
Actually add the files for reg_dumper.
+commit 9796cb7ac4bd74d5336986bb194ff5875b028121
+Merge: 42deb1e... 1f5d166...
+Author: Nian Wu <nian.wu@intel.com>
+Date: Thu Mar 1 09:02:22 2007 -0500
+
+ Merge branch 'modesetting' of git://proxy01.pd.intel.com:9419/git/xorg/driver/xf86-video-intel into crestline
+
commit 1f5d1666c8386ca4597c6f2c1ec239f9d821da4c
Author: Eric Anholt <eric@anholt.net>
Date: Wed Feb 28 16:27:55 2007 -0800
@@ -775,6 +1314,20 @@ Date: Wed Feb 28 17:50:56 2007 +0100
I830DRIClipNotify: Fix initialization of crtcBox[1].[xy]2.
+commit 42deb1e10fc445d152b74e2b225daeaee2abb3d1
+Merge: 76aac38... 3e8e75e...
+Author: Nian Wu <nian.wu@intel.com>
+Date: Wed Feb 28 09:00:24 2007 -0500
+
+ Merge branch 'modesetting' of git://proxy01.pd.intel.com:9419/git/xorg/driver/xf86-video-intel into crestline
+
+commit 76aac382659bc1dab7dca078f703b9cf48b4ad74
+Merge: 42fc06c... 1ac83f5...
+Author: Nian Wu <nian@tinderbox.sh.intel.com>
+Date: Tue Feb 27 14:42:42 2007 -0500
+
+ Merge branch 'modesetting' of git://proxy01.pd.intel.com:9419/git/xorg/driver/xf86-video-intel into crestline
+
commit 3e8e75e5d83a2fa7e9fc6e9a3fbb07dac548ea5a
Author: Wang Zhenyu <zhenyu.z.wang@intel.com>
Date: Tue Feb 27 16:48:48 2007 +0800
@@ -852,6 +1405,25 @@ Date: Mon Feb 26 09:13:17 2007 -0800
Fix a crash in startup monitor detect.
+commit 10655c4674cdac8a231c50dd9afc5d43fe43b4bd
+Author: Zou Nan hai <nanhai.zou@intel.com>
+Date: Mon Feb 26 09:23:14 2007 +0800
+
+ for merge with external tree
+
+commit 9417af8630fce0476273b693ebac12129415e0cf
+Author: Zou Nan hai <nanhai.zou@intel.com>
+Date: Mon Feb 26 08:02:50 2007 +0800
+
+ fix conflict with external branch
+
+commit 42fc06c85a0c487cfa26b9d4aa396402dbc4c2fe
+Merge: 10655c4... 3bce8bf...
+Author: Nian Wu <nian@graphics.(none)>
+Date: Sun Feb 25 12:53:47 2007 -0800
+
+ Merge branch 'modesetting' of git://proxy01.pd.intel.com:9419/git/xorg/driver/xf86-video-intel into crestline
+
commit 84a7429730ddd29072d696accb9fdd8fea40731a
Author: Eric Anholt <eric@anholt.net>
Date: Fri Feb 23 14:59:24 2007 -0800
@@ -1187,6 +1759,12 @@ Date: Fri Feb 9 11:32:22 2007 +0800
TV Enable
+commit 00dadaa115951c36de9caf2a9d78909811ef34bc
+Author: Zou Nan hai <nanhai.zou@intel.com>
+Date: Fri Feb 9 11:14:50 2007 +0800
+
+ set DPLL before detect
+
commit 10712c7a781e50475ee7e8ccd5bfd2d820f863e2
Author: Wang Zhenyu <zhenyu.z.wang@intel.com>
Date: Thu Feb 8 08:56:42 2007 +0800
@@ -1204,6 +1782,22 @@ Date: Wed Feb 7 17:30:51 2007 +0800
Fix SF kernel with corrent coeffient work, and correct
VUE storage in multi texture case.
+commit 920aeaf8478f706ab3b1de4f20f5d351e64a0197
+Author: Zou Nan hai <nanhai.zou@intel.com>
+Date: Wed Feb 7 13:15:52 2007 +0800
+
+ Make TV code same with external tree.
+ Fallback to old filter table.
+ 4 spaces indent reformat.
+ Auto scaling seem to not work well on some low res interlace mode when input width > 1024, filter those modes.
+ Fix some subcarriar number
+
+commit 6d9757e466863594300c83f3806fd4376bea0504
+Author: Zou Nanhai <nanhai.zou@intel.com>
+Date: Mon Feb 5 14:59:53 2007 +0800
+
+ Fix hang when TV is not connect.
+
commit 681b91924c364a1c00732f548539f2767929ba0e
Author: Eric Anholt <eric@anholt.net>
Date: Fri Feb 2 17:40:34 2007 -0800
@@ -1251,6 +1845,38 @@ Date: Thu Feb 1 21:30:19 2007 -0800
RandR1.2 extension, and the server will not attempt to detect monitors at
startup time.
+commit b3633506dcd4fd58f0f9519cd67f6e75d6fb2042
+Author: Wang Zhenyu <zhenyu.z.wang@intel.com>
+Date: Fri Feb 2 11:35:44 2007 +0800
+
+ Add Intel 965GM chipset support
+
+commit 380129a17c61c783d77a87685ad5333e8b1c253c
+Author: Wang Zhenyu <zhenyu.z.wang@intel.com>
+Date: Fri Feb 2 11:33:46 2007 +0800
+
+ Revert original crestline pci id patch
+
+commit f7489bbec150349bf03bea8d9d55451dbc92bfc2
+Merge: f1285ec... ae6d358...
+Author: Wang Zhenyu <zhenyu.z.wang@intel.com>
+Date: Fri Feb 2 11:26:57 2007 +0800
+
+ Merge branch 'modesetting' into crestline
+
+ Conflicts:
+
+ src/i830_display.c
+ src/i830_tv.c
+ src/i830_xf86Crtc.c
+
+commit ae6d3585a4d96aa4dc05ca8563cebfa7796324ef
+Merge: 6d549ed... 1ba45a3...
+Author: Wang Zhenyu <zhenyu.z.wang@intel.com>
+Date: Fri Feb 2 11:21:59 2007 +0800
+
+ Merge branch 'modesetting' of git://proxy.ims.intel.com:9419/git/xorg/driver/xf86-video-intel into modesetting
+
commit 9f0acf1eb01ad8320f4da4cc5e498af25c0ecc5e
Author: Keith Packard <keithp@neko.keithp.com>
Date: Thu Feb 1 15:44:18 2007 -0800
@@ -1321,6 +1947,32 @@ Date: Wed Jan 31 12:15:38 2007 -0800
The now-generic (kind of) EXA code will be cleaned up and moved to generic
files in a later commit.
+commit f1285ecb72e807ac10db398fa983bf69d4154d97
+Author: Zou Nan hai <nanhai.zou@intel.com>
+Date: Wed Jan 31 14:58:08 2007 +0800
+
+ tune
+
+commit 0620a7650f758652d05a0c25d159587f641aaf3e
+Author: Zou Nan hai <nanhai.zou@intel.com>
+Date: Wed Jan 31 11:21:11 2007 +0800
+
+ fix
+
+commit 12441e217a1968dea3a6b0646b6c5d0e2ede0e7e
+Author: Zou Nan hai <nanhai.zou@intel.com>
+Date: Wed Jan 31 11:20:23 2007 +0800
+
+ add 720p@50Hz,
+ however 720p in this freq seems to not support src width,
+ hactive > 800, so skip those inputs.
+
+commit 726c7dd89627409820ee5cf9bf657d5a926b3648
+Author: Zou Nan hai <nanhai.zou@intel.com>
+Date: Wed Jan 31 10:34:39 2007 +0800
+
+ TV fixes.
+
commit 4cd552e8f4851e029e43bf778cd8340f6c2c4881
Author: Eric Anholt <eric@anholt.net>
Date: Tue Jan 30 16:34:50 2007 -0800
@@ -1445,6 +2097,31 @@ Date: Thu Jan 25 15:31:22 2007 -0800
For EXA, this requires version 2.1 of EXA to do rotation, as the VT switching
issues were too complicated otherwise.
Reply to: