David Dawes
56bd9c2077
Merge the multihead-1-0-0 branch into the trunk, with the exception of the
...
glide header files.
The changes include:
- Brian Paul's changes to the tdfx client-side 3D driver to make it
dlopen() the correct glide library (Voodoo3 or Voodoo5). This allows
both types of the glide library to co-exist, and allows Voodoo3/Voodoo5
cards to be mixed in multi-head configs.
- DRM kernel driver changes to allow a driver to set up multiple instances
(minor numbers), one for each card present that the driver supports.
This is currently implemented and tested only for the tdfx DRM driver.
- Add some missing missing <stdarg.h> includes.
- Some log message cleanups.
- Change the 2D tdfx driver to access VGA legacy registers via their PCI
I/O space access points rather than their legacy addresses, and fix
some problems with the way the VGA-related bits are initialised.
Status:
- With these changes, multi-head direct rendering works with multiple
Voodoo3 and/or Voodoo5 cards. This has been tested with two PCI Voodoo3
cards and an AGP Voodoo5 card, and all permutations of those.
Caveats:
- Xinerama is not supported. If Xinerama is enabled, then direct rendering
gets disabled.
- The text mode on secondary screens will show junk after the X server
exits.
- On some hardware, starting the X server on multiple 3dfx cards will
result in a hard lockup. One workaround is to enable APIC support in a
uni-processor kernel, or use an SMP kernel.
2001-07-30 19:59:39 +00:00
Jeff Hartmann
84a5e71087
Fixes that allow the modules to be built into the kernel
2001-07-23 20:25:38 +00:00
Jeff Hartmann
5e8ba79eb6
Merge checker fixes from Alan Cox made to the drm in the ac kernel tree.
...
These aren't really security problems, but Alan has made some arguments
that have convinced me that the code should be fixed anyway.
2001-07-20 22:16:04 +00:00
Jeff Hartmann
ae5b4effc0
Remove module name hacks because we aren't going to implement this anymore
...
because of Linus' comments
2001-07-20 20:31:30 +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
c6454e6a93
Someone forgot to bump the r128 and i810 drivers properly before the 4.1.0
...
release. Better late than never.
2001-07-17 22:31:26 +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
Jeff Hartmann
b816802daf
i810 drm security fix
2001-07-16 16:57:12 +00:00
Gareth Hughes
7ccc528911
Fix typo in XFREE86_VERSION().
2001-07-13 01:42:48 +00:00
Jeff Hartmann
12e9c636df
Fix 5 security bugs found by the Stanford tools
2001-06-18 19:25:15 +00:00
Gareth Hughes
b1a588f0cc
Forgot to bump date stamp.
2001-06-18 13:45:23 +00:00
Gareth Hughes
3a410059b4
Enable shared IRQs in DMA template, use in i810 driver.
2001-06-18 12:59:42 +00:00
David Dawes
d87c873df0
First pass of 4.1.0 merge.
2001-06-14 22:23:44 +00:00
David Dawes
334e134918
Import of XFree86 4.1.0
2001-06-14 21:53:06 +00:00
Gareth Hughes
dca245e37c
Only authenticated clients can mmap() (Jeff Hartmann).
2001-05-23 17:41:31 +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
David Dawes
9c775d0b2f
finish struct stat type cleanup Fix a build dependencies for the tdfx drm
...
module
2001-05-14 14:49:58 +00:00
Alan Hourihane
0813760110
add some commented enclosures around the BUS_BASE calls for Alpha
...
platforms.
2001-05-04 14:05:13 +00:00
Alan Hourihane
5f5d850013
file drm_linux.h was initially added on branch bsd-2-0-0-branch.
2001-05-04 09:31:35 +00:00
Alan Hourihane
726096309b
file drm_agpsupport.h was initially added on branch bsd-2-0-0-branch.
2001-05-04 08:28:30 +00:00
Alan Hourihane
ebf0d7addf
add new file
2001-05-03 14:52:29 +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
Alan Hourihane
d3645e7a4e
remove deprecated file
2001-05-03 14:32:59 +00:00
David Dawes
2ea12226a6
Initial merge for XFree86 4.0.99.3 import
2001-05-01 21:39:35 +00:00
David Dawes
a576d41498
Import of XFree86 4.0.99.3
2001-05-01 17:07:59 +00:00
Alan Hourihane
b804c09d06
fix build of i810 kernel driver for 2.4.3 or greater kernels
2001-04-30 16:18:22 +00:00
Kevin E Martin
df76f81292
- PCIGART patches for Alpha from Compaq
2001-04-30 15:07:18 +00:00
Alan Hourihane
d1ef7f9d2c
file drm_vm.h was initially added on branch bsd-2-0-0-branch.
2001-04-30 13:24:28 +00:00
Alan Hourihane
2c0811d628
file drm_sysctl.h was initially added on branch bsd-2-0-0-branch.
2001-04-30 11:11:00 +00:00
Alan Hourihane
ae1cc90462
file drm_os_freebsd.h was initially added on branch bsd-2-0-0-branch.
2001-04-25 14:20:17 +00:00
Alan Hourihane
376189905b
file drm_os_linux.h was initially added on branch bsd-2-0-0-branch.
2001-04-25 14:20:17 +00:00
Alan Hourihane
97e48b4cd1
file Makefile was initially added on branch bsd-2-0-0-branch.
2001-04-25 12:59:04 +00:00
Brian Paul
b1488c2f87
include linux/sisfb.h, per David Gaarenstroom
2001-04-21 19:06:46 +00:00
David Dawes
49781fcf37
put back BUS_BASE
2001-04-18 18:45:20 +00:00
Kevin E Martin
6f5e397f25
- Fix typo and remove magic numbers
2001-04-16 21:43:28 +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
Kevin E Martin
0e7f6c0726
- Fix typo
...
- Clean up some macros
2001-04-06 17:53:32 +00:00
Alan Hourihane
908d32f84c
search /lib/modules/<version>/build/include first, then the others....
2001-04-06 15:49:42 +00:00
Alan Hourihane
2bd9bf98c7
Handle drivers that don't have __HAVE_SG defined.
2001-04-06 08:39:02 +00:00
Kevin E Martin
5d6ddbca26
Merged ati-pcigart-1-0-0
2001-04-05 22:16:12 +00:00
Alan Hourihane
a15b9dec3c
include 2.4.2
2001-04-03 08:01:00 +00:00
Alan Hourihane
4259e5e617
make 2.4.2 -> 2.4.3 change conditional. works with older than 2.4.3 kernels
...
again.
2001-04-03 07:50:30 +00:00
Gareth Hughes
62d4931529
Update radeon DRM to v1.1.0 (texture upload changes).
2001-04-02 01:17:18 +00:00
David Dawes
fcc21069b7
- Move xf86ConfigDRI declaration from xf86Priv.h to xf86.h.
...
- Don't include xf86Priv.h in the drm module.
- Fix 'struct stat' in loader libc wrapping to avoid unnecessary
XFree86LOADER #ifdefs in code that uses it.
- Make drmOpenMinor() static.
2001-03-30 17:16:20 +00:00
Alan Hourihane
e407c2f5a6
merge in 2.4.3 kernel change.
2001-03-30 13:32:39 +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
Gareth Hughes
92b0aaa6fe
- Fix MGA header info.
...
- Update date strings.
- Fix MGA hangs (undocumented side effects of DWGSYNC).
- Remove idle before ILOAD??? Seems fine with the above fix.
2001-03-21 13:10:27 +00:00
Gareth Hughes
b90028231c
Remove compiler warnings, minor cleanups.
2001-03-21 03:29:23 +00:00