Eric Anholt
cfa778af9c
Merge from bsd-4-0-0-branch.
2003-02-21 23:23:09 +00:00
Michel Daenzer
b88cc5da26
disable strict aliasing for building the DRM
2003-02-04 19:28:52 +00:00
Michel Daenzer
c7d471b6ae
don't inflate relative vblank sequence numbers on repeated calls (e.g. when
...
interrupted by a signal)
2003-02-02 03:06:47 +00:00
Michel Daenzer
826aad0aba
limit number of pending vblank signals to 100 to prevent DoS, and minor
...
cleanups
2003-01-11 20:58:20 +00:00
David Dawes
05f761fa4f
enums should be ints
2002-12-12 22:20:30 +00:00
Keith Whitwell
786228bd26
bring in jantorial changes from 2.5.51
2002-12-12 16:45:31 +00:00
Keith Whitwell
fd621fd4a0
remove agpgart informational
2002-12-11 13:40:27 +00:00
Michel Daenzer
85025d4f2a
further vertical blank interrupt cleanups: remove unused variable,
...
non-ambiguous variable names, don't express subtraction in
unnecessarily complicated ways
2002-12-04 15:39:53 +00:00
Michel Daenzer
4acba63bb7
vertical blank interrupt cleanups: use spinlock instead of semaphore, send
...
signal directly from interrupt handler instead of using a taskqueue
(based on feedback by Linus Torvalds)
2002-12-03 00:43:47 +00:00
Michel Daenzer
40891ac190
vertical blank ioctl can send signal instead of blocking
2002-11-30 14:24:07 +00:00
Eric Anholt
e656655a36
Kernel support for vblank syncing on Rage 128 and Matrox.
2002-10-30 06:10:34 +00:00
Jens Owen
344c7f6b41
updated e-mail addresses for Keith, Alan and Jens
2002-10-29 20:29:05 +00:00
Michel Daenzer
5e1b8ed88a
preserve CRTC{,2}_OFFSET_CNTL in 2D driver to avoid bad effects when
...
pageflipping after a mode switch
take current page into account in AdjustFrame(); writing the CRTC offset
via the CP was probably a bad idea as this can happen asynchronously,
reverted
take frame offset into account when flipping pages
handle CRTC2 as well for pageflipping (untested)
preserve GEN_INT_CNTL on mode switches to prevent interrupts from getting
disabled
2002-10-29 13:49:26 +00:00
Alan Hourihane
b3a20ce219
final part of XFree86 4.2.99.2 merge
2002-10-22 23:38:53 +00:00
Alan Hourihane
ff4baa69da
Import of XFree86 4.2.99.2
2002-10-22 13:43:45 +00:00
Brian Paul
2af90a581d
replaced max() macro with conditional expression
2002-10-09 16:29:01 +00:00
Keith Whitwell
aa1ca406d6
Fix error condition...
2002-10-08 08:32:06 +00:00
Keith Whitwell
a653224403
Call pci_enable_device() in DRM(irq_busid).
2002-10-08 08:29:47 +00:00
Keith Whitwell
9243e642da
Move os-dependent stuff out of radeon_irq.c
2002-09-29 21:19:01 +00:00
Michel Daenzer
ec48dfa835
add support for 16K and 64K page sizes (Bjorn Helgaas)
2002-09-29 00:12:28 +00:00
Michel Daenzer
cc9a169d08
DRM(vblank_wait) is driver specific
2002-09-26 12:49:18 +00:00
Michel Daenzer
55acd0d5a6
common ioctl to wait for vertical blank IRQs
2002-09-25 17:18:19 +00:00
Keith Whitwell
f1c8fe9557
merged r200-0-2-branch to trunk
2002-09-23 17:26:43 +00:00
Michel Daenzer
cfa1a918b6
make sure we never oops because the hardware lock pointer in the sigdata
...
structure is out of date
2002-09-21 23:18:54 +00:00
David Dawes
c4318a5c64
- Fix various bugs in the DRI support for the i830 and i845G (Keith
...
Whitwell).
- Major rework of the 2D i830/i845G support, including:
- Improve VESA mode selection, and fix refresh rate selection.
- Don't duplicate functions provided in the vbe modules.
- Don't duplicate functions provided in the vgahw module.
- Rewrite memory allocation.
- Rewrite initialisation and save/restore state handling.
- Decouple the i810 support from i830 and later.
- Remove various unnecessary hacks and workarounds.
- Fix an 845G problem with the ring buffer not in pre-allocated memory.
- Fix screen blanking.
- Fix some HW cursor glitches, and turn HW cursor off at VT switch and
exit.
- Don't attempt to use the i830's function 1 entity.
- Fix problems with option handling. (David Dawes).
- Add mode VBE-aware mode handling functions to the vbe module (David
Dawes).
2002-09-11 00:57:49 +00:00
Keith Whitwell
4fcde1efc1
standardize use of __FUNCTION__ (Linus)
2002-08-29 07:34:49 +00:00
Leif Delgass
a697941d4c
Don't (re)define vmalloc_to_page for kernel >= 2.4.19, as it has been
...
backported from 2.5.x. Also fix a couple of incorrect
LINUX_VERSION_CODE tests and fix header dependency for r128, radeon
when building without AGP.
2002-08-22 19:35:31 +00:00
Leif Delgass
2febcafd66
SetPageLocked only defined in 2.5.x (x=?), use LockPage for 2.4.x (x>=9).
...
Also apply build fixes from i810_dma.c to i830_dma.c
2002-08-22 18:43:39 +00:00
Jose Fonseca
18d3fac990
Change the linux kernel version condition in the i810 driver (according to
...
Alan Cox)
2002-08-21 14:09:28 +00:00
Leif Delgass
8eedac5833
add missing include (for udelay), remove unused counter.
2002-08-21 01:14:43 +00:00
Rik Faith
977b420d5d
Updates from Rusty Russell to:
...
1) Remove redundant header inclusion
2) Silence bitop on non-long argument warnings (change int to long)
3) Move to ISO C (gcc 2.6) initializers (accepted by older gccs also) All
of these are syntax changes that should not impact functionality.
2002-08-06 18:00:57 +00:00
Alan Hourihane
74ef13fd00
merged bsd-3-0-0-branch
2002-07-05 08:31:11 +00:00
Keith Whitwell
24025ca5f7
Fix some more pageflipping issues -- existing code was doing MMIO writes
...
while ring was active. There is still an MMIO read in there, but I
haven't seen any lockups that could be attributed to it.
2002-07-04 12:03:15 +00:00
Keith Whitwell
ca81e1334e
Revert SET_SCISSORS change.
2002-07-04 11:55:44 +00:00
Tim Smith
cc45cc0609
Fix lockup on faster machines when drawing in multiple clip rectangles
...
(e.g. when part of a 3D window is obscured by another window)
2002-07-02 21:34:25 +00:00
Keith Whitwell
bb91bc0879
Set pfCurrentPage on cleanup_pageflip
2002-06-27 17:56:39 +00:00
Alan Hourihane
8aecdbea76
gamma_alloc -> DRM(alloc)
2002-06-25 12:13:20 +00:00
Michel Daenzer
063d0a30c2
endianness fixes
2002-06-18 22:40:26 +00:00
Keith Whitwell
2dcada361d
merged tcl-0-0-branch
2002-06-12 15:50:28 +00:00
Michel Daenzer
5676a2a610
fixes for big endian in general and powerpc in particular
2002-06-02 16:00:45 +00:00
Jeff Hartmann
6ac48cddd0
Import Mesa 4.0 port of I830M/I845G 3D driver funded by 2d3d. Import
...
Lastest i810 ddx driver changes from XFree86 CVS to support the I845G.
Fixup warnings in I830M kernel driver.
-Jeff
2002-05-29 21:21:50 +00:00
Alan Hourihane
cd37583281
Remove some older Linux 2.3.99 code
2002-05-17 08:35:47 +00:00
Alan Hourihane
91d7b17e82
same udelay fixes
2002-05-17 08:21:34 +00:00
Keith Whitwell
9e67da5626
Allow drm to build under 2.4 and 2.5(.14)
2002-05-16 23:47:15 +00:00
Jens Owen
3903e5ac94
Merged drmcommand-0-0-1
2002-04-09 21:54:56 +00:00
Keith Whitwell
baef086c32
Fix backwards compatibility bug, add tests for good numbers of
...
vertices/prim.
2002-03-08 16:03:37 +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
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
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
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
Brian Paul
b1488c2f87
include linux/sisfb.h, per David Gaarenstroom
2001-04-21 19:06:46 +00:00
Kevin E Martin
6f5e397f25
- Fix typo and remove magic numbers
2001-04-16 21:43:28 +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
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
David Dawes
86c41620a5
merge/build fix
2001-03-19 23:48:35 +00:00
David Dawes
404a409ab3
Initial XFree86 4.0.99.1 merge.
2001-03-19 21:39:36 +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
d15f984432
Try this...
2001-03-19 11:49:25 +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
0b60aad8a5
Try that again...
2001-03-12 18:18:06 +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
Gareth Hughes
9a4033a02a
Make the hardware bug workaround configurable. That way, people with newer
...
revs of the chipset can avoid the copy when it's not needed.
2001-02-28 14:11:05 +00:00
Gareth Hughes
7b5e87d91d
Please try this if you experience lockups...
2001-02-28 11:22:52 +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
Rik Faith
c4a247d262
Add Linux 2.2.x support for stubs
2001-02-21 16:06:10 +00:00
Jeff Hartmann
43f1a52a56
Fix some warnings and flush pixel cache in idle routine so readpixels works
...
correctly
2001-02-20 20:16:56 +00:00
Gareth Hughes
62aa46ccec
Disable DRIVER_DMA_QUIESCENT() in r128, radeon drivers. Prevents deadlock
...
in the locking process when the engine isn't idle.
2001-02-20 13:44:45 +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
5f67507e65
Fix depth clears properly this time. Update all instances of
...
drmRadeonClear() to the new interface.
2001-01-28 07:18:08 +00:00
Gareth Hughes
a68dddf19c
Client-side updates for drmRadeonClear(...), fixes color/depth buffer
...
clears.
2001-01-26 07:52:36 +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
Jeff Hartmann
9116644366
Fixed problem preventing compile on system w/o agpgart.
2001-01-18 18:21:05 +00:00
Gareth Hughes
4c3f3de819
Remove debug messages.
2001-01-13 01:33:00 +00:00
Keith Whitwell
33e8dcf7e9
Makefile.linux was checking $(MACHINE) for 'i386' before building the
...
i810.o module. However on my i810's, $(MACHINE) is 'i686'.
2001-01-11 20:05:39 +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
Keith Whitwell
c7c6156aec
add blit ioctl, fix plnwt handling
2000-12-30 23:28:53 +00:00
Gareth Hughes
b19c44e4fe
Update date information.
2000-12-15 01:15:57 +00:00
Gareth Hughes
8725828cf0
- Fix nasty depth span bug. Drawable offset was not being added to pixel
...
coords.
- Remove unneeded mask parameters from clear ioctl.
- Use correct subpixel offsets, fixes most glean bugs.
- Remove 32-bit depth buffer support. Only use 16 or 24-bit depth buffers.
2000-12-12 14:50:50 +00:00
Gareth Hughes
e15a24e154
Merged ati-4-1-1-branch into trunk.
2000-12-02 06:14:18 +00:00
David Dawes
33fd00485f
Import of XFree86 4.0.1f
2000-11-30 17:32:23 +00:00
Jeff Hartmann
960f13cdf4
Integrated bug fix from David S. Miller (a wait queue removal bug)
2000-11-21 16:18:47 +00:00
Rik Faith
679531e166
Sync with Linux 2.4.0-test11-pre5 Provide backward compatibility tested
...
against 2.2.18pre21
As usual, since all 2.4.0-test* kernels set LINUX_VERSION_CODE to the same
value, if you are running a 2.4.0-test kernel, you MUST be running
2.4.0-test11-pre4 or later (although anything after 2.4.0-test11-pre1
should work fine -- I tested with pre4/pre5). I expect 2.2.x support to
continue to work for all recent kernels, but I tested with 2.2.18pre21
-- we use the old intermodule symbol communication for 2.2.x kernels,
so they should all continue to work.
2000-11-15 15:47:51 +00:00
Rik Faith
0636342ef8
Move .c to .h file
2000-11-14 21:35:00 +00:00
Rik Faith
006458f227
Split agpsupport.c into pre-2.4.0 version and current version.
2000-11-10 18:27:33 +00:00
David Dawes
94071289a4
merge with 4.0.1d
2000-11-08 00:07:17 +00:00
David Dawes
5745cb7fa7
Import of XFree86 4.0.1d
2000-11-07 22:10:46 +00:00
Jeff Hartmann
37d6828fef
Added multitexture fix to the mga drm driver
2000-11-01 19:00:45 +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
Jeff Hartmann
b0a7efb5a9
Use PG_reserved for things we remap non-cached
2000-09-28 23:04:57 +00:00
Jeff Hartmann
ed2d0b4bb0
Fixed two things Rik pointed out in the last commit
2000-09-28 15:09:39 +00:00
Jeff Hartmann
550dff98b0
Merged the mga-lock-debug-0-2-0-branch with the trunk. This includes
...
several fixes including: (Jeff) Really disable multitexture (Broken
since Mesa 3.4 integration.)
(Jeff) Various changes in mga_state.c in the kernel module, which includes
a fix to the bug where the first OGL application hangs the machine
w/out rendering anything. This also includes defines for the warp
registers so they are easily human readable.
(Rik and Jeff) Fixed all the schedule loops in the kernel to look like they
are supposed too.
(Jeff) Configurable agp modes: Add the option "AGPMode2x" or "AGPMode4x" to
your XF86Config file.
(Rik) Various cleanups to the mga kernel driver to make it easier to read
and debug.
(Rik) Removed alot of DRM_DEBUG statements from the kernel driver.
2000-09-27 21:32:19 +00:00
Alan Hourihane
c7558d8fa4
commit xfree86 4.0.1d-pre update
2000-09-24 09:34:10 +00:00
Alan Hourihane
b1aa228f7d
Import of XFree86 4.0.1d-pre (2)
2000-09-23 21:25:26 +00:00
Alan Hourihane
881683873e
Import of XFree86 4.0.1d-pre
2000-09-22 18:14:54 +00:00
Rik Faith
de842ea5db
Make management of current->state more correct.
2000-09-19 19:41:07 +00:00
Rik Faith
01346c98b1
Make management of current->state correct (accidentally made incorrect when
...
fixing the trispd bug).
2000-09-19 19:24:28 +00:00
Gareth Hughes
e2a16e1906
Correct sync with 2.4.0-test9-pre4 kernel.
2000-09-19 18:24:09 +00:00
Gareth Hughes
9c8e1adfac
Sync with 2.4.0-test9-pre4 kernel.
2000-09-19 18:14:16 +00:00
Alan Hourihane
dc6b57bf22
axp cast fix.
2000-09-14 14:48:44 +00:00
Rik Faith
f850c1bd06
Remove debugging statement from production code.
2000-09-13 15:02:35 +00:00
Rik Faith
1f8651163a
Fix for [Bug #112247 ] Hard MGA lock with trispd -size 50000
2000-09-13 15:00:09 +00:00
Gareth Hughes
bda40b4146
Sync with 2.4.0-test8 kernel.
2000-09-10 04:59:05 +00:00
Gareth Hughes
5f2cfc5bd8
Merge of tdfx branch undid the changes from the 2.4.0-test8-pre5 kernel
...
sync, so apply them again.
2000-09-07 20:42:32 +00:00
Alan Hourihane
f1bb3c5f5f
Merged tdfx-2-1-branch
2000-09-07 12:40:41 +00:00
Gareth Hughes
7db6449142
Sync with 2.4.0-test8-pre5 kernel.
2000-09-06 20:56:34 +00:00
Keith Whitwell
e3e2d66131
Bump version number after kernel interface change.
2000-08-31 15:32:10 +00:00
Rik Faith
433408db2e
Pre Linux 2.4.0 compatibility header file
2000-08-31 10:10:03 +00:00
Keith Whitwell
926349534d
Initialize vertsize correctly. Add planemask arguments for color and depth
...
stencil clearing.
2000-08-30 22:34:28 +00:00
Rik Faith
32cebaf750
Add compatibility header file to make Linux 2.4.0 kernel patches cleaner.
2000-08-28 19:50:52 +00:00
Rik Faith
6f07e1ff6b
Sync with Linux 2.4.0-test7 Add signal blocking support to all drivers
...
(using control-z on a running direct-rendering client should work now)
2000-08-26 10:36:44 +00:00
Rik Faith
37643234af
Apply patch from Alan Hourihane to temporarily allow compilation on Alpha
...
(the driver has not been tested on Alpha -- this just makes it compile)
2000-08-25 12:49:18 +00:00
Rik Faith
ac3c3571a7
Remove misleading authorship information from sis driver (author has been
...
contacted and will provide improved information later) Rename
sis_drm_public.h to sis_drm.h to be consistent with the other drivers.
2000-08-25 12:45:53 +00:00
Rik Faith
68f6795ef4
Improve detection of kill_fasync parameter count Make compilation of sis.o
...
depend on CONFIG_FB_SIS
2000-08-25 12:44:44 +00:00
Keith Whitwell
fb3939c1a5
Bug fixes for 32bpp rendering (still disabled)
2000-08-20 18:16:49 +00:00
Jeff Hartmann
e30361416b
Possible fix for trispd bug
2000-08-18 19:03:19 +00:00
Rik Faith
364d44a24c
Fix ABA problem in drm_freelist_{put,try}
2000-08-18 18:57:56 +00:00
Rik Faith
f0f6509a72
Sync with Linux 2.4.0-test7/pre4
2000-08-18 13:55:23 +00:00
Rik Faith
f75ec3010a
Bug #112196 : auth.c uses semaphores while holding spinlocks Make spinlocked
...
region smaller to avoid semaphore.
2000-08-17 20:26:11 +00:00
Rik Faith
761ffd63f3
Bug #112197 Made sis driver compile under 2.4.0-test7/pre4
2000-08-17 20:20:33 +00:00
Jeff Hartmann
3e42514360
Fix for bug #111744 which caused any application to never render and dma to
...
stall on certain mga cards
2000-08-16 21:13:24 +00:00
David Dawes
cba4d3504c
first part of 4.0.1b merge
2000-08-16 18:29:06 +00:00
David Dawes
1df8afa8ff
Initial revision
2000-08-16 17:23:02 +00:00
Rik Faith
8b9363d1b1
Sync with Linux 2.4.0-test6-pre8
2000-08-08 16:04:21 +00:00
Jeff Hartmann
9199075a6a
Fix for multiple sarea bug + agp built into kernel segfault
2000-08-07 16:55:10 +00:00
Rik Faith
f3ae6786f8
Sync with Linux 2.4.0-test6-pre2
2000-08-04 10:04:55 +00:00
Rik Faith
bcad118182
Fix typo
2000-07-22 01:08:00 +00:00
Rik Faith
1e54e55431
Move to new, denser, easier-to-read Linux kernel Makefile format
2000-07-22 01:04:22 +00:00
Rik Faith
3bcc55a74d
Revert some changes and try alternative way to clean up AGP handling.
2000-07-21 18:28:01 +00:00
Rik Faith
6dd96a15ed
Revert some changes and try alternative way to clean up AGP handling.
2000-07-21 16:57:00 +00:00
Rik Faith
e38b34e54a
Fixes for building in the kernel tree
2000-07-21 15:48:24 +00:00
Rik Faith
81da79d1ed
Changes to make AGP optional for in-kernel builds
2000-07-21 14:20:57 +00:00
Rik Faith
6d1ce8fe77
kfree_s was deprecated in 2.4.0-test?
2000-07-20 20:21:10 +00:00
Rik Faith
b4722ec943
More fixups for kernel build: EXPORT_SYMTAB warning removal
...
put_module_symbol clean up of tdfx tdfx_cleanup routine Makefile.kernel
fix
2000-07-20 05:17:49 +00:00
Rik Faith
0bd1fa795a
Fixes for building in the kernel tree
2000-07-20 01:52:00 +00:00
Rik Faith
e8c9ed03f8
Fixed for monolithic kernel build
2000-07-20 01:14:58 +00:00
Rik Faith
742c33bf61
Fix signature for *_options function
2000-07-20 00:59:40 +00:00
Rik Faith
c459c9ead3
Added support for building as modules or as part of monolithic kernel
2000-07-20 00:48:12 +00:00
Rik Faith
1d3c4d2ed2
Bump driver dates and add descriptions
2000-07-19 20:59:35 +00:00
Rik Faith
ee9514b63b
Allow SAREA > 1 page in size
2000-07-19 20:41:51 +00:00
Rik Faith
aed8549e91
Sync with Linux 2.4.0-test4 kernel
2000-07-19 18:38:41 +00:00
Brian Paul
7b888f87fa
applied Jeff's xf86cvs-I810copy.patch
2000-07-13 18:47:48 +00:00
Alan Hourihane
8751b6774d
Merge XFree86 4.0.1
2000-07-11 11:41:07 +00:00
Alan Hourihane
8bc39d01ca
Import of XFree86 4.0.1
2000-07-10 21:32:06 +00:00
Gareth Hughes
62838b948c
Fix for agpgart module detection. If the kernel module has been configured
...
to use AGP, and the module is not present, fail gracefully instead of
doing evil things.
2000-07-01 01:50:00 +00:00
Gareth Hughes
dc2701a9f6
Update register definitions to match r128_reg.h
2000-06-23 17:14:20 +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
Rik Faith
1c8b2b5e06
Update email addresses and copyright notices to reflect VA Linux Systems
2000-06-13 14:22:03 +00:00
Gareth Hughes
d5348efe25
Merging the ati-4-1-0 branch onto the trunk.
2000-06-12 15:47:31 +00:00
Daryll Strauss
ea425f532f
Merged the tdfx-2-0 branch onto the trunk
2000-06-12 02:33:12 +00:00
Alan Hourihane
7d88040f52
Fix define of PCI_DEVICE_ID_3DLABS_GAMMA when not available in the kernel
...
includes.
2000-06-09 15:14:51 +00:00
Brian Paul
0dc99dc4b9
don't draw if window is unmapped, other updates (Jeff Hartmann)
2000-06-08 17:13:48 +00:00
Brian Paul
569da5a42e
Merged glxmisc-3-0-0
2000-06-08 14:38:22 +00:00
Brian Paul
5ce0f2afec
define VM_DONTCOPY to zero if undefined
2000-06-06 22:51:29 +00:00
Alan Hourihane
909085a008
Include new updated gamma support.
2000-06-05 00:42:21 +00:00
Doug Rabson
fa0a35a25f
Merged bsd-1-0-0
2000-05-30 17:13:31 +00:00
Gareth Hughes
50996ec9ba
Fixed WARP pipe hangs in Quake 3. Fullscreen or window at (0,0) seems to
...
work fine now, but an offset window still hangs in the same places as
before.
2000-05-26 23:24:54 +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
Daryll Strauss
42f526b5ca
Only enable DRI for 16bpp mode. Allow GL_BLEND if color is 0,0,0,1 Wrap
...
grTexLodBiasValue call Link math library into libGL Recognize Napalm
boards Allow CLUT/gamma changes Make driver compile on 2.2.14 kernel
2000-04-09 17:29:28 +00:00
Jeff Hartmann
1dcfddf915
Fixed reclaim Oops
2000-04-05 18:48:23 +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
Kevin E Martin
7a9b291ab5
Import of XFree86 3.9.18
2000-02-22 15:43:59 +00:00
Jeff Hartmann
9fcbf05c44
Fixed freelist_put bug
2000-01-28 02:11:01 +00:00
Rik Faith
d545384a2b
Try a more complex (and more correct?) method for finding kernel inlcude
...
files
2000-01-17 10:27:29 +00:00
Daryll Strauss
fb0ace84a9
Remove -g from build Fix lost code from tdfx-1-1 merge in tdfx_priv.c Lower
...
the minimum required fifo size Fix the kernel tree detection in the
Makefile
2000-01-15 18:25:07 +00:00
Rik Faith
9a838857e1
Add new code to do SMP/MODVERSIONS detection for more distributions
2000-01-13 15:03:41 +00:00
Daryll Strauss
aa724a52b9
Add a drm_poll function to the tdfx driver. This fixes the problem with
...
3.9.17 where the server hangs when the mouse is first moved.
2000-01-12 21:47:44 +00:00
Rik Faith
1c33c69095
Import of XFree86 3.9.17
2000-01-06 12:55:00 +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
Rik Faith
b03b238dfc
Sync with Linux 2.3.30
1999-12-08 19:20:20 +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