Gareth Hughes
4baa68b75e
Remove redundant files.
2001-03-06 03:04:37 +00:00
Gareth Hughes
bd55d08867
Revert changes.
2001-03-06 02:25:22 +00:00
Gareth Hughes
91767f33a8
Merge trunk into branch (again).
2001-03-05 17:32:54 +00:00
Gareth Hughes
0033505c6d
Merge trunk into branch.
2001-02-28 18:10:08 +00:00
Gareth Hughes
13e8184e64
Checkpoint commit before blit coordinate space change. This is to allow
...
optimized TexSubImage updates. Everything else works...
2001-02-26 16:06:55 +00:00
Gareth Hughes
d6804a3e8c
Almost done... Regular and whacky blits are mostly working (second-smallest
...
mipmap on 'fire' a noticable exception). Still need to change the way
the blit coords are calculated to allow fast TexSubImage updates.
Texture alpha state bug needs fixing.
2001-02-25 15:21:15 +00:00
Gareth Hughes
4da5886063
Remove old files.
2001-02-16 05:44:04 +00:00
Gareth Hughes
5f14d67426
Grab latest trunk code.
2001-02-16 05:42:27 +00:00
Gareth Hughes
390e8d933c
Pull templated DRM code from trunk for Radeon texture upload work.
2001-02-15 15:00: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