Commit graph

411 commits

Author SHA1 Message Date
Eric Anholt
37fe388aae Error code that got missed. 2002-06-26 20:02:33 +00:00
Eric Anholt
7036e83f14 Update radeon_drv.c for the new interfaces in 1.3.1. 2002-06-26 19:09:45 +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
1d13033bac Add mga and radeon source from Linux 2002-06-21 06:08:46 +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
Eric Anholt
ffc8dc1491 Add r128 device-specific files from linux 2002-06-19 04:01:57 +00:00
Eric Anholt
4dae483f94 More NetBSD changes
Obtained from: Erik Reid
2002-06-18 07:25:29 +00:00
Eric Anholt
cc2cf69210 NetBSD changes to drm_drv.h, may help with multiple drm devices on Free. 2002-06-18 04:07:53 +00:00
Eric Anholt
92c174920b Some cleanup of things that were messed up with NetBSD and previous
commits. There is still a crash that I'm looking into.
2002-06-18 03:00:00 +00:00
Eric Anholt
82c783c551 Some initial NetBSD stuff, drm_drv.h to follow. 2002-06-17 22:18:01 +00:00
Eric Anholt
dcf1b2b7a9 Remove mis-merged ioremap_nocache (which is not used) 2002-06-17 19:38:40 +00:00
Eric Anholt
9c7a48f2ce Move some header includes to drm_os_freebsd.h. This is in preparation for
some NetBSD work to be done soon. There shouldn't be too much extra
    header inclusion, and it'll clean up a lot of #ifdefs.
2002-06-17 08:56:00 +00:00
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