Commit graph

224 commits

Author SHA1 Message Date
Keith Whitwell
b04e5d204d merged trunk 2002-06-12 13:43:31 +00:00
Keith Whitwell
94b1d73a62 merge checkpoint 2002-06-12 11:34:40 +00:00
Keith Whitwell
a01b578b3b Belatedly remove bogus fix. The real problem was an incorrect register id
in radeon_reg.h, which didn't actually effect anything.
2002-06-10 11:01:57 +00:00
Keith Whitwell
b0894da3a4 Fix embarrasing dyslexia problem in layout of allowed register packets.
Thought two registers were contiguous, but they weren't. I wonder if
    this will fix any random bugs out there.
2002-05-30 09:02:31 +00:00
Keith Whitwell
a4967c0cad Remove dead vars. 2002-05-28 16:30:07 +00:00
Keith Whitwell
57d12ccf92 Remove loop from OUT_RING_USER_TABLE. Add COMMIT_RING() to ring-full case
in BEGIN_RING().
2002-05-28 16:29:36 +00:00
Keith Whitwell
c5984756f2 Minor optimizations -- write ring regs less often, __copy_from_user where
possible instead of __get_user.
2002-05-28 07:50:30 +00:00
Jens Owen
52b6333ee6 updated Radeon driver date string 2002-05-21 22:50:41 +00:00
Keith Whitwell
4b7d1a99ce OS support for radeon pageflipping. 2002-05-21 17:25:09 +00:00
Alan Hourihane
9c2285a4d1 remove some older Linux 2.3.99 code 2002-05-17 08:35:39 +00:00
Alan Hourihane
4a86c817f8 change loops that get optimized out by gcc to udelay, avoids lockups (Mike
A. Harris)
2002-05-17 08:16:01 +00:00
Keith Whitwell
951b44b4b9 2.5 compatibility 2002-05-17 00:00:56 +00:00
Keith Whitwell
234bd22bcf back out changes 2002-05-03 20:51:04 +00:00
Keith Whitwell
40a08a7e6d don't wait in radeon_freelist_get 2002-05-02 13:31:43 +00:00
Jens Owen
ff44b25041 bump date string in Radeon DRM driver. 2002-04-08 16:12:20 +00:00
Jens Owen
14bd58e99d updated Radeon DRM driver date string, and added interface history comment
to version 1.3 to reflect Keith's new Radeon packet handling.
2002-03-26 18:34:28 +00:00
Keith Whitwell
d6c8a56c2a support for new radeon packets 2002-03-25 10:29:12 +00:00
Keith Whitwell
9eef7a1c13 fix depth clears on radeon 7500 + tcl 2002-03-12 12:04:46 +00:00
Keith Whitwell
62ba1e3537 Fix another backwards compatibility bug. Clean up some tests. 2002-03-08 16:02:30 +00:00
Keith Whitwell
84159540da fix sense of verify_area test 2002-03-06 17:02:07 +00:00
Keith Whitwell
d0107d43f0 cleanup kernel code 2002-03-06 16:48:27 +00:00
Keith Whitwell
000563ce4e fix bc for multitex state 2002-03-05 18:00:17 +00:00
Keith Whitwell
36f6fb67f4 Fix backwards compatibility on tcl branch. Add checks on number of vertices
per primitive.
2002-02-22 20:01:09 +00:00
Keith Whitwell
ccc1b6edec add cmdbuffer ioctl 2002-02-20 04:53:55 +00:00
Keith Whitwell
c07c1fefe8 Dump of tcl changes 2002-02-20 01:22:36 +00:00
David Dawes
ab87c5d0d1 First pass of mesa-4-0 branch merge into trunk. 2002-02-14 02:00:26 +00:00
Michel Daenzer
65d25572de wrapper for ioremap_nocache() like for ioremap() (Paul Mundt) 2002-02-02 17:03:51 +00:00
David Dawes
44aa4d6297 First pass merge of XFree86 4.2.0 import. 2002-01-27 20:05:42 +00:00
David Dawes
14945ada16 Import of XFree86 4.2.0 2002-01-27 18:23:04 +00:00
David Dawes
16bd14926e Initial revision 2002-01-27 18:23:04 +00:00
Alan Hourihane
f18a6d836b merge with linux kernel 2.4.15 2001-12-10 23:29:37 +00:00
Keith Whitwell
727abee235 Put back i810 major version number (same reasons as for r128) 2001-11-27 11:43:12 +00:00
Keith Whitwell
13e11e1f94 Put drm version back from 3.0 to 2.2; XFree86 4.1 is the baseline for
versioning information.
2001-11-26 13:28:38 +00:00
Alan Hourihane
05fb3e93f2 wrap the MODULE_LICENSE definition. 2001-11-02 17:40:11 +00:00
Alan Hourihane
92ad1b60e1 merge kernel 2.4.13-pre6. 2001-10-22 19:15:04 +00:00
Alan Hourihane
bdd84e8958 commit Abraham vd Merwe fix. 2001-10-08 12:58:20 +00:00
Alan Hourihane
ca820fca87 merge with 2.4.10 kernel 2001-09-25 09:32:16 +00:00
Alan Hourihane
390440c939 remove Linux 2.3.x cruft. 2001-09-18 11:00:23 +00:00
Alan Hourihane
b1c44c8ac1 bumped the DRM versions (already done in ddx and client side drivers). 2001-09-17 21:12:10 +00:00
Alan Hourihane
2fabe80827 Use CCE for 2D acceleration (Gerd Knorr) 2001-09-17 10:30:17 +00:00
David Dawes
2f060f44e0 Import of XFree86 4.1.99.1 2001-08-22 18:00:47 +00:00
Alan Hourihane
f4c2f14002 No one's maintaining 2.2.x support - so remove all the cruft. 2001-08-19 15:20:08 +00:00
Jeff Hartmann
8aaf82d45c A few warning fixes when actually building under 2.4.9-pre2 + some
reformating
2001-08-14 00:35:07 +00:00
Jeff Hartmann
aa09e36114 Sync with Linus 2.4.9-pre2 + make all nopage routines more alike 2001-08-13 23:23:47 +00:00
Alan Hourihane
2d4b2cf6f6 new multihead code was missing Voodoo3 2000 and Voodoo4 support. 2001-08-11 15:48:00 +00:00
Jeff Hartmann
97b8aa52bb Commit Keith Owens kernel Makefile changes, merge and commit alpha patch
set from Jay Estabrook (sans some mga modifications which broke other
    arch's.)
2001-08-10 16:29:21 +00:00
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