Commit graph

49 commits

Author SHA1 Message Date
Eric Anholt
54b68e9ee4 A paniced machine running X looks a lot like a non-paniced machine running
X if you don't have a mouse. Actually fix pcigart so it'll survive
    multiple runnings of GL clients.
2002-06-27 22:09:19 +00:00
Eric Anholt
4e59a5bb85 AGPGART working for r128 on FreeBSD. 2002-06-27 21:47:58 +00:00
Eric Anholt
86bef24923 MTRR support for FreeBSD. 2002-06-27 20:58:55 +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
6f0c4ebd9b Make DRM_OS_VERIFYAREA_READ actually verify. Radeon should now be as secure
on BSD as on Linux.
2002-06-27 18:29:44 +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
ed5ad049fd Enable debugging by default if DRM_DEBUG was set during compile. 2002-06-27 03:24:18 +00:00
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
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
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
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
Jens Owen
3903e5ac94 Merged drmcommand-0-0-1 2002-04-09 21:54:56 +00:00
Alan Hourihane
2ab6ff7190 fixups for *BSD 2002-03-11 11:26:13 +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
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
David Dawes
2ea12226a6 Initial merge for XFree86 4.0.99.3 import 2001-05-01 21:39:35 +00:00
David Dawes
cc7afb2b16 Use the linux version of xf86drm.c. 2001-04-10 18:45:17 +00:00
David Dawes
18fc5ee923 First pass of XFree86 4.0.99.2 merge. 2001-04-09 21:56:31 +00:00
David Dawes
1759c16ab9 Import -f XFree86 4.0.99.2 2001-04-09 16:27:54 +00:00
David Dawes
404a409ab3 Initial XFree86 4.0.99.1 merge. 2001-03-19 21:39:36 +00:00
David Dawes
94071289a4 merge with 4.0.1d 2000-11-08 00:07:17 +00:00
Alan Hourihane
c7558d8fa4 commit xfree86 4.0.1d-pre update 2000-09-24 09:34:10 +00:00
Keith Whitwell
0bdde422b7 Added planemask args for color and depthbuffer clears. 2000-08-30 22:36:27 +00:00
Alan Hourihane
8bc39d01ca Import of XFree86 4.0.1 2000-07-10 21:32:06 +00:00
Doug Rabson
d399dbcd56 Merged bsd-1-0-1 2000-06-13 17:38:09 +00:00
Doug Rabson
fa0a35a25f Merged bsd-1-0-0 2000-05-30 17:13:31 +00:00