xf86-video-intel: Branch 'display-port' - 10 commits - Makefile.am NEWS src/common.h src/i810_accel.c src/i810_common.h src/i810_cursor.c src/i810_dga.c src/i810_dri.c src/i810_dri.h src/i810_driver.c src/i810.h src/i810_hwmc.c src/i810_io.c src/i810_memory.c src/i810_reg.h src/i810_video.c src/i810_wmark.c src/i830_accel.c src/i830_batchbuffer.h src/i830_common.h src/i830_cursor.c src/i830_dri.c src/i830_dri.h src/i830_driver.c src/i830.h src/i830_memory.c src/i830_video.c src/i965_video.c src/xvmc/I810XvMC.c src/xvmc/I810XvMC.h src/xvmc/xf86dri.c src/xvmc/xf86dri.h src/xvmc/xf86dristr.h
Keith Packard
keithp at kemper.freedesktop.org
Fri May 1 11:53:12 PDT 2009
Makefile.am | 2
NEWS | 39 ++++++++++++++
src/common.h | 1
src/i810.h | 1
src/i810_accel.c | 14 -----
src/i810_common.h | 1
src/i810_cursor.c | 14 -----
src/i810_dga.c | 14 -----
src/i810_dri.c | 14 -----
src/i810_dri.h | 1
src/i810_driver.c | 14 -----
src/i810_hwmc.c | 1
src/i810_io.c | 14 -----
src/i810_memory.c | 14 -----
src/i810_reg.h | 1
src/i810_video.c | 1
src/i810_wmark.c | 15 -----
src/i830.h | 1
src/i830_accel.c | 30 +++--------
src/i830_batchbuffer.h | 2
src/i830_common.h | 1
src/i830_cursor.c | 22 +-------
src/i830_dri.c | 26 ---------
src/i830_dri.h | 1
src/i830_driver.c | 129 +------------------------------------------------
src/i830_memory.c | 14 -----
src/i830_video.c | 1
src/i965_video.c | 13 +++-
src/xvmc/I810XvMC.c | 1
src/xvmc/I810XvMC.h | 1
src/xvmc/xf86dri.c | 1
src/xvmc/xf86dri.h | 1
src/xvmc/xf86dristr.h | 1
33 files changed, 64 insertions(+), 342 deletions(-)
New commits:
commit abe80eadbed67b7c67b12183a2d552cee9d5cc50
Author: Keith Packard <keithp at keithp.com>
Date: Fri May 1 11:51:13 2009 -0700
Hold reference to video binding table until all rects are painted.
The optimization of unreferencing the binding table when the relocation is
posted causes the object to be dereferenced for each box in the clip list,
causing general chaos in the buffer manager. It's easier to just hold a
reference to the object until all of the boxes are painted and then drop it.
Signed-off-by: Keith Packard <keithp at keithp.com>
diff --git a/src/i965_video.c b/src/i965_video.c
index a1f577f..d459027 100644
--- a/src/i965_video.c
+++ b/src/i965_video.c
@@ -791,7 +791,6 @@ i965_emit_video_setup(ScrnInfoPtr pScrn, drm_intel_bo *bind_bo, int n_src_surf)
OUT_BATCH(0); /* sf */
/* Only the PS uses the binding table */
OUT_RELOC(bind_bo, I915_GEM_DOMAIN_INSTRUCTION, 0, 0);
- drm_intel_bo_unreference(bind_bo);
/* Blend constant color (magenta is fun) */
OUT_BATCH(BRW_3DSTATE_CONSTANT_COLOR | 3);
@@ -1158,6 +1157,9 @@ I965DisplayVideoTextured(ScrnInfoPtr pScrn, I830PortPrivPtr pPriv, int id,
i965_post_draw_debug(pScrn);
}
+ /* release reference once we're finished */
+ drm_intel_bo_unreference(bind_bo);
+
#if WATCH_STATS
i830_dump_error_state(pScrn);
#endif
commit 983a5276fc2fdcd91f48b1e768e1740679f392da
Author: Keith Packard <keithp at keithp.com>
Date: Fri May 1 11:50:17 2009 -0700
3D_STATE_VERTEX_BUFFERS takes four 32-bit values, not three.
The spec says this command takes an extra (mbz) 32-bit value, so let's
provide it with one.
Signed-off-by: Keith Packard <keithp at keithp.com>
diff --git a/src/i965_video.c b/src/i965_video.c
index c25bcb3..a1f577f 100644
--- a/src/i965_video.c
+++ b/src/i965_video.c
@@ -1127,15 +1127,16 @@ I965DisplayVideoTextured(ScrnInfoPtr pScrn, I830PortPrivPtr pPriv, int id,
i965_emit_video_setup(pScrn, bind_bo, n_src_surf);
- BEGIN_BATCH(10);
+ BEGIN_BATCH(12);
/* Set up the pointer to our vertex buffer */
- OUT_BATCH(BRW_3DSTATE_VERTEX_BUFFERS | 2);
+ OUT_BATCH(BRW_3DSTATE_VERTEX_BUFFERS | 3);
/* four 32-bit floats per vertex */
OUT_BATCH((0 << VB0_BUFFER_INDEX_SHIFT) |
VB0_VERTEXDATA |
((4 * 4) << VB0_BUFFER_PITCH_SHIFT));
OUT_RELOC(vb_bo, I915_GEM_DOMAIN_VERTEX, 0, 0);
OUT_BATCH(3); /* four corners to our rectangle */
+ OUT_BATCH(0); /* reserved */
OUT_BATCH(BRW_3DPRIMITIVE |
BRW_3DPRIMITIVE_VERTEX_SEQUENTIAL |
@@ -1147,6 +1148,7 @@ I965DisplayVideoTextured(ScrnInfoPtr pScrn, I830PortPrivPtr pPriv, int id,
OUT_BATCH(1); /* single instance */
OUT_BATCH(0); /* start instance location */
OUT_BATCH(0); /* index buffer offset, ignored */
+ OUT_BATCH(MI_NOOP);
ADVANCE_BATCH();
intel_batch_end_atomic(pScrn);
commit cca83b47b437ed9d50b87ed7e64b89237c32e277
Author: Keith Packard <keithp at keithp.com>
Date: Fri May 1 11:48:51 2009 -0700
Don't bother to enable VF statistics during 965 video playback
This was used while bringing up the driver to debug vertext fetches.
Signed-off-by: Keith Packard <keithp at keithp.com>
diff --git a/src/i965_video.c b/src/i965_video.c
index 1d0ed74..c25bcb3 100644
--- a/src/i965_video.c
+++ b/src/i965_video.c
@@ -772,8 +772,7 @@ i965_emit_video_setup(ScrnInfoPtr pScrn, drm_intel_bo *bind_bo, int n_src_surf)
/* brw_debug (pScrn, "after base address modify"); */
BEGIN_BATCH(38);
- /* Enable VF statistics */
- OUT_BATCH(BRW_3DSTATE_VF_STATISTICS | 1);
+ OUT_BATCH(MI_NOOP);
/* Pipe control */
OUT_BATCH(BRW_PIPE_CONTROL |
commit 8c65848c94901e2cc463a509d7de3df5c258d332
Author: Keith Packard <keithp at keithp.com>
Date: Fri May 1 11:46:51 2009 -0700
Leave allocator running until lower-level CloseScreens are done
The lower level close screen functions will free allocated objects, causing
a crash if the allocator isn't still available.
Signed-off-by: Keith Packard <keithp at keithp.com>
diff --git a/src/i830_driver.c b/src/i830_driver.c
index 300cbaa..68ecd7d 100644
--- a/src/i830_driver.c
+++ b/src/i830_driver.c
@@ -3130,7 +3130,6 @@ I830CloseScreen(int scrnIndex, ScreenPtr pScreen)
xf86_cursors_fini (pScreen);
- i830_allocator_fini(pScrn);
i965_free_video(pScrn);
free(pI830->offscreenImages);
@@ -3150,7 +3149,9 @@ I830CloseScreen(int scrnIndex, ScreenPtr pScreen)
pScrn->vtSema = FALSE;
pI830->closing = FALSE;
pScreen->CloseScreen = pI830->CloseScreen;
- return (*pScreen->CloseScreen) (scrnIndex, pScreen);
+ (*pScreen->CloseScreen) (scrnIndex, pScreen);
+ i830_allocator_fini(pScrn);
+ return TRUE;
}
static ModeStatus
commit 430e845406b5f6e5b640bca6958e0d69b0e748c0
Author: Keith Packard <keithp at keithp.com>
Date: Fri May 1 11:44:13 2009 -0700
intel_batch_start_atomic: fix size passed to intel_batch_require_space (*4)
intel_batch_start_atomic takes an argument in 32-bit units, and so it must
multiply that by 4 before passing it to intel_batch_require_space, which
takes an argument in bytes.
We should figure out what units we want to use and use the same everywhere...
Signed-off-by: Keith Packard <keithp at keithp.com>
diff --git a/src/i830_batchbuffer.h b/src/i830_batchbuffer.h
index 6e0aaa7..0283438 100644
--- a/src/i830_batchbuffer.h
+++ b/src/i830_batchbuffer.h
@@ -57,7 +57,7 @@ intel_batch_start_atomic(ScrnInfoPtr pScrn, unsigned int sz)
I830Ptr pI830 = I830PTR(pScrn);
assert(!pI830->in_batch_atomic);
- intel_batch_require_space(pScrn, pI830, sz);
+ intel_batch_require_space(pScrn, pI830, sz * 4);
pI830->in_batch_atomic = TRUE;
pI830->batch_atomic_limit = pI830->batch_used + sz * 4;
commit 8fd7fc619273316143257ae1a56fce86c00051b1
Merge: b18ac0f... 8232177...
Author: Keith Packard <keithp at keithp.com>
Date: Thu Apr 30 15:31:55 2009 -0700
Merge branch 'master' into display-port
commit 8232177a005127a0001af4b14c3beb766958ef11
Author: Keith Packard <keithp at keithp.com>
Date: Thu Apr 30 15:30:05 2009 -0700
Allow cursors to roam past 2048x2048 limit.
There's no reason to clip cursor positions to an artificial limit; the
hardware cursor limits always mirror the hardware display limits.
Signed-off-by: Keith Packard <keithp at keithp.com>
diff --git a/src/i830_cursor.c b/src/i830_cursor.c
index 33b1bd9..a6aba41 100644
--- a/src/i830_cursor.c
+++ b/src/i830_cursor.c
@@ -147,15 +147,15 @@ i830_crtc_set_cursor_position (xf86CrtcPtr crtc, int x, int y)
temp = 0;
if (x < 0) {
- temp |= (CURSOR_POS_SIGN << CURSOR_X_SHIFT);
+ temp |= CURSOR_POS_SIGN << CURSOR_X_SHIFT;
x = -x;
}
if (y < 0) {
- temp |= (CURSOR_POS_SIGN << CURSOR_Y_SHIFT);
+ temp |= CURSOR_POS_SIGN << CURSOR_Y_SHIFT;
y = -y;
}
- temp |= ((x & CURSOR_POS_MASK) << CURSOR_X_SHIFT);
- temp |= ((y & CURSOR_POS_MASK) << CURSOR_Y_SHIFT);
+ temp |= x << CURSOR_X_SHIFT;
+ temp |= y << CURSOR_Y_SHIFT;
switch (intel_crtc->pipe) {
case 0:
commit 417f3784b7fae8de3559c7607a2de60661a6a448
Author: Carl Worth <cworth at cworth.org>
Date: Tue Apr 28 20:42:22 2009 -0700
Add doltlibtool to DISTCLEANFILES
Otherwise make distcheck fails.
diff --git a/Makefile.am b/Makefile.am
index d91b3d2..10653ff 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -24,4 +24,4 @@ ACLOCAL_AMFLAGS = -I m4
SUBDIRS = uxa src man
EXTRA_DIST = README AUTHORS NEWS
-DISTCLEANFILES = doltcompile
+DISTCLEANFILES = doltcompile doltlibtool
commit bc9a688476f02233450eb05dfb40acbf337d679b
Author: Carl Worth <cworth at cworth.org>
Date: Tue Apr 28 20:37:13 2009 -0700
NEWS: Add notes for 2.7.99.1 snapshot
diff --git a/NEWS b/NEWS
index 0d0cd8a..5787be3 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,42 @@
+Snapshot 2.7.99.1 (2009-04-28)
+------------------------------
+This is a development snapshot very early in the process toward
+developing 2.8. There have been some big changes to the code, and
+we're anxious to get feedback on these changes as early as possible.
+
+Here is a summary of the biggest changes:
+
+ * Driver now depends on X server 1.6 or later
+
+ * Eliminate XAA and EXA support (in favor of UXA)
+
+ * Eliminate DRI1 support
+
+ * Fixes for running without DRI at all
+
+These code removals represent a deletion of a substantial amount of
+code, (and hopefully piles of bugs), as well as reduce the maintenance
+effort going forward as the number of combinatorial configurations for
+the driver are greatly reduced. This means that users are much more
+likely to be running code that has actually been tested, and it will
+be much easy for developers to replicate bugs that users experience.
+
+One of the things that would be most useful in testing this release is
+to revisit any outstanding bugs that you have previously reported. If
+the buggy behavior is gone, (or the bug is no longer relevant---such
+as a bug that's specific to XAA only), please feel free to indicate so
+in bugzilla or even just close the bug.
+
+If you confirm that the bug is still present, please indicate so in
+the bug report. (I was going to ask that you select a 1.7.99 version,
+but it looks like bugzilla only has versions for products not
+compoenents, while we use a "xorg" product and a "driver/intel"
+component.) We definitely want to make any such confirmed bugs a
+priority, so it would be nice to have a consistent mechanism to search
+for these bugs. Suggestions are welcome on the best approach.
+
+Thanks in advance for any testing or feedback on this snapshot.
+
Release 2.7.0 (2009-04-15)
--------------------------
Compared to the 2.6 series, 2.7.0 has a large number of bug fixes, but
commit a90cab43209bba52d35b953f3d686a19c154fc43
Author: Kristian Høgsberg <krh at redhat.com>
Date: Tue Apr 28 13:12:55 2009 -0400
Remove a handful of pointless comments
CVS keywords, comments about how the source was once reformatted,
and the ad-hoc changelog comment in in i830_driver.c
diff --git a/src/common.h b/src/common.h
index 1576d3a..ab7a653 100644
--- a/src/common.h
+++ b/src/common.h
@@ -27,7 +27,6 @@ TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
**************************************************************************/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/i810/common.h,v 1.9 2003/09/24 02:43:23 dawes Exp $ */
/*
* Authors:
diff --git a/src/i810.h b/src/i810.h
index a3f45ad..bb356e8 100644
--- a/src/i810.h
+++ b/src/i810.h
@@ -27,7 +27,6 @@ TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
**************************************************************************/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/i810/i810.h,v 1.41 2003/06/18 13:14:17 dawes Exp $ */
/*
* Authors:
diff --git a/src/i810_accel.c b/src/i810_accel.c
index 1f859b8..ae4a654 100644
--- a/src/i810_accel.c
+++ b/src/i810_accel.c
@@ -25,26 +25,12 @@ TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
**************************************************************************/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/i810/i810_accel.c,v 1.21 2004/01/02 20:22:17 dawes Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
/*
- * Reformatted with GNU indent (2.2.8), using the following options:
- *
- * -bad -bap -c41 -cd0 -ncdb -ci6 -cli0 -cp0 -ncs -d0 -di3 -i3 -ip3 -l78
- * -lp -npcs -psl -sob -ss -br -ce -sc -hnl
- *
- * This provides a good match with the original i810 code and preferred
- * XFree86 formatting conventions.
- *
- * When editing this driver, please follow the existing formatting, and edit
- * with <TAB> characters expanded at 8-column intervals.
- */
-
-/*
* Authors:
* Keith Whitwell <keith at tungstengraphics.com>
*
diff --git a/src/i810_common.h b/src/i810_common.h
index 02e548b..29be444 100644
--- a/src/i810_common.h
+++ b/src/i810_common.h
@@ -25,7 +25,6 @@
* Converted to common header format:
* Jens Owen <jens at tungstengraphics.com>
*
- * $XFree86: xc/programs/Xserver/hw/xfree86/drivers/i810/i810_common.h,v 1.1 2002/09/11 00:29:31 dawes Exp $
*
*/
diff --git a/src/i810_cursor.c b/src/i810_cursor.c
index 30f42d1..898a136 100644
--- a/src/i810_cursor.c
+++ b/src/i810_cursor.c
@@ -25,26 +25,12 @@ TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
**************************************************************************/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/i810/i810_cursor.c,v 1.6 2002/09/11 00:29:31 dawes Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
/*
- * Reformatted with GNU indent (2.2.8), using the following options:
- *
- * -bad -bap -c41 -cd0 -ncdb -ci6 -cli0 -cp0 -ncs -d0 -di3 -i3 -ip3 -l78
- * -lp -npcs -psl -sob -ss -br -ce -sc -hnl
- *
- * This provides a good match with the original i810 code and preferred
- * XFree86 formatting conventions.
- *
- * When editing this driver, please follow the existing formatting, and edit
- * with <TAB> characters expanded at 8-column intervals.
- */
-
-/*
* Authors:
* Keith Whitwell <keith at tungstengraphics.com>
*
diff --git a/src/i810_dga.c b/src/i810_dga.c
index 4ab7a3d..3f53057 100644
--- a/src/i810_dga.c
+++ b/src/i810_dga.c
@@ -21,20 +21,6 @@
*
* Authors: Alan Hourihane, <alanh at fairlite.demon.co.uk>
*/
-/*
- * Reformatted with GNU indent (2.2.8), using the following options:
- *
- * -bad -bap -c41 -cd0 -ncdb -ci6 -cli0 -cp0 -ncs -d0 -di3 -i3 -ip3 -l78
- * -lp -npcs -psl -sob -ss -br -ce -sc -hnl
- *
- * This provides a good match with the original i810 code and preferred
- * XFree86 formatting conventions.
- *
- * When editing this driver, please follow the existing formatting, and edit
- * with <TAB> characters expanded at 8-column intervals.
- */
-
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/i810/i810_dga.c,v 1.5 2002/09/11 00:29:31 dawes Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
diff --git a/src/i810_dri.c b/src/i810_dri.c
index 00691af..e566acf 100644
--- a/src/i810_dri.c
+++ b/src/i810_dri.c
@@ -1,17 +1,3 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/i810/i810_dri.c,v 1.41 2003/09/24 02:43:23 dawes Exp $ */
-/*
- * Reformatted with GNU indent (2.2.8), using the following options:
- *
- * -bad -bap -c41 -cd0 -ncdb -ci6 -cli0 -cp0 -ncs -d0 -di3 -i3 -ip3 -l78
- * -lp -npcs -psl -sob -ss -br -ce -sc -hnl
- *
- * This provides a good match with the original i810 code and preferred
- * XFree86 formatting conventions.
- *
- * When editing this driver, please follow the existing formatting, and edit
- * with <TAB> characters expanded at 8-column intervals.
- */
-
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
diff --git a/src/i810_dri.h b/src/i810_dri.h
index 5aa4338..16b6f08 100644
--- a/src/i810_dri.h
+++ b/src/i810_dri.h
@@ -1,4 +1,3 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/i810/i810_dri.h,v 1.10 2002/12/10 01:27:04 dawes Exp $ */
#ifndef _I810_DRI_
#define _I810_DRI_
diff --git a/src/i810_driver.c b/src/i810_driver.c
index 263e8d9..627cffc 100644
--- a/src/i810_driver.c
+++ b/src/i810_driver.c
@@ -25,26 +25,12 @@ TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
**************************************************************************/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/i810/i810_driver.c,v 1.101 2004/01/02 20:15:47 dawes Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
/*
- * Reformatted with GNU indent (2.2.8), using the following options:
- *
- * -bad -bap -c41 -cd0 -ncdb -ci6 -cli0 -cp0 -ncs -d0 -di3 -i3 -ip3 -l78
- * -lp -npcs -psl -sob -ss -br -ce -sc -hnl
- *
- * This provides a good match with the original i810 code and preferred
- * XFree86 formatting conventions.
- *
- * When editing this driver, please follow the existing formatting, and edit
- * with <TAB> characters expanded at 8-column intervals.
- */
-
-/*
* Authors:
* Keith Whitwell <keith at tungstengraphics.com>
*
diff --git a/src/i810_hwmc.c b/src/i810_hwmc.c
index d56dfc4..12ffdd9 100644
--- a/src/i810_hwmc.c
+++ b/src/i810_hwmc.c
@@ -32,7 +32,6 @@ THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*
*
*/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/i810/i810_hwmc.c,v 1.3 2001/12/04 21:17:56 tsi Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
diff --git a/src/i810_io.c b/src/i810_io.c
index 3fd8e4e..a6cf305 100644
--- a/src/i810_io.c
+++ b/src/i810_io.c
@@ -24,26 +24,12 @@ TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
**************************************************************************/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/i810/i810_io.c,v 1.4 2002/01/25 21:56:04 tsi Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
/*
- * Reformatted with GNU indent (2.2.8), using the following options:
- *
- * -bad -bap -c41 -cd0 -ncdb -ci6 -cli0 -cp0 -ncs -d0 -di3 -i3 -ip3 -l78
- * -lp -npcs -psl -sob -ss -br -ce -sc -hnl
- *
- * This provides a good match with the original i810 code and preferred
- * XFree86 formatting conventions.
- *
- * When editing this driver, please follow the existing formatting, and edit
- * with <TAB> characters expanded at 8-column intervals.
- */
-
-/*
* Authors:
* Daryll Strauss <daryll at precisioninsight.com>
*
diff --git a/src/i810_memory.c b/src/i810_memory.c
index 222b5cf..f57ddbe 100644
--- a/src/i810_memory.c
+++ b/src/i810_memory.c
@@ -1,4 +1,3 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/i810/i810_memory.c,v 1.27 2002/12/10 01:27:05 dawes Exp $ */
/**************************************************************************
Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas.
@@ -31,19 +30,6 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#endif
/*
- * Reformatted with GNU indent (2.2.8), using the following options:
- *
- * -bad -bap -c41 -cd0 -ncdb -ci6 -cli0 -cp0 -ncs -d0 -di3 -i3 -ip3 -l78
- * -lp -npcs -psl -sob -ss -br -ce -sc -hnl
- *
- * This provides a good match with the original i810 code and preferred
- * XFree86 formatting conventions.
- *
- * When editing this driver, please follow the existing formatting, and edit
- * with <TAB> characters expanded at 8-column intervals.
- */
-
-/*
* Authors:
* Keith Whitwell <keith at tungstengraphics.com>
*
diff --git a/src/i810_reg.h b/src/i810_reg.h
index d5d41b3..8d4e641 100644
--- a/src/i810_reg.h
+++ b/src/i810_reg.h
@@ -1,4 +1,3 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/i810/i810_reg.h,v 1.13 2003/02/06 04:18:04 dawes Exp $ */
/**************************************************************************
Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas.
diff --git a/src/i810_video.c b/src/i810_video.c
index 418f295..9528bc7 100644
--- a/src/i810_video.c
+++ b/src/i810_video.c
@@ -23,7 +23,6 @@ OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR
THE USE OR OTHER DEALINGS IN THE SOFTWARE.
**************************************************************************/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/i810/i810_video.c,v 1.26 2003/11/10 18:22:22 tsi Exp $ */
/*
* i810_video.c: i810 Xv driver. Based on the mga Xv driver by Mark Vojkovich.
diff --git a/src/i810_wmark.c b/src/i810_wmark.c
index d21f6aa..71b2a82 100644
--- a/src/i810_wmark.c
+++ b/src/i810_wmark.c
@@ -1,4 +1,3 @@
-
/**************************************************************************
Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas.
@@ -25,20 +24,6 @@ TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
**************************************************************************/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/i810/i810_wmark.c,v 1.7 2002/09/11 00:29:32 dawes Exp $ */
-
-/*
- * Reformatted with GNU indent (2.2.8), using the following options:
- *
- * -bad -bap -c41 -cd0 -ncdb -ci6 -cli0 -cp0 -ncs -d0 -di3 -i3 -ip3 -l78
- * -lp -npcs -psl -sob -ss -br -ce -sc -hnl
- *
- * This provides a good match with the original i810 code and preferred
- * XFree86 formatting conventions.
- *
- * When editing this driver, please follow the existing formatting, and edit
- * with <TAB> characters expanded at 8-column intervals.
- */
/*
* Authors:
diff --git a/src/i830.h b/src/i830.h
index 6257e43..207d4ec 100644
--- a/src/i830.h
+++ b/src/i830.h
@@ -26,7 +26,6 @@ TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
**************************************************************************/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/i810/i830.h,v 1.12 2004/01/07 03:43:19 dawes Exp $ */
/*
* Authors:
diff --git a/src/i830_accel.c b/src/i830_accel.c
index 589f86d..b365e3f 100644
--- a/src/i830_accel.c
+++ b/src/i830_accel.c
@@ -1,12 +1,3 @@
-/*
- * XXX So far, for GXxor this is about 40% of the speed of SW, but CPU
- * utilisation falls from 95% to < 5%.
- */
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
/**************************************************************************
Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas.
@@ -33,27 +24,22 @@ TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
**************************************************************************/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/i810/i830_accel.c,v 1.8 2003/04/24 18:00:24 eich Exp $ */
/*
- * Reformatted with GNU indent (2.2.8), using the following options:
- *
- * -bad -bap -c41 -cd0 -ncdb -ci6 -cli0 -cp0 -ncs -d0 -di3 -i3 -ip3 -l78
- * -lp -npcs -psl -sob -ss -br -ce -sc -hnl
- *
- * This provides a good match with the original i810 code and preferred
- * XFree86 formatting conventions.
+ * Authors:
+ * Keith Whitwell <keith at tungstengraphics.com>
*
- * When editing this driver, please follow the existing formatting, and edit
- * with <TAB> characters expanded at 8-column intervals.
*/
/*
- * Authors:
- * Keith Whitwell <keith at tungstengraphics.com>
- *
+ * XXX So far, for GXxor this is about 40% of the speed of SW, but CPU
+ * utilisation falls from 95% to < 5%.
*/
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#include <errno.h>
#include "xf86.h"
diff --git a/src/i830_common.h b/src/i830_common.h
index eeb2ed7..e9795a2 100644
--- a/src/i830_common.h
+++ b/src/i830_common.h
@@ -26,7 +26,6 @@ USE OR OTHER DEALINGS IN THE SOFTWARE.
**************************************************************************/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/i810/i830_common.h,v 1.1 2002/09/11 00:29:32 dawes Exp $ */
#ifndef _I830_COMMON_H_
#define _I830_COMMON_H_
diff --git a/src/i830_cursor.c b/src/i830_cursor.c
index e1cf0bf..33b1bd9 100644
--- a/src/i830_cursor.c
+++ b/src/i830_cursor.c
@@ -26,20 +26,6 @@ TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
**************************************************************************/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/i810/i830_cursor.c,v 1.6 2002/12/18 15:49:01 dawes Exp $ */
-
-/*
- * Reformatted with GNU indent (2.2.8), using the following options:
- *
- * -bad -bap -c41 -cd0 -ncdb -ci6 -cli0 -cp0 -ncs -d0 -di3 -i3 -ip3 -l78
- * -lp -npcs -psl -sob -ss -br -ce -sc -hnl
- *
- * This provides a good match with the original i810 code and preferred
- * XFree86 formatting conventions.
- *
- * When editing this driver, please follow the existing formatting, and edit
- * with <TAB> characters expanded at 8-column intervals.
- */
/*
* Authors:
diff --git a/src/i830_dri.c b/src/i830_dri.c
index 743521c..0648249 100644
--- a/src/i830_dri.c
+++ b/src/i830_dri.c
@@ -1,4 +1,3 @@
-/* $xfree86: xc/programs/Xserver/hw/xfree86/drivers/i810/i830_dri.c,v 1.15 2003/06/18 13:14:17 dawes Exp $ */
/**************************************************************************
Copyright 2001 VA Linux Systems Inc., Fremont, California.
@@ -28,36 +27,11 @@ USE OR OTHER DEALINGS IN THE SOFTWARE.
**************************************************************************/
/*
- * Reformatted with GNU indent (2.2.8), using the following options:
- *
- * -bad -bap -c41 -cd0 -ncdb -ci6 -cli0 -cp0 -ncs -d0 -di3 -i3 -ip3 -l78
- * -lp -npcs -psl -sob -ss -br -ce -sc -hnl
- *
- * This provides a good match with the original i810 code and preferred
- * XFree86 formatting conventions.
- *
- * When editing this driver, please follow the existing formatting, and edit
- * with <TAB> characters expanded at 8-column intervals.
- */
-
-/*
* Authors: Jeff Hartmann <jhartmann at valinux.com>
* David Dawes <dawes at xfree86.org>
* Keith Whitwell <keith at tungstengraphics.com>
*/
-/*
- * This driver does AGP memory allocation a little differently from most
- * others. The 2D and 3D allocations have been unified (see i830_memory.c).
- * The driver does the AGP allocations and binding directly, then passes
- * on the mappings to the DRM module. The DRM's AGP interfaces are not used.
- * The main difference with this is that the offsets need to include
- * the AGP aperture base address because that won't be known or added on
- * by the DRM module.
- *
- * DHD 07/2002
- */
-
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
diff --git a/src/i830_dri.h b/src/i830_dri.h
index 83ddd85..bedbcbe 100644
--- a/src/i830_dri.h
+++ b/src/i830_dri.h
@@ -1,4 +1,3 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/i810/i830_dri.h,v 1.6 2003/09/28 20:15:59 alanh Exp $ */
#ifndef _I830_DRI_H
#define _I830_DRI_H
diff --git a/src/i830_driver.c b/src/i830_driver.c
index 7a81d93..1ff5866 100644
--- a/src/i830_driver.c
+++ b/src/i830_driver.c
@@ -1,4 +1,3 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/i810/i830_driver.c,v 1.50 2004/02/20 00:06:00 alanh Exp $ */
/**************************************************************************
Copyright 2001 VA Linux Systems Inc., Fremont, California.
@@ -28,135 +27,12 @@ USE OR OTHER DEALINGS IN THE SOFTWARE.
**************************************************************************/
/*
- * Reformatted with GNU indent (2.2.8), using the following options:
- *
- * -bad -bap -c41 -cd0 -ncdb -ci6 -cli0 -cp0 -ncs -d0 -di3 -i3 -ip3 -l78
- * -lp -npcs -psl -sob -ss -br -ce -sc -hnl
- *
- * This provides a good match with the original i810 code and preferred
- * XFree86 formatting conventions.
- *
- * When editing this driver, please follow the existing formatting, and edit
- * with <TAB> characters expanded at 8-column intervals.
- */
-
-/*
* Authors: Jeff Hartmann <jhartmann at valinux.com>
* Abraham van der Merwe <abraham at 2d3d.co.za>
* David Dawes <dawes at xfree86.org>
* Alan Hourihane <alanh at tungstengraphics.com>
*/
-/*
- * Mode handling is based on the VESA driver written by:
- * Paulo César Pereira de Andrade <pcpa at conectiva.com.br>
- */
-
-/*
- * Changes:
- *
- * 23/08/2001 Abraham van der Merwe <abraham at 2d3d.co.za>
- * - Fixed display timing bug (mode information for some
- * modes were not initialized correctly)
- * - Added workarounds for GTT corruptions (I don't adjust
- * the pitches for 1280x and 1600x modes so we don't
- * need extra memory)
- * - The code will now default to 60Hz if LFP is connected
- * - Added different refresh rate setting code to work
- * around 0x4f02 BIOS bug
- * - BIOS workaround for some mode sets (I use legacy BIOS
- * calls for setting those)
- * - Removed 0x4f04, 0x01 (save state) BIOS call which causes
- * LFP to malfunction (do some house keeping and restore
- * modes ourselves instead - not perfect, but at least the
- * LFP is working now)
- * - Several other smaller bug fixes
- *
- * 06/09/2001 Abraham van der Merwe <abraham at 2d3d.co.za>
- * - Preliminary local memory support (works without agpgart)
- * - DGA fixes (the code were still using i810 mode sets, etc.)
- * - agpgart fixes
- *
- * 18/09/2001
- * - Proper local memory support (should work correctly now
- * with/without agpgart module)
- * - more agpgart fixes
- * - got rid of incorrect GTT adjustments
- *
- * 09/10/2001
- * - Changed the DPRINTF() variadic macro to an ANSI C compatible
- * version
- *
- * 10/10/2001
- * - Fixed DPRINTF_stub(). I forgot the __...__ macros in there
- * instead of the function arguments :P
- * - Added a workaround for the 1600x1200 bug (Text mode corrupts
- * when you exit from any 1600x1200 mode and 1280x1024 at 85Hz. I
- * suspect this is a BIOS bug (hence the 1280x1024 at 85Hz case)).
- * For now I'm switching to 800x600 at 60Hz then to 80x25 text mode
- * and then restoring the registers - very ugly indeed.
- *
- * 15/10/2001
- * - Improved 1600x1200 mode set workaround. The previous workaround
- * was causing mode set problems later on.
- *
- * 18/10/2001
- * - Fixed a bug in I830BIOSLeaveVT() which caused a bug when you
- * switched VT's
- */
-/*
- * 07/2002 David Dawes
- * - Add Intel(R) 855GM/852GM support.
- */
-/*
- * 07/2002 David Dawes
- * - Cleanup code formatting.
- * - Improve VESA mode selection, and fix refresh rate selection.
- * - Don't duplicate functions provided in 4.2 vbe modules.
- * - Don't duplicate functions provided in the vgahw module.
- * - Rewrite memory allocation.
- * - Rewrite initialisation and save/restore state handling.
- * - Decouple the i810 support from i830 and later.
- * - Remove various unnecessary hacks and workarounds.
- * - Fix an 845G problem with the ring buffer not in pre-allocated
- * memory.
- * - Fix screen blanking.
- * - Clear the screen at startup so you don't see the previous session.
- * - Fix some HW cursor glitches, and turn HW cursor off at VT switch
- * and exit.
- *
- * 08/2002 Keith Whitwell
- * - Fix DRI initialisation.
- *
- *
- * 08/2002 Alan Hourihane and David Dawes
- * - Add XVideo support.
- *
- *
- * 10/2002 David Dawes
- * - Add Intel(R) 865G support.
- *
- *
- * 01/2004 Alan Hourihane
- * - Add Intel(R) 915G support.
- * - Add Dual Head and Clone capabilities.
- * - Add lid status checking
- * - Fix Xvideo with high-res LFP's
- * - Add ARGB HW cursor support
- *
- * 05/2005 Alan Hourihane
- * - Add Intel(R) 945G support.
- *
- * 09/2005 Alan Hourihane
- * - Add Intel(R) 945GM support.
- *
- * 10/2005 Alan Hourihane, Keith Whitwell, Brian Paul
- * - Added Rotation support
- *
- * 12/2005 Alan Hourihane, Keith Whitwell
- * - Add Intel(R) 965G support.
- */
-
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
diff --git a/src/i830_memory.c b/src/i830_memory.c
index 52ec872..d5827f8 100644
--- a/src/i830_memory.c
+++ b/src/i830_memory.c
@@ -1,4 +1,3 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/i810/i830_memory.c,v 1.9 2003/09/24 03:16:54 dawes Exp $ */
/**************************************************************************
Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas.
@@ -29,19 +28,6 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
**************************************************************************/
/*
- * Reformatted with GNU indent (2.2.8), using the following options:
- *
- * -bad -bap -c41 -cd0 -ncdb -ci6 -cli0 -cp0 -ncs -d0 -di3 -i3 -ip3 -l78
- * -lp -npcs -psl -sob -ss -br -ce -sc -hnl
- *
- * This provides a good match with the original i810 code and preferred
- * XFree86 formatting conventions.
- *
- * When editing this driver, please follow the existing formatting, and edit
- * with <TAB> characters expanded at 8-column intervals.
- */
-
-/*
* Authors:
* Keith Whitwell <keith at tungstengraphics.com>
* David Dawes <dawes at xfree86.org>
diff --git a/src/i830_video.c b/src/i830_video.c
index 8d33d69..1e05e9c 100644
--- a/src/i830_video.c
+++ b/src/i830_video.c
@@ -23,7 +23,6 @@
THE USE OR OTHER DEALINGS IN THE SOFTWARE.
**************************************************************************/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/i810/i830_video.c,v 1.11tsi Exp $ */
/*
* i830_video.c: i830/i845 Xv driver.
diff --git a/src/xvmc/I810XvMC.c b/src/xvmc/I810XvMC.c
index 10606de..0754ff4 100644
--- a/src/xvmc/I810XvMC.c
+++ b/src/xvmc/I810XvMC.c
@@ -33,7 +33,6 @@ THE USE OR OTHER DEALINGS IN THE SOFTWARE.
**
**
***************************************************************************/
-/* $XFree86: xc/lib/XvMC/hw/i810/I810XvMC.c,v 1.10 2002/10/30 12:52:01 alanh Exp $ */
#include <stdio.h>
#include <stdlib.h>
#include <unistd.h>
diff --git a/src/xvmc/I810XvMC.h b/src/xvmc/I810XvMC.h
index dc2cab8..c875eca 100644
--- a/src/xvmc/I810XvMC.h
+++ b/src/xvmc/I810XvMC.h
@@ -32,7 +32,6 @@ THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*
*
***************************************************************************/
-/* $XFree86: xc/lib/XvMC/hw/i810/I810XvMC.h,v 1.3 2002/10/30 12:52:02 alanh Exp $ */
#ifndef I810XVMC_H
diff --git a/src/xvmc/xf86dri.c b/src/xvmc/xf86dri.c
index 96987bf..9ea919a 100644
--- a/src/xvmc/xf86dri.c
+++ b/src/xvmc/xf86dri.c
@@ -1,4 +1,3 @@
-/* $XFree86: xc/lib/GL/dri/XF86dri.c,v 1.13 2002/10/30 12:51:25 alanh Exp $ */
/**************************************************************************
Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas.
diff --git a/src/xvmc/xf86dri.h b/src/xvmc/xf86dri.h
index 81cfdfd..5b8655d 100644
--- a/src/xvmc/xf86dri.h
+++ b/src/xvmc/xf86dri.h
@@ -1,4 +1,3 @@
-/* $XFree86: xc/lib/GL/dri/xf86dri.h,v 1.8 2002/10/30 12:51:25 alanh Exp $ */
/**************************************************************************
Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas.
diff --git a/src/xvmc/xf86dristr.h b/src/xvmc/xf86dristr.h
index 3b43438..d898996 100644
--- a/src/xvmc/xf86dristr.h
+++ b/src/xvmc/xf86dristr.h
@@ -1,4 +1,3 @@
-/* $XFree86: xc/lib/GL/dri/xf86dristr.h,v 1.10 2002/10/30 12:51:25 alanh Exp $ */
/**************************************************************************
Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas.
More information about the xorg-commit
mailing list