Commit graph

212 commits

Author SHA1 Message Date
Eric Anholt
6df32b3a51 Clean up remaining <driver>_drv.c files on linux. Tested by compiling both
as modules in CVS and compiled into the kernel.
2002-07-04 20:28:10 +00:00
Eric Anholt
563bc3158d os-independent interface name changes (mostly DRM_OS_* -> DRM_)
Suggested by: keithw
2002-06-27 22:41:08 +00:00
Eric Anholt
ed692e57b4 Correct a typo in drm.h Move most of <device>_drv.c into <device>.h. Move
linux init code into drm_drv.h with (I am pretty sure) proper
    protection from cpp problems.
2002-06-27 19:30:26 +00:00
Eric Anholt
72cdaedece Commit most of Erik Reid's NetBSD diffs, along with a few cleanups. 2002-06-27 17:58:41 +00:00
Eric Anholt
d66834945a Include protection against ioctl() definition only in the __FreeBSD__ and
XFree86Server case. These two drm.h's probably should be shared.
2002-06-27 04:01:20 +00:00
Eric Anholt
be3bde56ef The drmCommand interface was passing a size to DRM_IOR() and friends, when
DRM_IOR was expecting a type, so on BSD only an int was copied in/out
    of the kernel. Make drmCommand use new DRM_IOC(), which expects a size.
2002-06-26 19:06:52 +00:00
Eric Anholt
7116a99ed4 Port radeon to os-independent interface. Hook up mga and radeon from the
shared directory to the build (mga is not ported yet).
2002-06-21 20:39:53 +00:00
Eric Anholt
208afdc237 Hook up os-independence of r128 for Linux. 2002-06-21 05:58:49 +00:00
Eric Anholt
13e1d6a341 Commit os-independence of r128. Only hooked up on FreeBSD until I can fix
my r128 system to test it.
2002-06-19 04:12:51 +00:00
Alan Hourihane
783ba16f26 bring the bsd-3-0-0 branch up-to-date with the trunk 2002-06-12 21:07:52 +00:00
Alan Hourihane
271f730bf0 Bring bsd-3-0-0-branch up-to-date with trunk code. 2002-05-28 09:11:17 +00:00
Jens Owen
3903e5ac94 Merged drmcommand-0-0-1 2002-04-09 21:54:56 +00:00
Keith Whitwell
baef086c32 Fix backwards compatibility bug, add tests for good numbers of
vertices/prim.
2002-03-08 16:03:37 +00:00
David Dawes
ab87c5d0d1 First pass of mesa-4-0 branch merge into trunk. 2002-02-14 02:00:26 +00:00
Michel Daenzer
65d25572de wrapper for ioremap_nocache() like for ioremap() (Paul Mundt) 2002-02-02 17:03:51 +00:00
David Dawes
44aa4d6297 First pass merge of XFree86 4.2.0 import. 2002-01-27 20:05:42 +00:00
David Dawes
14945ada16 Import of XFree86 4.2.0 2002-01-27 18:23:04 +00:00
David Dawes
16bd14926e Initial revision 2002-01-27 18:23:04 +00:00
Alan Hourihane
f18a6d836b merge with linux kernel 2.4.15 2001-12-10 23:29:37 +00:00
Keith Whitwell
727abee235 Put back i810 major version number (same reasons as for r128) 2001-11-27 11:43:12 +00:00
Keith Whitwell
13e11e1f94 Put drm version back from 3.0 to 2.2; XFree86 4.1 is the baseline for
versioning information.
2001-11-26 13:28:38 +00:00
Alan Hourihane
05fb3e93f2 wrap the MODULE_LICENSE definition. 2001-11-02 17:40:11 +00:00
Alan Hourihane
92ad1b60e1 merge kernel 2.4.13-pre6. 2001-10-22 19:15:04 +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
2f060f44e0 Import of XFree86 4.1.99.1 2001-08-22 18:00:47 +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
Gareth Hughes
7ccc528911 Fix typo in XFREE86_VERSION(). 2001-07-13 01:42:48 +00:00
Jeff Hartmann
12e9c636df Fix 5 security bugs found by the Stanford tools 2001-06-18 19:25:15 +00:00
Gareth Hughes
b1a588f0cc Forgot to bump date stamp. 2001-06-18 13:45:23 +00:00
Gareth Hughes
3a410059b4 Enable shared IRQs in DMA template, use in i810 driver. 2001-06-18 12:59:42 +00:00
David Dawes
d87c873df0 First pass of 4.1.0 merge. 2001-06-14 22:23:44 +00:00