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