Commit graph

435 commits

Author SHA1 Message Date
Eric Anholt
9a0d90c74e Update from trunk. 2002-07-04 23:04:27 +00:00
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
c44982e159 Merge from trunk to bsd-3-0-0-branch. 2002-07-03 07:54:13 +00:00
Eric Anholt
a7dfacf68c typo, DRM_OS_ -> DRM_. (Preparing for trunk->branch merge) 2002-07-03 07:35:13 +00:00
Eric Anholt
4edc607f8e One memory barrier missed in template conversion. 2002-07-03 07:25:23 +00:00
Eric Anholt
e9be5c9093 Fix PCI IDs for BSD. 2002-07-02 07:17:56 +00:00
Eric Anholt
86414649f1 Make wrapped non-volatile to prevent warnings (it doesn't need to be, as
there shouldn't anything be modifying wrapped behind our backs without
    interrupts)
2002-07-02 05:27:31 +00:00
Eric Anholt
a043b05c90 Fix panic on module unload and a panic when exiting dri clients sometimes.
Allow module unloading when not in use. Mostly from FreeBSD CVS.
2002-07-02 03:27:16 +00:00
Eric Anholt
5c8bf3796e More fixing for -stable 2002-06-28 07:38:15 +00:00
Eric Anholt
53431734f6 Didn't quite work first time. varargs macros on 2.95 are strange. 2002-06-28 07:34:31 +00:00
Eric Anholt
d22a19a370 Fix for compiling on gcc 2.95 (according to rwatson) 2002-06-28 07:10:20 +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
Alan Hourihane
54fca81696 comment fix 2002-06-27 22:25:54 +00:00
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
615b170db9 One more __FUNCTION__ that had survived. 2002-06-27 04:04:22 +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
635b7784a6 Messed up use of IOC() in the last commit. 2002-06-27 03:23:41 +00:00
Eric Anholt
840ea6cd73 mga port to os-independent style, tested on linux with g400. 2002-06-26 20:04:02 +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
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