Eric Anholt
9a0d90c74e
Update from trunk.
2002-07-04 23:04:27 +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
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
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
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
840ea6cd73
mga port to os-independent style, tested on linux with g400.
2002-06-26 20:04:02 +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
Alan Hourihane
783ba16f26
bring the bsd-3-0-0 branch up-to-date with the trunk
2002-06-12 21:07:52 +00:00
Jens Owen
3903e5ac94
Merged drmcommand-0-0-1
2002-04-09 21:54:56 +00:00
David Dawes
ab87c5d0d1
First pass of mesa-4-0 branch merge into trunk.
2002-02-14 02:00:26 +00:00
David Dawes
44aa4d6297
First pass merge of XFree86 4.2.0 import.
2002-01-27 20:05:42 +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
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
Gareth Hughes
7ccc528911
Fix typo in XFREE86_VERSION().
2001-07-13 01:42:48 +00:00
David Dawes
d87c873df0
First pass of 4.1.0 merge.
2001-06-14 22:23:44 +00:00
Alan Hourihane
18ce40c9d3
Make the SiS module work again. At least glxinfo reports it's working, yet
...
trying to run the simple apps return 'out of video memory'
2001-05-17 15:20:40 +00:00
Alan Hourihane
94c6d951a2
Make SiS driver compile with the new templated format. Not tested. minor
...
cleanups
2001-05-03 14:51:01 +00:00
Kevin E Martin
5d6ddbca26
Merged ati-pcigart-1-0-0
2001-04-05 22:16:12 +00:00
David Dawes
301a1ad315
Move #include <linux/config.h> inside the __linux__ #ifdef, so that it
...
doesn't break non-Linux builds.
2001-03-21 20:22:16 +00:00
Kevin E Martin
74e19a4018
Merged sarea-1-0-0
2001-03-14 22:22:50 +00:00
Gareth Hughes
3a74d3a371
Merge tdfx-3-1-0 branch.
2001-03-06 04:37:37 +00:00
Rik Faith
88dbee54ed
Implement drmOpen* without /proc dependence (Fallback to /proc is included
...
for backward compatibility.) Move statistic-gathering drm* calls from
dristat.c to xf86drm.c
2001-02-28 09:27:44 +00:00
Gareth Hughes
360475376c
Merge mga-1-0-0-branch into trunk.
2001-02-15 08:12:14 +00:00
Kevin E Martin
0994e635b2
Merged ati-5-0-0
2001-01-05 22:57:55 +00:00
Rik Faith
833af23c5d
Sync with Linux 2.4.0-prerelease
2001-01-04 18:41:41 +00:00
Keith Whitwell
c7c6156aec
add blit ioctl, fix plnwt handling
2000-12-30 23:28:53 +00:00
Gareth Hughes
e15a24e154
Merged ati-4-1-1-branch into trunk.
2000-12-02 06:14:18 +00:00
David Dawes
94071289a4
merge with 4.0.1d
2000-11-08 00:07:17 +00:00
Rik Faith
52f0bc3c9e
More changes for sync with Linux 2.4.0-test9-pre7
2000-09-29 02:05:41 +00:00
Rik Faith
39a659e877
Audit calls to schedule() Remove tags from files shared with Linux kernel
...
tree Remove debugging statements to make debugging more useful Other
minor cleanups in preparation for sync with Linux 2.4.0-test9-pre7
2000-09-29 01:47:11 +00:00
Alan Hourihane
c7558d8fa4
commit xfree86 4.0.1d-pre update
2000-09-24 09:34:10 +00:00
Brian Paul
7b888f87fa
applied Jeff's xf86cvs-I810copy.patch
2000-07-13 18:47:48 +00:00
Doug Rabson
d399dbcd56
Merged bsd-1-0-1
2000-06-13 17:38:09 +00:00
Rik Faith
2fbd4bf018
Unify code with kernel: Change some spacing in comments Add #include
...
<linux/config.h> to all *_drv.c files
2000-06-13 14:34:13 +00:00
Gareth Hughes
d5348efe25
Merging the ati-4-1-0 branch onto the trunk.
2000-06-12 15:47:31 +00:00
Brian Paul
569da5a42e
Merged glxmisc-3-0-0
2000-06-08 14:38:22 +00:00
Doug Rabson
fa0a35a25f
Merged bsd-1-0-0
2000-05-30 17:13:31 +00:00
Keith Whitwell
ddcb28259f
Merged mga-0-0-3-branch
...
- New security model for i810
- Enable i810 dri by default
- New indexed vertex path for mga
- Mga kernel driver rework
- Removed dead files in i810 driver
2000-05-25 21:06:02 +00:00
Kevin E Martin
99efe3c247
Merged ati-4-0-1
2000-05-18 06:14:27 +00:00
Jeff Hartmann
ba1b1ae380
Merged mga branch with trunk
2000-04-04 22:08:14 +00:00
