Commit graph

388 commits

Author SHA1 Message Date
David Dawes
bf01c96677 Revert the minor version back to 2 (and bump the patchlevel). 2002-02-13 21:18:28 +00:00
David Dawes
d779dbfb8b Remove ; from the end of some do { ... } while(0) macros (Timothy Ball). 2002-02-13 16:37:09 +00:00
Keith Whitwell
96003499f7 fix multiple window clear bug 2002-02-13 02:54:37 +00:00
Keith Whitwell
86c0484e0f Remove references to dead i810_vertex2 ioctl 2002-02-12 22:53:29 +00:00
David Dawes
2b56c96e70 Initial merge of trunk into mesa-4-0 branch. 2002-02-12 01:22:13 +00:00
Alan Hourihane
5d20d2c1d4 merge linux kernel 2.4.15 2001-12-10 23:30:17 +00:00
David Dawes
e2d4ec37f6 Create a noop stub for DRM_IOCTL_CONTROL when __HAVE_DMA_IRQ is turned off.
This makes retaining backward-compatibility a little easier.
2001-12-09 17:43:49 +00:00
Keith Whitwell
f535716565 remove debug 2001-12-05 13:44:14 +00:00
Keith Whitwell
952e91e3c3 Fix stencil clears. 2001-12-05 11:30:06 +00:00
Keith Whitwell
e7ce909f8f fix PR_* definitions to match original definitions 2001-11-29 14:44:51 +00:00
Keith Whitwell
3f1341a7fb Remove multiple states code 2001-11-29 14:24:24 +00:00
Keith Whitwell
cf438cfe77 Put back i810 drm major number, add stub irq functions for backwards
compatibility.
2001-11-27 11:48:31 +00:00
Keith Whitwell
f8f0bcfc2d fix zbias state upload 2001-11-26 16:59:51 +00:00
Keith Whitwell
cacc267b31 fix CONTEXT_ALL bitmap 2001-11-26 16:44:24 +00:00
Keith Whitwell
6f8928665e version number bumps 2001-11-26 11:21:10 +00:00
Keith Whitwell
92f782949b Fix silly bug causing lockups. 2001-11-20 11:41:35 +00:00
Alan Hourihane
7f451053fc memset some places. 2001-11-06 18:05:36 +00:00
Keith Whitwell
4d214fbb51 Move sarea definition to xf86drmRadeon.h 2001-11-06 16:46:19 +00:00
Keith Whitwell
033825e972 Reimplement 3.5 features in a backwards-compatible way. Untested. 2001-11-06 15:12:46 +00:00
David Dawes
eef8c85f8d Allow the radeon module to build. 2001-11-03 19:27:34 +00:00
Brian Paul
bf88ed5817 use #ifdef MODULE_LICENSE/#endif to compile with kernel 2.4.5 (and maybe
others)
2001-11-01 19:24:14 +00:00
Keith Whitwell
7d829fda11 Changes for radeon client module compile 2001-10-30 16:21:44 +00:00
Keith Whitwell
a43cc303db Updates from 3.5 branch 2001-10-29 23:31:51 +00:00
Keith Whitwell
ca7e845cc9 broken, checkpoint commit 2001-10-29 17:00:30 +00:00
Alan Hourihane
bdd84e8958 commit Abraham vd Merwe fix. 2001-10-08 12:58:20 +00:00
Alan Hourihane
ca820fca87 merge with 2.4.10 kernel 2001-09-25 09:32:16 +00:00
Alan Hourihane
390440c939 remove Linux 2.3.x cruft. 2001-09-18 11:00:23 +00:00
Alan Hourihane
b1c44c8ac1 bumped the DRM versions (already done in ddx and client side drivers). 2001-09-17 21:12:10 +00:00
Alan Hourihane
2fabe80827 Use CCE for 2D acceleration (Gerd Knorr) 2001-09-17 10:30:17 +00:00
David Dawes
9e69d0dac6 - Remove the rest of the unneeded client-side libraries.
- Use installed libraries that are not built here.
- Don't build/install client-library related file and headers.
2001-08-25 03:13:04 +00:00
Alan Hourihane
27e24cbc0a file convert.c was initially added on branch bsd-2-0-0-branch. 2001-08-24 11:09:50 +00:00
David Dawes
c6bf9bae8e First part of XFree86 4.1.99.1 merge. 2001-08-22 18:24:52 +00:00
David Dawes
2f060f44e0 Import of XFree86 4.1.99.1 2001-08-22 18:00:47 +00:00
Jeff Hartmann
063fe900aa file drm_ioctl_table.h was initially added on branch mesa-3-5-branch. 2001-08-21 21:54:04 +00:00
Alan Hourihane
f4c2f14002 No one's maintaining 2.2.x support - so remove all the cruft. 2001-08-19 15:20:08 +00:00
Jeff Hartmann
8aaf82d45c A few warning fixes when actually building under 2.4.9-pre2 + some
reformating
2001-08-14 00:35:07 +00:00
Jeff Hartmann
aa09e36114 Sync with Linus 2.4.9-pre2 + make all nopage routines more alike 2001-08-13 23:23:47 +00:00
Alan Hourihane
2d4b2cf6f6 new multihead code was missing Voodoo3 2000 and Voodoo4 support. 2001-08-11 15:48:00 +00:00
Jeff Hartmann
97b8aa52bb Commit Keith Owens kernel Makefile changes, merge and commit alpha patch
set from Jay Estabrook (sans some mga modifications which broke other
    arch's.)
2001-08-10 16:29:21 +00:00
Jeff Hartmann
b6923b3953 Update to the code I sent Linus and Alan this morning. Added some missing
agp chipsets to drm_agpsupport.h, redid the card detection common code
    to use a structure (avoids endian porting issues), changed the tdfx
    driver to use the kernel pci id '#defines'
2001-08-08 16:10:47 +00:00
Jeff Hartmann
938a637d1f Avoid compiler warning about r_list being used uninitialized. 2001-08-07 18:22:41 +00:00
Jeff Hartmann
51e38d96ea Lots of DRM fixes: added new pieces of template code so the ffb driver can
be ported, rolled back r128 and i810 version bumps so 4.1.0 works with
    cvs kernel modules, added Config.in and updated Makefile.kernel,
    incorporated lots of drm fixes inspired by patches sent by Redhat, made
    DRM(realloc) usage check for NULL allocations, restructure driver init
    routines to export dev_priv only when initialized and to check for all
    error conditions.
2001-08-07 18:15:10 +00:00
David Dawes
56bd9c2077 Merge the multihead-1-0-0 branch into the trunk, with the exception of the
glide header files.
The changes include:
- Brian Paul's changes to the tdfx client-side 3D driver to make it
    dlopen() the correct glide library (Voodoo3 or Voodoo5). This allows
    both types of the glide library to co-exist, and allows Voodoo3/Voodoo5
    cards to be mixed in multi-head configs.
- DRM kernel driver changes to allow a driver to set up multiple instances
    (minor numbers), one for each card present that the driver supports.
    This is currently implemented and tested only for the tdfx DRM driver.
- Add some missing missing <stdarg.h> includes.
- Some log message cleanups.
- Change the 2D tdfx driver to access VGA legacy registers via their PCI
    I/O space access points rather than their legacy addresses, and fix
    some problems with the way the VGA-related bits are initialised.
Status:
- With these changes, multi-head direct rendering works with multiple
    Voodoo3 and/or Voodoo5 cards. This has been tested with two PCI Voodoo3
    cards and an AGP Voodoo5 card, and all permutations of those.
Caveats:
- Xinerama is not supported. If Xinerama is enabled, then direct rendering
    gets disabled.
- The text mode on secondary screens will show junk after the X server
    exits.
- On some hardware, starting the X server on multiple 3dfx cards will
    result in a hard lockup. One workaround is to enable APIC support in a
    uni-processor kernel, or use an SMP kernel.
2001-07-30 19:59:39 +00:00
Jeff Hartmann
84a5e71087 Fixes that allow the modules to be built into the kernel 2001-07-23 20:25:38 +00:00
Jeff Hartmann
5e8ba79eb6 Merge checker fixes from Alan Cox made to the drm in the ac kernel tree.
These aren't really security problems, but Alan has made some arguments
    that have convinced me that the code should be fixed anyway.
2001-07-20 22:16:04 +00:00
Jeff Hartmann
ae5b4effc0 Remove module name hacks because we aren't going to implement this anymore
because of Linus' comments
2001-07-20 20:31:30 +00:00
Jeff Hartmann
4eafeec960 Add module version name at a lower layer of the code, allows things to be
more flexible and allow older module versions to still work. Might not
    be final code if we move over to DRI kernel module version, but will be
    if we use XFree86 version. + Only build tdfx.o instead of tdfx-4_1_0.o
    since tdfx.o has never changed its API.
2001-07-18 21:02:58 +00:00
Jeff Hartmann
c6454e6a93 Someone forgot to bump the r128 and i810 drivers properly before the 4.1.0
release. Better late than never.
2001-07-17 22:31:26 +00:00
Jeff Hartmann
d5749d7603 Added version string to the end of the kernel module name. This allows
multiple versions of the kernel module to co-exist on one machine.
2001-07-16 22:42:36 +00:00
Jeff Hartmann
b816802daf i810 drm security fix 2001-07-16 16:57:12 +00:00