Commit graph

2259 commits

Author SHA1 Message Date
Jeff Hartmann
b6923b3953 Update to the code I sent Linus and Alan this morning. Added some missing
agp chipsets to drm_agpsupport.h, redid the card detection common code
    to use a structure (avoids endian porting issues), changed the tdfx
    driver to use the kernel pci id '#defines'
2001-08-08 16:10:47 +00:00
Jeff Hartmann
938a637d1f Avoid compiler warning about r_list being used uninitialized. 2001-08-07 18:22:41 +00:00
Jeff Hartmann
51e38d96ea Lots of DRM fixes: added new pieces of template code so the ffb driver can
be ported, rolled back r128 and i810 version bumps so 4.1.0 works with
    cvs kernel modules, added Config.in and updated Makefile.kernel,
    incorporated lots of drm fixes inspired by patches sent by Redhat, made
    DRM(realloc) usage check for NULL allocations, restructure driver init
    routines to export dev_priv only when initialized and to check for all
    error conditions.
2001-08-07 18:15:10 +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
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
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
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
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
Alan Hourihane
94c6d951a2 Make SiS driver compile with the new templated format. Not tested. minor
cleanups
2001-05-03 14:51:01 +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
David Dawes
1759c16ab9 Import -f XFree86 4.0.99.2 2001-04-09 16:27:54 +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
Alan Hourihane
e407c2f5a6 merge in 2.4.3 kernel change. 2001-03-30 13:32:39 +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
David Dawes
0e5b8d77cf Import of XFree86 4.0.99.1 2001-03-19 17:45:52 +00:00
Gareth Hughes
b42ff4f660 Update version, date stamp. 2001-03-19 12:16:24 +00:00
Gareth Hughes
9914f4cf60 Remove PRIMPTR completely. 2001-03-19 12:04:12 +00:00
Gareth Hughes
f2ad4d9beb __REALLY_HAVE_MTRR, vmalloc_32 fixes from Jeff Wiedemeier. 2001-03-18 23:54:41 +00:00
Kevin E Martin
74e19a4018 Merged sarea-1-0-0 2001-03-14 22:22:50 +00:00
Gareth Hughes
134aecdeed Fix ring space calculations, tests. Based on patch by Bruce Stockwell. 2001-03-08 00:21:33 +00:00
Gareth Hughes
8c511c60ec Change error message to debug message when client dies while holding the
lock. Should prevent bug reports about this, but you never know...
2001-03-07 15:06:57 +00:00
Alan Hourihane
07f761bfae surround agp calls in drm_memory with __REALLY_HAVE_AGP instead of
CONFIG_... remove include for agpsupport in tdfx_drv.c - not needed.
2001-03-07 08:53:15 +00:00
Gareth Hughes
3a74d3a371 Merge tdfx-3-1-0 branch. 2001-03-06 04:37:37 +00:00
Alan Hourihane
971c2f8ad5 allow dristat to find out whether AGP is write-combined or not. 2001-03-05 16:02:40 +00:00
Alan Hourihane
d1774bb44c fix that last patch to initialize the MTRR when AGP available. 2001-03-05 15:52:11 +00:00
Alan Hourihane
8d3f3f4f9b Don't try and setup the MTRR for AGP when AGP not available. Check
dev->agp, when agp_acquire called, and..... Uncomment MUST_HAVE_AGP
    around agp_* calls, so that support for both agp/pci can happen in a
    single kernel driver.
2001-03-04 19:19:20 +00:00
Rik Faith
c4a247d262 Add Linux 2.2.x support for stubs 2001-02-21 16:06:10 +00:00
Gareth Hughes
01a14789ed - Clean up the way customization of the templates is done.
- Fix old-style DMA for gamma driver (please test).
- Pull out IRQ handling into drm_dma.h (please test on i810, gamma).
- Lots of general cleanups, remove compiler warnings etc.
2001-02-16 05:24:06 +00:00
Keith Whitwell
1d30ac1140 Added missing include "drm_lists.h".
i810 now working fine with new kernel module.
2001-02-15 16:31:11 +00:00
Gareth Hughes
f2f5bf6f5f - Fix up merge.
- Update date stamps.
2001-02-15 10:26:03 +00:00
Gareth Hughes
360475376c Merge mga-1-0-0-branch into trunk. 2001-02-15 08:12:14 +00:00
Gareth Hughes
82b645dc74 Corresponding sync with PCI GART updates. 2001-01-29 17:46:23 +00:00
Gareth Hughes
4d2a4455b4 - Misc cleanups.
- Fix drmR128Clear parameters (Radeon to follow).
- Add some helper macros to r128/radeon kernel modules.
2001-01-24 15:34:46 +00:00
Nathan Hand
61c15f4a2d Merged tdfx-3-0-0 2001-01-08 16:21:42 +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