Commit graph

397 commits

Author SHA1 Message Date
Eric Anholt
117d3d9a7e Work around ioctl() being defined in sys/ioccom.h. This will have to be
evaluated before merging, but helps with compiling for now.
2002-06-17 07:22:54 +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
Eric Anholt
fd4d82a496 DRM_DEBUG=1 warnings cleanup 2002-05-31 03:49:53 +00:00
Eric Anholt
76b60581df pcigart code ported for FreeBSD. Untested, disabled by default. Flip
__REALLY_HAVE_SG in drm_os_freebsd.h to test.
2002-05-31 03:44:52 +00:00
Eric Anholt
e19e0e4148 Use a single options header, opt_drm.h, which controls debug code and linux
emulation enabling. Add options to makefiles to turn these on/off.
2002-05-29 09:04:53 +00:00
Eric Anholt
2ea4becd8b Move the DRM for BSD from device-specific subdirectories into
bsd/drm/kernel, like it is in linux and in FreeBSD CVS. Remove sis
    files because they won't be supported in the forseeable future.
2002-05-29 08:44:55 +00:00
Eric Anholt
92c17c6cea Clean up some debugging output, strange diffs from linux. Clean up some
warnings. Remove alloc_pages/free_pages. There is no corresponding
    function in FreeBSD, and were incorrectly implemented (using
    contigmalloc instead of plain malloc).
2002-05-29 08:28:22 +00:00
Eric Anholt
5a0e2c2031 At least schedule the other half of the interrupt handler. This code
probably still has issues, but it's one less.
2002-05-28 09:36:49 +00:00
Eric Anholt
1fcd73b6e6 Fix up some atomic definitions. The atomic handling has issues iirc, but
4.x is non-reentrant and all of our code in -current is still under Giant.
2002-05-28 09:31:16 +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
Eric Anholt
4b905752d3 Catch up to FreeBSD-current Clean up some warnings with gcc3 Enable some
code in mmap that probably should have been enabled long ago. #if 0 out
    ioremap_nocache, since it isn't used yet.
2002-05-28 08:54:28 +00:00
Alan Hourihane
9dc12c377a bring bsd-3-0-0 branch up-to-date with trunk 2002-04-22 20:41:56 +00:00
Jens Owen
3903e5ac94 Merged drmcommand-0-0-1 2002-04-09 21:54:56 +00:00
Jens Owen
a820c74137 file xf86drmCompat.c was initially added on branch drmcommand-0-0-1-branch. 2002-03-29 16:31:52 +00:00
Alan Hourihane
31c885bafb file trident_drv.c was initially added on branch trident-0-0-1-branch. 2002-03-18 19:21:14 +00:00
Alan Hourihane
f0e215d3f9 file trident.h was initially added on branch trident-0-0-1-branch. 2002-03-18 19:21:14 +00:00
Alan Hourihane
2ab6ff7190 fixups for *BSD 2002-03-11 11:26:13 +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
Alan Hourihane
6a1941aa24 missing file 2002-03-08 09:00:12 +00:00
Alan Hourihane
271830e9b6 fixup the radeon driver (not tested) 2002-03-06 20:14:30 +00:00
Alan Hourihane
5e734a7ac8 i830 & mga contain minor changes from 4.2.0 for mesa 4.0 bsd merge 2002-03-06 19:31:39 +00:00
Alan Hourihane
46cacdca85 first pass at merging mesa 4.0 kernel drivers into new bsd-3-0-0 branch. 2002-03-06 19:30:45 +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
Manuel Teira
87ec138e14 file mach64.h was initially added on branch mach64-0-0-2-branch. 2001-10-21 21:08:15 +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