xserver-xorg-video-intel: Changes to 'debian-unstable'
ChangeLog | 816 ++++++++++++++++++++++++++++++---------
configure.ac | 4
debian/changelog | 7
debian/control | 2
src/Makefile.am | 3
src/common.h | 2
src/drmmode_display.c | 307 ++++++++------
src/drmmode_display.h | 73 ---
src/i830.h | 91 +++-
src/i830_bios.c | 6
src/i830_display.c | 48 +-
src/i830_display.h | 1
src/i830_dri.c | 50 +-
src/i830_driver.c | 219 +++++++---
src/i830_exa.c | 58 ++
src/i830_lvds.c | 5
src/i830_memory.c | 547 ++++++++++----------------
src/i830_quirks.c | 21 +
src/i830_video.c | 125 +++---
src/i830_video.h | 2
src/i915_video.c | 9
src/i965_hwmc.c | 6
src/i965_render.c | 1032 ++++++++++++++++++++++++++------------------------
src/i965_video.c | 401 ++++++++++---------
24 files changed, 2250 insertions(+), 1585 deletions(-)
New commits:
commit f201c1bab66e73c902dc159cf7bdf06515d53b6e
Author: Julien Cristau <jcristau@debian.org>
Date: Wed Apr 8 21:29:21 2009 +0100
Bump build-dep on libdrm-dev to 2.4.5.
diff --git a/debian/changelog b/debian/changelog
index 372912b..7d909c3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
xserver-xorg-video-intel (2:2.6.3-1) UNRELEASED; urgency=low
* New upstream release.
+ * Bump build-dep on libdrm-dev to 2.4.5.
-- Julien Cristau <jcristau@debian.org> Wed, 08 Apr 2009 21:27:41 +0100
diff --git a/debian/control b/debian/control
index 49dd92d..4e449ee 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.3),
+ libdrm-dev (>= 2.4.5),
x11proto-xf86dri-dev,
libpciaccess-dev (>= 0.8.0+git20071002),
dpkg-dev (>= 1.14.17),
commit 1543f089d483aade11630aef25df87abf3c4d314
Author: Julien Cristau <jcristau@debian.org>
Date: Wed Apr 8 21:28:24 2009 +0100
Update changelogs
diff --git a/ChangeLog b/ChangeLog
index dabd57d..827d3a3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,449 @@
+commit f04552cdbcb110c876816dfda577803e6c92fb6a
+Author: Eric Anholt <eric@anholt.net>
+Date: Mon Mar 2 11:18:27 2009 -0800
+
+ Bump version to 2.6.3.
+
+commit c0d91bd3ffea329058b63e648d2eae05edd9ad8a
+Author: Eric Anholt <eric@anholt.net>
+Date: Mon Mar 2 11:17:27 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
+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
+Author: Eric Anholt <eric@anholt.net>
+Date: Tue Feb 24 13:59:17 2009 -0800
+
+ Bump version to 2.6.2 for release.
+
+commit 626a54870fd3c5038c7bdae5d9085fe98f73885b
+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
+Author: Eric Anholt <eric@anholt.net>
+Date: Sat Feb 21 20:36:58 2009 -0800
+
+ Don't do AdjustFrame in KMS mode.
+
+ 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
+Author: Kristian Høgsberg <krh@redhat.com>
+Date: Mon Feb 23 15:16:51 2009 -0500
+
+ KMS: Fix bug that prevented EDID data from getting propagated.
+ (cherry picked from commit 73bc7f113969834d00cd92be8374dbadc62f96a9)
+
+commit 3baf4cf7deedf2e0df13bf07cd0f329cfc7911f5
+Author: Helge Bahmann <helge.bahmann@secunet.com>
+Date: Sat Feb 21 10:10:04 2009 -0800
+
+ Move disable_render_standby to EnterVT instead of startup.
+
+ Otherwise, with a pre-2.6.28 older kernel the disable would be lost at
+ resume time and cause hangs.
+
+ Bug #20214
+ (cherry picked from commit 81c652e9a666a7459bcc5217c8a5ec518b6e00da)
+
+commit 6314b9178a252292a79e21a64d47d740e23df28d
+Author: Eric Anholt <eric@anholt.net>
+Date: Wed Feb 18 13:32:44 2009 -0800
+
+ uxa: Ask for BOs ready for rendering for pixmaps.
+
+ The assumption is that we're almost always accelerating our drawing to
+ new pixmaps (fill, copy, etc.).
+ (cherry picked from commit 0621ba12a3b694720e67a49b25ca52f0e09b3802)
+
+commit 36f3136933653ea80e72fcd3ce3c6c8fe2bf150a
+Author: Kristian Høgsberg <krh@redhat.com>
+Date: Fri Feb 20 15:34:29 2009 -0500
+
+ KMS: Hook up rotated shadow buffers.
+ (cherry picked from commit 5018d0f16cb8b44c743b5b37d194fe806d955568)
+
+commit 49093943d09a149e09639000da1ab18e2596c7c8
+Author: Kristian Høgsberg <krh@redhat.com>
+Date: Fri Feb 20 11:08:51 2009 -0500
+
+ Access the Xv buffer through the GTT for the non-KMS case.
+ (cherry picked from commit beca598bc2848093b710bd47828d622205d273df)
+
+commit 3937756ae4cae78b6c6c72714ac8898f155844f6
+Author: Kristian Høgsberg <krh@redhat.com>
+Date: Thu Feb 19 16:41:49 2009 -0500
+
+ Fix i915 textured video to work with the i830_memory -> bo change.
+
+ Forgot to update i915_video.c in 872aadc7102bd5131e1582ede081e22672911ba2.
+ (cherry picked from commit e97e2571703e3d6188bf18f211b793fc50383f9c)
+
+commit 2587a3e1d07acde3199592a81198716f4eb4221d
+Author: Kristian Høgsberg <krh@redhat.com>
+Date: Thu Feb 19 16:40:19 2009 -0500
+
+ Dont allocate overlay registers in KMS mode.
+ (cherry picked from commit 96da26b6813a8c1da8a43036c375aa0d2bb70f16)
+
+commit be56ce2c4cdeabaf655c53ca177ec35b8536bd9b
+Author: Kristian Høgsberg <krh@redhat.com>
+Date: Wed Feb 18 17:26:06 2009 -0500
+
+ Make Xv used a buffer object instead of i830_memory.
+
+ We still pin the buffer object in case of overlay, but for textured video
+ we're now no longer using i830_memory for Xv anymore.
+ (cherry picked from commit 872aadc7102bd5131e1582ede081e22672911ba2)
+
+commit 173270d49f218b7bcae7f887dd9e2d23343c6070
+Author: Kristian Høgsberg <krh@redhat.com>
+Date: Tue Feb 17 13:48:04 2009 -0500
+
+ KMS: Hook up crtc::gamma_set.
+ (cherry picked from commit 723b6065093adb56a2d7204bd990ceae41bfafc9)
+
+commit cdcca959ecc605fa3f98ccbf91535dbf71dd0b8f
+Author: Ma Ling <ling.ma@intel.com>
+Date: Fri Feb 6 09:14:15 2009 +0800
+
+ Don't disable vga centering bit.
+
+ commit id b9f5915ce812144ffd9d2aa42e8ba856129c35e,
+ which resolved bug #17235, but generate new regression-bug #19715.
+ This patch intends to resolve bug #17235, and avoid regression as well.
+ We have successfully re-tested it for bug #17235 and #19715 respectively.
+ (cherry picked from commit 3aa8591abfbe8db0f13912910c850fdd748808df)
+
+commit 5a86b78dd09a081920564d343f27a7ef9157ffed
+Author: Zhenyu Wang <zhenyu.z.wang@intel.com>
+Date: Wed Feb 4 06:00:39 2009 +0800
+
+ TV quirk for HP Compaq nx6310
+ (cherry picked from commit 9fe5fca3fe761a4f11857d9766138a60f471a9e6)
+
+commit 79b00702e1f716a73e5998bbc2244871d311176d
+Author: Kristian Høgsberg <krh@redhat.com>
+Date: Mon Feb 2 12:02:00 2009 -0500
+
+ Fix front buffer memset() for non-KMS case.
+
+ Missed the pI830->FbBase condition when removing the KMS hook.
+ (cherry picked from commit 5c370091620b38447172ebeffbc6ed3256e86c9d)
+
+commit 133dd16356c0a6d63a62b8cf3cbb2c2ba41ee2d9
+Author: Kristian Høgsberg <krh@redhat.com>
+Date: Mon Feb 2 11:51:47 2009 -0500
+
+ Un-revert the I915_SETPARAM_NUM_USED_FENCES commit reverted by accident.
+
+ Oops, my bad. Reverted 8d4bc36fae50b09a73ba2cfab920adb32141a358
+ since my kernel doesn't yet have the new param, committed
+ the revert by accident.
+ (cherry picked from commit 2013799b20599a58de48cb21a5a389e898a58af1)
+
+commit d349f368ab2e6943610224df9d003579e7e03919
+Author: Kristian Høgsberg <krh@redhat.com>
+Date: Mon Feb 2 11:02:59 2009 -0500
+
+ Fix last-minute "cleanup" that broke the patch.
+ (cherry picked from commit 127330bfd53ac7571bdd12a551142528b972893f)
+
+commit 009085d314a1c2999e1408c9627e74201591fe68
+Author: Kristian Høgsberg <krh@redhat.com>
+Date: Fri Jan 30 17:53:03 2009 -0500
+
+ Implement front buffer resize for KMS.
+
+ This adds back the resize hook so we can resize the front buffer under
+ kernel mode setting as well.
+
+ The patch also pulls the drmmode_* structs from drmmode_display.h into
+ drmmode_display.c and eliminates the header file.
+
+ (cherry picked from commit 0cb87ccfe97b0e016e47dcf236fd5ce78dddfc4b)
+
+commit 7949b712bd996c71dd8c1c2627fe8b3e011a9a9f
+Author: Eric Anholt <eric@anholt.net>
+Date: Tue Jan 27 15:43:58 2009 -0800
+
+ dri2: Use modesetting's master fd instead of opening our own non-master.
+
+ This fixes failure to auth DRI2 clients under KMS.
+ (cherry picked from commit 66bc44e8f9a0505c0b11b8042243ca74079da85f)
+
+commit ae9bbf4c3b9147ea6bce17df6f2482e27d03e407
+Author: Jesse Barnes <jbarnes@virtuousgeek.org>
+Date: Mon Jan 26 17:14:06 2009 -0800
+
+ Support tiled back/depth on 915-class hardware with DRI2.
+
+ Set alignments, tile settings and flags correctly in the 2D driver to support
+ tiled rendering. UXA's create pixmap function currently assumes the worst
+ about the alignment constraints; that should probably be fixed. Some of the
+ 1M alignment fixes could probably be done more cleanly as well.
+ (cherry picked from commit 8d4bc36fae50b09a73ba2cfab920adb32141a358)
+
+commit 5e810863b464a1f9570fd4f931773b4a0cc28054
+Author: Eric Anholt <eric@anholt.net>
+Date: Wed Jan 21 15:52:02 2009 -0800
+
+ Don't forget the new state bos in check_aperture.
+
+ They're tiny so it shouldn't have been a problem, but play it safe. This is
+ another <5% loss on top of the previously reported value, bringing the whole
+ series to about 8%.
+ (cherry picked from commit 6c0ca1676bf60529dd331cc739abdf68fa9e918d)
+
+commit 84f48228237037737b615946699071d5b88ccb4c
+Author: Jesse Barnes <jbarnes@virtuousgeek.org>
+Date: Mon Jan 26 14:58:28 2009 -0800
+
+ Fixup bogus VBT modes when detected
+
+ Several VBT modes out in the wild have H or VSyncEnd values greater than
+ the H or VTotal value. This clearly ends up creating a bad mode,
+ causing some panels to either ignore the timing or display some sort of
+ corrupt image.
+
+ Check for these cases and fix them up by default, making things work for
+ several Dell and Sony machines.
+
+ Fixes FDO bug #17292.
+ (cherry picked from commit 57a02b50c60c10a25ff0f3cd93af9f37fa0d1b11)
+
+commit 8cb4d68089109f6cef0ce94429ba6f944910c646
+Author: Bill Nottingham <notting@redhat.com>
+Date: Sat Jan 24 08:36:20 2009 +0800
+
+ Quirk MSI IM-945GSE-A LVDS, TV outputs.
+
+ The IM-945GSE-A claims to have a TV output, and always claims a connected
+ LVDS output. It has neither.
+ (cherry picked from commit e20e1cf76fb00ba4f933a1ed6d1a4896be346c91)
+
+commit e66b78d60df6b31a070aa12426e6c03373a797da
+Author: Vincent Mussard <vmussard@free.fr>
+Date: Sat Jan 24 08:33:16 2009 +0800
+
+ quirk for AOpen MP45
+ (cherry picked from commit 05ff561234cc2b93fe1ea2a35041fa2e119a7e38)
+
+commit fe1eb04e31993034adcf48ad9e59b6430532b8e0
+Author: Eric Anholt <eric@anholt.net>
+Date: Fri Dec 5 17:27:13 2008 -0800
+
+ Move i965 render sampler state to BOs.
+
+ This eliminates the pinned memory allocation for 965 render state.
+ (cherry picked from commit fbf003ef2767a1a9f5e4064f04a17992030d8f5c)
+
+commit 05d349cbfbc1f47e31512386c8d9455f96600bf2
+Author: Eric Anholt <eric@anholt.net>
+Date: Tue Jan 20 14:43:08 2009 -0800
+
+ Move i965 render kernels to BOs.
+ (cherry picked from commit befd4ad8beae39377f804e06c7cbd926ec4251db)
+
+commit a94ea095ecc18261731897bdbd0c35b7187f2c36
+Author: Eric Anholt <eric@anholt.net>
+Date: Fri Dec 5 15:30:35 2008 -0800
+
+ Move 965 render unit state to BOs.
+
+ This is a first step in a series of changes to avoid requiring a pinned object,
+ which gets in the way of doing non-root KMS. This change appears to result in
+ about a 2-6% loss in x11perf -aa10text, which better algorithms in libdrm could
+ make up for (it hasn't really had to deal with code this bad before).
+ (cherry picked from commit 5d705de5d11297f4d6bd5237fb67619e703745bc)
+
+commit f6b054cf71dbd7755bf49bb0a5800557aad2904c
+Author: Eric Anholt <eric@anholt.net>
+Date: Tue Jan 20 17:13:52 2009 -0800
+
+ Remove 965 render wm scratch space, which was just unused.
+ (cherry picked from commit 64b08ed5ad46ccd76964972e39bfed8721a920aa)
+
+commit efce94e75177b15fcd1c3e1fca973126e5911904
+Author: Eric Anholt <eric@anholt.net>
+Date: Wed Jan 21 12:52:36 2009 -0800
+
+ Fix build with server 1.4.
+
+ Debian "unstable" is still stuck with this ancient version.
+ (cherry picked from commit f126aabdf8952177bb15f392041da7a7094eb31b)
+
+commit 8ff94b4cf760ab4c124d55640d2818e94c374ea4
+Author: Eric Anholt <eric@anholt.net>
+Date: Tue Jan 20 10:45:23 2009 -0800
+
+ Use drm_intel_bo_subdata to put render vb data in.
+
+ This improves performance by avoiding repeated map/unmap cycles, which are
+ a bit expensive on my machine with lock debugging on in the kernel. It could
+ do much better if we did more than 18 or so floats at a time.
+ (cherry picked from commit b6f3ce32e295929f461a7bc37e61f126fb51e4aa)
+
+commit ee2f802d7f5beb0b0af242412dda17b4093a3547
+Author: Eric Anholt <eric@anholt.net>
+Date: Mon Jan 19 19:34:50 2009 -0800
+
+ Move i965 render vb setup to use time, and decouple state emit from it.
+
+ The require_space had failed since it only checked for the space required
+ by the batch emits in the function itself, but not in the
+ i965_emit_composite_state() that it called (the state we were concerned about
+ having set up for that 12 * 4 dwords to follow!). This is replaced by
+ intel_batch_start_atomic(), which will catch such mistakes in the future.
+ (cherry picked from commit 9a8bbb1951ad0ca0a9407a97348fc7fa03127900)
+
+commit 242fcd5fac9c18f248143a6528aadf0bacc30680
+Author: Eric Anholt <eric@anholt.net>
+Date: Tue Jan 20 10:37:20 2009 -0800
+
+ Move i965 render transform setup from emit_composite_state to prepare_composite.
+ (cherry picked from commit 3d739597c4f5817079efd9067ad5db2f4105f765)
+
+commit b239e511277b011cd7c18f542e9b81026d958504
+Author: Eric Anholt <eric@anholt.net>
+Date: Mon Jan 19 20:31:31 2009 -0800
+
+ i965: Pull check_aperture out to a separate function and make it dtrt.
+
+ Previously it wouldn't count the pixmaps that were about to be used, which
+ is pretty much the only purpose of having the pain around. This also
+ eliminates the check_twice confusion with emit_batch_header_for_composite().
+ (cherry picked from commit e20f7278f3abb44a3a151ac91f83c45cf1a2745a)
+
+commit 11a420003252c4158b16aece08bc33170f938183
+Author: Eric Anholt <eric@anholt.net>
+Date: Mon Jan 19 20:24:20 2009 -0800
+
+ Move filter computation from emit_batch_header to prepare_composite.
+ (cherry picked from commit 013e2adfbf955cb21450b610091542ebd54392c2)
+
+commit b6c6310da1f6bb7b4011246759c559f18956acab
+Author: Eric Anholt <eric@anholt.net>
+Date: Mon Jan 19 19:11:41 2009 -0800
+
+ Use intel_emit_reloc from video to prettify 965 render bind_bo setup.
+ (cherry picked from commit a340fe5e4227ebea5493e658eb6289624b07ab0b)
+
+commit fc378b15ff1bb7c8d761a6166a6c4c080ded9a63
+Author: Eric Anholt <eric@anholt.net>
+Date: Mon Jan 19 18:57:01 2009 -0800
+
+ Move i965 render state bo setup back to prepare_composite.
+
+ We want the objects to be created once per prepare/done both for efficiency and
+ so we can handle aperture checking better.
+ (cherry picked from commit aefe198ca427a5ad69717f49948eb3ede713bb28)
+
+commit 8ef4eb50193a849cb9fd0d7a85c6814e1d473101
+Author: Eric Anholt <eric@anholt.net>
+Date: Mon Jan 19 14:43:20 2009 -0800
+
+ Do check_aperture_space and batch_start_atomic for i965 video.
+
+ This increases the overhead for video in the presence of cliprects, but we
+ were already doing nasty things in that case and don't seem to care. This
+ could fix potential bad rendering or hangs with video, particularly with
+ DRI2.
+ (cherry picked from commit 946c7ef8170e74ac178c83b1465242d57fa86f2e)
+
+commit c78dd68aec54e0247a9c15b8d3db222b1f9003f6
+Author: Eric Anholt <eric@anholt.net>
+Date: Mon Jan 19 14:29:25 2009 -0800
+
+ Move 965 video setup to a separate function so we can move it around.
+ (cherry picked from commit 7be668179a12918918cad863f6936ced4ab78dbf)
+
+commit fd89de6504279fbd2a0c7ef140a6a8ec7767f4ec
+Author: Keith Packard <keithp@keithp.com>
+Date: Tue Jan 13 20:01:49 2009 -0800
+
+ Assign rotation memory dri_bo to rotation pixmap.
+
+ As the rotation memory and rotation pixmap are allocated separately (to make
+ rotation at startup work), the allocate dri_bo needs to be set in the pixmap
+ for acceleration to work. This restores the performance in rotated modes.
+
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+ (cherry picked from commit a4b023c17b9c3bd65fb9466ddb8a953f60244402)
+
+commit 3f2dc8381276d97a0b69d51cf3bbbeebf1301fa5
+Author: Keith Packard <keithp@keithp.com>
+Date: Mon Dec 15 15:35:35 2008 -0800
+
+ Resize framebuffer on screen size change (requires UXA and DRI2)
+
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+ (cherry picked from commit 8237faf8f3ca73ecdf0ef009a7d361b318726f6f)
+
+commit f1ed73c1ef3e3daa9f695194dcc813167cbcb53d
+Author: Keith Packard <keithp@keithp.com>
+Date: Mon Dec 15 15:19:00 2008 -0800
+
+ Make i830_allocate_memory take tiling parameters.
+
+ This eliminates the separate i830_allocate_memory_tiled function which means
+ that all memory objects will have tiling parameters set correctly.
+
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+ (cherry picked from commit 21bd4e8974e4c0e83f5f95adb0fc17290444caf5)
+
+commit 73eb24cb30d478b367ff9be855be29e3e4f74000
+Author: Eric Anholt <eric@anholt.net>
+Date: Mon Dec 29 13:57:24 2008 -0800
+
+ warning fix.
+ (cherry picked from commit d96f774d1bb39640486c72338fe8b19ee1ceaa23)
+
+commit 12b581bb9e6dd77092cd7561b595fe37c948d894
+Author: Eric Anholt <eric@anholt.net>
+Date: Mon Dec 29 12:44:26 2008 -0800
+
+ Fix compile failure after 45f45c73469f1bd46a1b6fb206f2e9e5e4fd66b3
+ (cherry picked from commit 750d8e105831718d4a44a145fdb87571fa9f9d8e)
+
+commit 704177b5dd0ab7a5f5bef937eac53d725bc509b5
+Author: Eric Anholt <eric@anholt.net>
+Date: Mon Dec 29 11:26:11 2008 -0800
+
+ Remove logical context setup.
+
+ This should be a noop. If it wasn't a noop, it means that on pre-g33 chipsets
+ we were spamming some data into a page of system memory because we used a
+ virtual instead of a physical address. It was also supposed to not work when
+ we submit it from a batchbuffer, as we have been doing for some time now.
+ This code has existed since about the beginning of the driver's existence,
+ with no justification.
+ (cherry picked from commit 45f45c73469f1bd46a1b6fb206f2e9e5e4fd66b3)
+
commit 08683d1d053875bcacd7c358d66ef2bfad458a56
Author: Eric Anholt <eric@anholt.net>
Date: Wed Jan 21 14:10:04 2009 -0800
@@ -783,7 +1229,7 @@ Date: Tue Dec 2 13:01:56 2008 -0800
Remove DRI_MM defines which are always true now.
commit f7540df184a75a749cabcfa2da8974d3d0714ea6
-Merge: 5f34702... ee87f7b...
+Merge: 5f34702 ee87f7b
Author: Keith Packard <keithp@keithp.com>
Date: Mon Dec 1 19:06:09 2008 -0800
@@ -798,7 +1244,7 @@ Date: Sat Nov 29 02:35:59 2008 -0200
This is a side effect of adding the visibility flags to XORG_CFLAGS.
commit ec7fd3d1b477928f9bffde1a72d7f3fdea89e629
-Merge: d978cd4... baec75a...
+Merge: d978cd4 baec75a
Author: Zou Nan hai <nanhai.zou@intel.com>
Date: Thu Nov 27 10:48:09 2008 +0800
@@ -823,7 +1269,7 @@ Date: Thu Nov 20 00:47:25 2008 -0800
Signed-off-by: Eric Anholt <eric@anholt.net>
commit ee87f7becc2138348ec0d948829db6e86cee86da
-Merge: 3dd7f0f... a5b1e62...
+Merge: 3dd7f0f a5b1e62
Author: Kristian Høgsberg <krh@redhat.com>
Date: Wed Nov 12 16:40:37 2008 -0500
@@ -1322,7 +1768,7 @@ Date: Tue Oct 14 23:57:10 2008 -0400
Implement DRI2CopyRegion and provide drm device filename to DRI2 module.
commit 282f51c3f0e5bc2cedd2f60f458ca2662290d471
-Merge: 8a54e3b... 4dd0068...
+Merge: 8a54e3b 4dd0068
Author: Kristian Høgsberg <krh@redhat.com>
Date: Tue Oct 14 23:13:40 2008 -0400
@@ -1468,7 +1914,7 @@ Date: Wed Oct 1 16:13:09 2008 -0700
Add support for RepeatPad and RepeatReflect to 915 and 830-class Render accel.
commit 5e04b5ad1b618655e201cbf1f5b2585aa6be0c17
-Merge: 979bb10... 260cbcf...
+Merge: 979bb10 260cbcf
Author: Jesse Barnes <jbarnes@virtuousgeek.org>
Date: Mon Oct 6 16:08:12 2008 -0700
@@ -1615,7 +2061,7 @@ Date: Wed Oct 1 15:26:39 2008 -0700
need to switch on the correct value.
commit ffcbbb071f1cde90fe0dc4887a05dd66c0e66985
-Merge: 1eb46d0... bf8a3ff...
+Merge: 1eb46d0 bf8a3ff
Author: Jesse Barnes <jbarnes@virtuousgeek.org>
Date: Tue Sep 30 16:59:35 2008 -0700
@@ -1631,7 +2077,7 @@ Date: Tue Sep 30 16:59:02 2008 -0700
isn't ready for a warning free build.
commit 1eb46d055b147941fa529ac582c336a114f47892
-Merge: 8408995... 497b742...
+Merge: 8408995 497b742
Author: Jesse Barnes <jbarnes@virtuousgeek.org>
Date: Tue Sep 30 12:54:27 2008 -0700
@@ -1759,7 +2205,7 @@ Date: Tue Sep 23 14:57:18 2008 +0800
[965-xvmc] optimize, pack some payload
commit 8408995ffbf705aa0bc09ab72c58c2e31a4b70c3
-Merge: d18b86a... afa630b...
+Merge: d18b86a afa630b
Author: Jesse Barnes <jbarnes@virtuousgeek.org>
Date: Mon Sep 22 18:38:54 2008 -0700
@@ -1783,7 +2229,7 @@ Date: Mon Sep 22 18:38:03 2008 -0700
been attributed to Bryce.
commit d18b86aa7fc9270e24ed9ea861ebbbbb54558fee
-Merge: 9a7da65... 6a46022...
+Merge: 9a7da65 6a46022
Author: Jesse Barnes <jbarnes@virtuousgeek.org>
Date: Mon Sep 22 18:03:39 2008 -0700
@@ -1808,7 +2254,7 @@ Date: Mon Sep 22 13:11:55 2008 -0700
even though it isn't. Intended to fix bz #11368.
commit 9a7da65e624060a37eef989963a9c79f13df30d3
-Merge: 043b6e7... 2f93cfb...
+Merge: 043b6e7 2f93cfb
Author: Jesse Barnes <jbarnes@virtuousgeek.org>
Date: Mon Sep 22 09:59:52 2008 -0700
@@ -1898,7 +2344,7 @@ Date: Fri Sep 12 14:22:48 2008 -0700
We'll probably end up doing this differently, but avoid this path for now.
commit 95b3e3a65a60aa264fbbfd141df980b534005264
-Merge: 94a86fa... ec17c88...
+Merge: 94a86fa ec17c88
Author: Jesse Barnes <jbarnes@virtuousgeek.org>
Date: Fri Sep 12 13:42:06 2008 -0700
@@ -1942,7 +2388,7 @@ Date: Thu Sep 11 15:35:27 2008 +0800
mobile chips, so always disable it.
commit 7e8eb6e20b6b1a2a3c1ef28f694fa23c68a15c48
-Merge: fba9b5a... 58a3817...
+Merge: fba9b5a 58a3817
Author: Eric Anholt <eric@anholt.net>
Date: Wed Sep 10 14:10:26 2008 -0700
@@ -2054,7 +2500,7 @@ Date: Fri Aug 8 15:36:35 2008 -0400
Add DRI2 support.
commit a1c802e4a0324386cf7370594a46354c89e3b646
-Merge: 3733a1b... 808b72f...
+Merge: 3733a1b 808b72f
Author: Jesse Barnes <jbarnes@virtuousgeek.org>
Date: Fri Aug 29 09:23:35 2008 -0700
@@ -2191,7 +2637,7 @@ Date: Thu Aug 21 09:39:33 2008 -0700
Fix compiler warnings in VBIOS utils
commit 08326827fdb8abecbff20c7b051537dbad433c40
-Merge: 5af5041... 0de8ca3...
+Merge: 5af5041 0de8ca3
Author: Jesse Barnes <jbarnes@virtuousgeek.org>
Date: Thu Aug 21 09:30:38 2008 -0700
@@ -2225,7 +2671,7 @@ Date: Wed Aug 20 14:39:34 2008 -0700
Add more panel debugging info to register dump & vbios reader
commit 0de8ca36306c506356e82d500134b4eeb96a6080
-Merge: f26bcb9... 5eccb5e...
+Merge: f26bcb9 5eccb5e
Author: Jesse Barnes <jbarnes@virtuousgeek.org>
Date: Wed Aug 20 12:11:00 2008 -0700
@@ -2248,7 +2694,7 @@ Date: Tue Aug 19 16:02:55 2008 -0700
Add swf_dumper to .gitignore
commit f26bcb9cb879e2e9ee2b26c95438cf46286c0208
-Merge: 67ab546... 7a1cc48...
+Merge: 67ab546 7a1cc48
Author: Jesse Barnes <jbarnes@virtuousgeek.org>
Date: Tue Aug 19 15:53:18 2008 -0700
@@ -2531,7 +2977,7 @@ Date: Thu Aug 7 11:02:19 2008 -0700
in case they aren't on your platform.
commit f9504eff31eb3c9c6c6b33dced9875866ff8307e
-Merge: f911347... 5c9a62a...
+Merge: f911347 5c9a62a
Author: Jesse Barnes <jbarnes@virtuousgeek.org>
Date: Wed Aug 6 12:40:47 2008 -0700
@@ -2654,14 +3100,14 @@ Date: Tue Aug 5 13:37:38 2008 -0700
us to reorder & simplify our LFP mode detection code.
commit c2f0df4dc97c87539b66525a277c7d1e2c421f61
-Merge: 4f1f308... 750bd0b...
+Merge: 4f1f308 750bd0b
Author: Jesse Barnes <jbarnes@jbarnes-t61.(none)>
Date: Tue Aug 5 13:03:46 2008 -0700
Merge branch 'drm-gem' of ssh://git.freedesktop.org/git/xorg/driver/xf86-video-intel into drm-gem
commit 4f1f30854260e18b8b9c4103eebbad5dcf729ce6
-Merge: e9e6b47... 2aaa207...
+Merge: e9e6b47 2aaa207
Author: Jesse Barnes <jbarnes@jbarnes-t61.(none)>
Date: Tue Aug 5 13:02:47 2008 -0700
@@ -2694,7 +3140,7 @@ Date: Thu Jul 31 19:21:36 2008 -0700
Add example dual head config, add info on bug reporting.
commit 2aaa207db2cea03ba05c439b5074807689f2c5be
-Merge: 2049ba2... 76eb8e6...
+Merge: 2049ba2 76eb8e6
Author: Jesse Barnes <jbarnes@hobbes.lan>
Date: Thu Jul 31 13:10:19 2008 -0700
@@ -2894,7 +3340,7 @@ Date: Fri Jul 18 14:31:45 2008 -0700
Add intel_statuspage to .gitignore
commit c0dce28892d7a31ebcca615f87ba8d4fa6872204
-Merge: a6ad504... b8ca1c7...
+Merge: a6ad504 b8ca1c7
Author: Keith Packard <keithp@keithp.com>
Date: Fri Jul 18 10:49:50 2008 -0700
@@ -2925,7 +3371,7 @@ Date: Thu Jul 17 12:30:57 2008 -0700
Fixes FDO bug #15168.
commit a6ad50402cb879b08de95f94959bb1f59701c1ff
-Merge: e9916b9... c4565a9...
+Merge: e9916b9 c4565a9
Author: Carl Worth <cworth@cworth.org>
Date: Thu Jul 17 00:38:54 2008 -0700
@@ -3456,7 +3902,7 @@ Date: Wed Jun 4 16:31:16 2008 -0700
the ring from userland.
commit d0fda9d24c5fe4870cdbd2ba0213091165666a8e
-Merge: cc98d41... 79f94ee...
+Merge: cc98d41 79f94ee
Author: Eric Anholt <eric@anholt.net>
Date: Tue Jun 10 11:32:49 2008 -0700
@@ -3512,7 +3958,7 @@ Date: Fri Jun 6 10:03:23 2008 +0800
Fix compile error in LeaveVT
commit 432d07fb175b385715eb3ccf97a303d2ad7bfe11
-Merge: 3a967b8... bff180e...
+Merge: 3a967b8 bff180e
Author: Eric Anholt <eric@anholt.net>
Date: Thu Jun 5 14:57:18 2008 -0700
@@ -3717,7 +4163,7 @@ Date: Tue May 20 08:54:01 2008 +0800
on G35.
commit c81050c0058e32098259b5078515807038beb7d6
-Merge: 9c9a5d0... e9532f3...
+Merge: 9c9a5d0 e9532f3
Author: Keith Packard <keithp@keithp.com>
Date: Sat May 17 23:26:14 2008 -0700
@@ -3917,7 +4363,7 @@ Date: Mon May 5 13:35:22 2008 -0700
Fix up ring dumping code for non-i965
commit 65877d32bb2cd71ccc8d6a66244f029fc3577f69
-Merge: b9d12da... fff17b9...
+Merge: b9d12da fff17b9
Author: Keith Packard <keithp@keithp.com>
Date: Mon May 5 12:05:00 2008 -0700
@@ -4423,7 +4869,7 @@ Date: Mon Apr 7 17:26:49 2008 +0800
(cherry picked from commit 24248097988775d62f6c416f2988e74d31c91cd0)
commit dcbdc901d64d2fab489292ef1c9ca1490bdd1e94
-Merge: 0147c1c... 13563bd...
+Merge: 0147c1c 13563bd
Author: Keith Packard <keithp@keithp.com>
Date: Fri Apr 4 19:19:35 2008 -0700
@@ -4648,7 +5094,7 @@ Date: Fri Mar 28 11:29:40 2008 +0800
It's gone, really.
commit 588371ba15afffa9343629f0ea7ce530586eef0b
-Merge: 52d6ced... c13efdd...
+Merge: 52d6ced c13efdd
Author: Jesse Barnes <jbarnes@hobbes.virtuousgeek.org>
Date: Wed Mar 26 14:53:15 2008 -0700
@@ -4760,7 +5206,7 @@ Date: Fri Mar 21 11:41:49 2008 +0800
Reported by Joerg. This does a little more clearn up.
commit 224c36cc14a7552bc5df793ad582f0ea5349eb1e
-Merge: 4b9b7b0... 03ccffd...
+Merge: 4b9b7b0 03ccffd
Author: Zhenyu Wang <zhenyu.z.wang@intel.com>
Date: Thu Mar 20 10:31:57 2008 +0800
@@ -4816,7 +5262,7 @@ Date: Tue Mar 18 12:02:25 2008 +0100
Thanks to Bruno <bonbons67@internet.lu>.
commit 03ccffd5b9b8108166ea143884a1a0a6417f3236
-Merge: ac76363... d72e18c...
+Merge: ac76363 d72e18c
Author: Zhenyu Wang <zhenyu.z.wang@intel.com>
Date: Tue Mar 18 16:54:15 2008 +0800
@@ -4846,7 +5292,7 @@ Date: Mon Mar 17 10:05:57 2008 +0800
bug 15060: Dell Latitude X300 needs pipe A quirk
commit ffb5a115cc62ed63110f77815b7f04976f720065
-Merge: 05cf070... 24e6eb2...
+Merge: 05cf070 24e6eb2
Author: Jesse Barnes <jbarnes@nietzche.virtuousgeek.org>
Date: Mon Mar 17 15:19:05 2008 -0700
@@ -4904,7 +5350,7 @@ Date: Mon Mar 10 17:27:45 2008 -0700
formats everywhere.
commit f425181695b1b3864373e1919cf651229f19fa69
-Merge: f4cfc98... 1c0e495...
+Merge: f4cfc98 1c0e495
Author: Zhenyu Wang <zhenyu.z.wang@intel.com>
Date: Thu Mar 13 23:58:56 2008 +0800
@@ -5072,7 +5518,7 @@ Date: Tue Mar 11 13:48:07 2008 -0400
we always check the return value before using dst_format.
commit 31654f52b084ebb32f69854dfb1c342c9da07928
-Merge: a03aca1... 02c0ffb...
+Merge: a03aca1 02c0ffb
Author: Zhenyu Wang <zhenyu.z.wang@intel.com>
Date: Tue Mar 11 14:37:41 2008 +0800
@@ -5799,7 +6245,7 @@ Date: Thu Dec 20 12:51:06 2007 +0800
structs.
commit 73827e78357ab3f30a21f159ecdfb26dd0ea889b
-Merge: 3cf8627... f69b48f...
+Merge: 3cf8627 f69b48f
Author: Zhenyu Wang <zhenyu.z.wang@intel.com>
Date: Wed Dec 19 22:47:02 2007 +0800
@@ -5938,7 +6384,7 @@ Date: Wed Nov 28 22:13:55 2007 +0800
Replace ALLOCATE_LOCAL/DEALLOCATE_LOCAL with xalloc/xfree
commit df47b7ba57f3e7dc8bac1898679186d9d48639ac
-Merge: df718a7... 7f9ceff...
+Merge: df718a7 7f9ceff
Author: Zhenyu Wang <zhenyu.z.wang@intel.com>
Date: Tue Nov 27 01:13:43 2007 +0800
@@ -6064,14 +6510,14 @@ Date: Thu Nov 15 11:18:38 2007 +0800
xvmc: oops, should first map batch buffer before init
commit 0464af581b0fcfc4d1c7fec8160d812262086177
-Merge: 2256519... e56c166...
+Merge: 2256519 e56c166
Author: Zhenyu Wang <zhenyu.z.wang@intel.com>
Date: Thu Nov 15 11:05:44 2007 +0800
Merge branch 'master' into xvmc
commit 22565198b360826ba10e7ca05d272c419054dc08
-Merge: 619044b... e64f492...
+Merge: 619044b e64f492
Author: Zhenyu Wang <zhenyu.z.wang@intel.com>
Date: Thu Nov 15 18:53:22 2007 +0800
@@ -6207,7 +6653,7 @@ Date: Wed Nov 14 00:11:20 2007 +0800
xvmc: attempt to move batch buffer code out of i915 private
commit 11c0e0dbef42f1ae77a77d534870d3e9821fb017
-Merge: c838f72... 43fbc54...
+Merge: c838f72 43fbc54
Author: Zhenyu Wang <zhenyu.z.wang@intel.com>
Date: Tue Nov 13 22:44:06 2007 +0800
@@ -6270,14 +6716,14 @@ Date: Fri Nov 9 07:55:01 2007 -0800
Update man page to reflect EXA by default
commit c838f7297f675ea9d82678ed37715955cb0a8a78
-Merge: a9449ff... 6f53568...
+Merge: a9449ff 6f53568
Author: Zhenyu Wang <zhenyu.z.wang@intel.com>
Date: Fri Nov 9 19:37:07 2007 +0800
Merge branch 'xvmc' of git+ssh://zhen@people.freedesktop.org/~zhen/xf86-video-intel into xvmc
commit a9449fff4be8e6b3cc82914376420e3a66b960f5
-Merge: a470f6b... 177924e...
+Merge: a470f6b 177924e
Author: Zhenyu Wang <zhenyu.z.wang@intel.com>
Date: Fri Nov 9 19:36:25 2007 +0800
@@ -6441,7 +6887,7 @@ Date: Mon Oct 22 17:09:15 2007 +0800
revert xvmc memory allocation hacks
commit 167c56bcf82f0a6d72151b202e6d56f6e0d627f6
-Merge: fc9368c... 78e251d...
+Merge: fc9368c 78e251d
Author: Zhenyu Wang <zhenyu.z.wang@intel.com>
Date: Tue Oct 23 00:12:22 2007 +0800
@@ -6520,7 +6966,7 @@ Date: Mon Oct 15 11:31:51 2007 -0700
offset.
commit cc892d1ba1d87d08bdd04f857efc6b8f64620018
-Merge: b52ce0b... fd97edb...
+Merge: b52ce0b fd97edb
Author: Zhenyu Wang <zhenyu.z.wang@intel.com>
Date: Mon Oct 15 22:09:14 2007 +0800
@@ -6678,7 +7124,7 @@ Date: Mon Oct 8 22:56:44 2007 +0800
use field name to initialize i915 xvmc driver
commit e0fb228401b10ea4281eee48497bf1d584999705
-Merge: 84d7b2b... 9e770bf...
+Merge: 84d7b2b 9e770bf
Author: Zhenyu Wang <zhenyu.z.wang@intel.com>
Date: Mon Oct 8 22:45:11 2007 +0800
@@ -6899,7 +7345,7 @@ Date: Mon Sep 24 11:12:22 2007 -0700
There can be only one.
commit 130f79613bfe6a8cfa7f431c8cce06cbb93cc91a
-Merge: b73235f... 1260316...
+Merge: b73235f 1260316
Author: Eric Anholt <eric@anholt.net>
Date: Fri Sep 21 17:14:44 2007 -0700
@@ -6913,7 +7359,7 @@ Date: Fri Sep 21 17:14:44 2007 -0700
unpin our buffers as needed.
commit 126031655c3c1db9881ad17d712461533eb59632
-Merge: c343835... bda3c69...
+Merge: c343835 bda3c69
Author: Eric Anholt <eric@anholt.net>
Date: Thu Sep 20 08:57:58 2007 -0700
@@ -6941,7 +7387,7 @@ Date: Wed Sep 19 13:29:31 2007 +0800
This adds VFE state and interface descriptor struct define.
commit 36b81ba20d20e7b235cb701c5135cbf3f3eedb12
-Merge: 02ad9ce... bda3c69...
+Merge: 02ad9ce bda3c69
Author: Zhenyu Wang <zhenyu.z.wang@intel.com>
Date: Wed Sep 19 11:44:41 2007 +0800
@@ -7193,7 +7639,7 @@ Date: Fri Aug 17 16:46:48 2007 -0700
to shrink the size of the pixmap cache on XAA, which is of limited utility.
commit 3655a1ecb62f6c387a16fa87cf6f00bf7835dce4
-Merge: e5c336e... 2231cdc...
+Merge: e5c336e 2231cdc
Author: Jesse Barnes <jbarnes@nietzche.virtuousgeek.org>
Date: Thu Aug 16 12:04:20 2007 -0700
@@ -7216,7 +7662,7 @@ Date: Thu Aug 16 11:34:02 2007 -0700
Add tiling information to BO layout description.
commit 0c9e4aeea84e20a18e3b76d8cf8e802af004df57
-Merge: 79d9a30... 2231cdc...
+Merge: 79d9a30 2231cdc
Author: Eric Anholt <eric@anholt.net>
Date: Thu Aug 16 11:30:16 2007 -0700
@@ -7336,7 +7782,7 @@ Date: Fri Aug 10 15:43:06 2007 -0400
is likely another tiling related problem with the composite hook.
commit 02ad9cee330fb5fb0008ad6f74e74e8d8a1fc36e
-Merge: 105f8a1... 7b143e5...
+Merge: 105f8a1 7b143e5
Author: Zhenyu Wang <zhenyu.z.wang@intel.com>
Date: Fri Aug 10 16:45:56 2007 +0800
@@ -7404,7 +7850,7 @@ Date: Wed Aug 8 09:06:47 2007 +0800
We don't have extra attributes than Xv port.
commit 92af2f4bbcb395cbde097776718449d99843ad67
-Merge: da82a47... e0be352...
+Merge: da82a47 e0be352
Author: Eric Anholt <eric@anholt.net>
Date: Tue Aug 7 15:18:17 2007 -0700
@@ -7488,7 +7934,7 @@ Date: Fri Aug 3 21:27:52 2007 -0700
Limit Solid & Copy offsets to 4k when rendering to tiled targets
commit 019dbfda294aaafb28d8bea0fe2f5dadc2ea3e0b
-Merge: 3d3c0e8... 15f71ed...
+Merge: 3d3c0e8 15f71ed
Author: Jesse Barnes <jesse.barnes@intel.com>
Date: Fri Aug 3 20:45:14 2007 -0700
@@ -7863,7 +8309,7 @@ Date: Fri Jul 6 16:10:52 2007 -0700
- update man page with new options
commit 8798ef11321ee6957919279076758d47ad956cf3
-Merge: 8919b22... 3c552af...
+Merge: 8919b22 3c552af
Author: Jesse Barnes <jbarnes@nietzche.virtuousgeek.org>
Date: Thu Jul 5 12:21:31 2007 -0700
@@ -8480,7 +8926,7 @@ Date: Fri May 18 09:53:36 2007 +0800
EXA: remove a flush cmd in i915 render code
commit 12a9fcfe1b25cee850380d8ce11ef11cde9aaacb
-Merge: b930bb9... e89d5f2...
+Merge: b930bb9 e89d5f2
Author: Keith Packard <keithp@neko.keithp.com>
Date: Thu May 17 15:11:29 2007 -0700
@@ -8699,7 +9145,7 @@ Date: Tue Apr 24 11:37:08 2007 -0700
to check for this case now.
commit b23eae55c8cdd73e0aba1bf7ced283d402ee6470
-Merge: 31bf269... cebdb8b...
+Merge: 31bf269 cebdb8b
Author: Keith Packard <keithp@neko.keithp.com>
Reply to: