Commit graph

39 commits

Author SHA1 Message Date
Keith Whitwell
94b1d73a62 merge checkpoint 2002-06-12 11:34:40 +00:00
Keith Whitwell
40a08a7e6d don't wait in radeon_freelist_get 2002-05-02 13:31:43 +00:00
David Dawes
44aa4d6297 First pass merge of XFree86 4.2.0 import. 2002-01-27 20:05:42 +00:00
David Dawes
9e69d0dac6 - Remove the rest of the unneeded client-side libraries.
- Use installed libraries that are not built here.
- Don't build/install client-library related file and headers.
2001-08-25 03:13:04 +00:00
David Dawes
c6bf9bae8e First part of XFree86 4.1.99.1 merge. 2001-08-22 18:24:52 +00:00
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
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
David Dawes
d87c873df0 First pass of 4.1.0 merge. 2001-06-14 22:23:44 +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
David Dawes
2ea12226a6 Initial merge for XFree86 4.0.99.3 import 2001-05-01 21:39:35 +00:00
Kevin E Martin
df76f81292 - PCIGART patches for Alpha from Compaq 2001-04-30 15:07:18 +00:00
David Dawes
49781fcf37 put back BUS_BASE 2001-04-18 18:45:20 +00:00
David Dawes
18fc5ee923 First pass of XFree86 4.0.99.2 merge. 2001-04-09 21:56:31 +00:00
Kevin E Martin
5d6ddbca26 Merged ati-pcigart-1-0-0 2001-04-05 22:16:12 +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
Kevin E Martin
74e19a4018 Merged sarea-1-0-0 2001-03-14 22:22:50 +00:00
Gareth Hughes
e2b2bffc6b Rest of MGA dualhead patch. 2001-03-13 00:22:05 +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
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
Alan Hourihane
f1bb3c5f5f Merged tdfx-2-1-branch 2000-09-07 12:40:41 +00:00
David Dawes
cba4d3504c first part of 4.0.1b merge 2000-08-16 18:29:06 +00:00
Alan Hourihane
8751b6774d Merge XFree86 4.0.1 2000-07-11 11:41:07 +00:00
Rik Faith
1c8b2b5e06 Update email addresses and copyright notices to reflect VA Linux Systems 2000-06-13 14:22:03 +00:00
Brian Paul
569da5a42e Merged glxmisc-3-0-0 2000-06-08 14:38:22 +00:00
Kevin E Martin
99efe3c247 Merged ati-4-0-1 2000-05-18 06:14:27 +00:00
Brian Paul
01836824d5 Merged glxmisc-1-0-0 2000-04-20 16:36:40 +00:00
Jeff Hartmann
ba1b1ae380 Merged mga branch with trunk 2000-04-04 22:08:14 +00:00
Jeff Hartmann
5bd8014f27 Merge with 4.0 2000-03-16 03:37:30 +00:00
Jeff Hartmann
adc03d3661 Import of XFree86 4.0 2000-03-15 21:40:23 +00:00
Kevin E Martin
d9ff0e3884 3.9.18 merge 2000-02-22 22:10:28 +00:00
Rik Faith
9243a76e03 Merge between X_3_9_16 and X_3_9_17 Compiles but may not run. 2000-01-07 06:54:54 +00:00
Daryll Strauss
0371c290a1 Rename the device to be /dev/dri instead of /dev/dri to avoid a conflict.
Rename proc entry from /proc/graphics to /proc/dri to be consistent.
1999-12-18 18:34:59 +00:00
Daryll Strauss
e1dba5c3a7 Move Mesa to xc/extras Update to the latest Mesa 3.2 code Fix the Q3Demo
bugs (white railgun and texture mapping) Simplify driver texture
    mapping routines Fix device driver for 2.3 kernels Improve performance
1999-12-07 03:37:16 +00:00
Daryll Strauss
b6a28bfe98 First DRI release of 3dfx driver. 1999-12-05 23:10:37 +00:00
Daryll Strauss
b3a5766992 Initial revision 1999-12-05 01:19:48 +00:00