1759c16ab9
Import -f XFree86 4.0.99.2
2001-04-09 16:27:54 +00:00
0e7f6c0726
- Fix typo
...
- Clean up some macros
2001-04-06 17:53:32 +00:00
908d32f84c
search /lib/modules/<version>/build/include first, then the others....
2001-04-06 15:49:42 +00:00
2bd9bf98c7
Handle drivers that don't have __HAVE_SG defined.
2001-04-06 08:39:02 +00:00
5d6ddbca26
Merged ati-pcigart-1-0-0
2001-04-05 22:16:12 +00:00
a15b9dec3c
include 2.4.2
2001-04-03 08:01:00 +00:00
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
62d4931529
Update radeon DRM to v1.1.0 (texture upload changes).
2001-04-02 01:17:18 +00:00
e407c2f5a6
merge in 2.4.3 kernel change.
2001-03-30 13:32:39 +00:00
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
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
b90028231c
Remove compiler warnings, minor cleanups.
2001-03-21 03:29:23 +00:00
86c41620a5
merge/build fix
2001-03-19 23:48:35 +00:00
404a409ab3
Initial XFree86 4.0.99.1 merge.
2001-03-19 21:39:36 +00:00
0e5b8d77cf
Import of XFree86 4.0.99.1
2001-03-19 17:45:52 +00:00
b42ff4f660
Update version, date stamp.
2001-03-19 12:16:24 +00:00
9914f4cf60
Remove PRIMPTR completely.
2001-03-19 12:04:12 +00:00
d15f984432
Try this...
2001-03-19 11:49:25 +00:00
f2ad4d9beb
__REALLY_HAVE_MTRR, vmalloc_32 fixes from Jeff Wiedemeier.
2001-03-18 23:54:41 +00:00
74e19a4018
Merged sarea-1-0-0
2001-03-14 22:22:50 +00:00
0b60aad8a5
Try that again...
2001-03-12 18:18:06 +00:00
134aecdeed
Fix ring space calculations, tests. Based on patch by Bruce Stockwell.
2001-03-08 00:21:33 +00:00
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
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
3a74d3a371
Merge tdfx-3-1-0 branch.
2001-03-06 04:37:37 +00:00
971c2f8ad5
allow dristat to find out whether AGP is write-combined or not.
2001-03-05 16:02:40 +00:00
d1774bb44c
fix that last patch to initialize the MTRR when AGP available.
2001-03-05 15:52:11 +00:00
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
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
7b5e87d91d
Please try this if you experience lockups...
2001-02-28 11:22:52 +00:00
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
c4a247d262
Add Linux 2.2.x support for stubs
2001-02-21 16:06:10 +00:00
43f1a52a56
Fix some warnings and flush pixel cache in idle routine so readpixels works
...
correctly
2001-02-20 20:16:56 +00:00
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
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
1d30ac1140
Added missing include "drm_lists.h".
...
i810 now working fine with new kernel module.
2001-02-15 16:31:11 +00:00
f2f5bf6f5f
- Fix up merge.
...
- Update date stamps.
2001-02-15 10:26:03 +00:00
360475376c
Merge mga-1-0-0-branch into trunk.
2001-02-15 08:12:14 +00:00
82b645dc74
Corresponding sync with PCI GART updates.
2001-01-29 17:46:23 +00:00
5f67507e65
Fix depth clears properly this time. Update all instances of
...
drmRadeonClear() to the new interface.
2001-01-28 07:18:08 +00:00
a68dddf19c
Client-side updates for drmRadeonClear(...), fixes color/depth buffer
...
clears.
2001-01-26 07:52:36 +00:00
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
9116644366
Fixed problem preventing compile on system w/o agpgart.
2001-01-18 18:21:05 +00:00
4c3f3de819
Remove debug messages.
2001-01-13 01:33:00 +00:00
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
61c15f4a2d
Merged tdfx-3-0-0
2001-01-08 16:21:42 +00:00
0994e635b2
Merged ati-5-0-0
2001-01-05 22:57:55 +00:00
833af23c5d
Sync with Linux 2.4.0-prerelease
2001-01-04 18:41:41 +00:00
c7c6156aec
add blit ioctl, fix plnwt handling
2000-12-30 23:28:53 +00:00
b19c44e4fe
Update date information.
2000-12-15 01:15:57 +00:00
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
e15a24e154
Merged ati-4-1-1-branch into trunk.
2000-12-02 06:14:18 +00:00
33fd00485f
Import of XFree86 4.0.1f
2000-11-30 17:32:23 +00:00
960f13cdf4
Integrated bug fix from David S. Miller (a wait queue removal bug)
2000-11-21 16:18:47 +00:00
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
0636342ef8
Move .c to .h file
2000-11-14 21:35:00 +00:00
006458f227
Split agpsupport.c into pre-2.4.0 version and current version.
2000-11-10 18:27:33 +00:00
94071289a4
merge with 4.0.1d
2000-11-08 00:07:17 +00:00
5745cb7fa7
Import of XFree86 4.0.1d
2000-11-07 22:10:46 +00:00
37d6828fef
Added multitexture fix to the mga drm driver
2000-11-01 19:00:45 +00:00
52f0bc3c9e
More changes for sync with Linux 2.4.0-test9-pre7
2000-09-29 02:05:41 +00:00
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
b0a7efb5a9
Use PG_reserved for things we remap non-cached
2000-09-28 23:04:57 +00:00
ed2d0b4bb0
Fixed two things Rik pointed out in the last commit
2000-09-28 15:09:39 +00:00
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
c7558d8fa4
commit xfree86 4.0.1d-pre update
2000-09-24 09:34:10 +00:00
b1aa228f7d
Import of XFree86 4.0.1d-pre (2)
2000-09-23 21:25:26 +00:00
881683873e
Import of XFree86 4.0.1d-pre
2000-09-22 18:14:54 +00:00
de842ea5db
Make management of current->state more correct.
2000-09-19 19:41:07 +00:00
01346c98b1
Make management of current->state correct (accidentally made incorrect when
...
fixing the trispd bug).
2000-09-19 19:24:28 +00:00
e2a16e1906
Correct sync with 2.4.0-test9-pre4 kernel.
2000-09-19 18:24:09 +00:00
9c8e1adfac
Sync with 2.4.0-test9-pre4 kernel.
2000-09-19 18:14:16 +00:00
dc6b57bf22
axp cast fix.
2000-09-14 14:48:44 +00:00
f850c1bd06
Remove debugging statement from production code.
2000-09-13 15:02:35 +00:00
1f8651163a
Fix for [Bug #112247 ] Hard MGA lock with trispd -size 50000
2000-09-13 15:00:09 +00:00
bda40b4146
Sync with 2.4.0-test8 kernel.
2000-09-10 04:59:05 +00:00
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
f1bb3c5f5f
Merged tdfx-2-1-branch
2000-09-07 12:40:41 +00:00
7db6449142
Sync with 2.4.0-test8-pre5 kernel.
2000-09-06 20:56:34 +00:00
e3e2d66131
Bump version number after kernel interface change.
2000-08-31 15:32:10 +00:00
433408db2e
Pre Linux 2.4.0 compatibility header file
2000-08-31 10:10:03 +00:00
926349534d
Initialize vertsize correctly. Add planemask arguments for color and depth
...
stencil clearing.
2000-08-30 22:34:28 +00:00
32cebaf750
Add compatibility header file to make Linux 2.4.0 kernel patches cleaner.
2000-08-28 19:50:52 +00:00
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
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
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
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
fb3939c1a5
Bug fixes for 32bpp rendering (still disabled)
2000-08-20 18:16:49 +00:00
e30361416b
Possible fix for trispd bug
2000-08-18 19:03:19 +00:00
364d44a24c
Fix ABA problem in drm_freelist_{put,try}
2000-08-18 18:57:56 +00:00
f0f6509a72
Sync with Linux 2.4.0-test7/pre4
2000-08-18 13:55:23 +00:00
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
761ffd63f3
Bug #112197 Made sis driver compile under 2.4.0-test7/pre4
2000-08-17 20:20:33 +00:00
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
cba4d3504c
first part of 4.0.1b merge
2000-08-16 18:29:06 +00:00
1df8afa8ff
Initial revision
2000-08-16 17:23:02 +00:00
8b9363d1b1
Sync with Linux 2.4.0-test6-pre8
2000-08-08 16:04:21 +00:00
9199075a6a
Fix for multiple sarea bug + agp built into kernel segfault
2000-08-07 16:55:10 +00:00
f3ae6786f8
Sync with Linux 2.4.0-test6-pre2
2000-08-04 10:04:55 +00:00
bcad118182
Fix typo
2000-07-22 01:08:00 +00:00
1e54e55431
Move to new, denser, easier-to-read Linux kernel Makefile format
2000-07-22 01:04:22 +00:00
3bcc55a74d
Revert some changes and try alternative way to clean up AGP handling.
2000-07-21 18:28:01 +00:00
6dd96a15ed
Revert some changes and try alternative way to clean up AGP handling.
2000-07-21 16:57:00 +00:00
e38b34e54a
Fixes for building in the kernel tree
2000-07-21 15:48:24 +00:00
81da79d1ed
Changes to make AGP optional for in-kernel builds
2000-07-21 14:20:57 +00:00
6d1ce8fe77
kfree_s was deprecated in 2.4.0-test?
2000-07-20 20:21:10 +00:00
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
0bd1fa795a
Fixes for building in the kernel tree
2000-07-20 01:52:00 +00:00
e8c9ed03f8
Fixed for monolithic kernel build
2000-07-20 01:14:58 +00:00
742c33bf61
Fix signature for *_options function
2000-07-20 00:59:40 +00:00
c459c9ead3
Added support for building as modules or as part of monolithic kernel
2000-07-20 00:48:12 +00:00
1d3c4d2ed2
Bump driver dates and add descriptions
2000-07-19 20:59:35 +00:00
ee9514b63b
Allow SAREA > 1 page in size
2000-07-19 20:41:51 +00:00
aed8549e91
Sync with Linux 2.4.0-test4 kernel
2000-07-19 18:38:41 +00:00
7b888f87fa
applied Jeff's xf86cvs-I810copy.patch
2000-07-13 18:47:48 +00:00
8751b6774d
Merge XFree86 4.0.1
2000-07-11 11:41:07 +00:00
8bc39d01ca
Import of XFree86 4.0.1
2000-07-10 21:32:06 +00:00
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
dc2701a9f6
Update register definitions to match r128_reg.h
2000-06-23 17:14:20 +00:00
d399dbcd56
Merged bsd-1-0-1
2000-06-13 17:38:09 +00:00
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
1c8b2b5e06
Update email addresses and copyright notices to reflect VA Linux Systems
2000-06-13 14:22:03 +00:00
d5348efe25
Merging the ati-4-1-0 branch onto the trunk.
2000-06-12 15:47:31 +00:00
ea425f532f
Merged the tdfx-2-0 branch onto the trunk
2000-06-12 02:33:12 +00:00
7d88040f52
Fix define of PCI_DEVICE_ID_3DLABS_GAMMA when not available in the kernel
...
includes.
2000-06-09 15:14:51 +00:00
0dc99dc4b9
don't draw if window is unmapped, other updates (Jeff Hartmann)
2000-06-08 17:13:48 +00:00
569da5a42e
Merged glxmisc-3-0-0
2000-06-08 14:38:22 +00:00
5ce0f2afec
define VM_DONTCOPY to zero if undefined
2000-06-06 22:51:29 +00:00
909085a008
Include new updated gamma support.
2000-06-05 00:42:21 +00:00
fa0a35a25f
Merged bsd-1-0-0
2000-05-30 17:13:31 +00:00
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
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
99efe3c247
Merged ati-4-0-1
2000-05-18 06:14:27 +00:00
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
1dcfddf915
Fixed reclaim Oops
2000-04-05 18:48:23 +00:00
ba1b1ae380
Merged mga branch with trunk
2000-04-04 22:08:14 +00:00
5bd8014f27
Merge with 4.0
2000-03-16 03:37:30 +00:00
adc03d3661
Import of XFree86 4.0
2000-03-15 21:40:23 +00:00
d9ff0e3884
3.9.18 merge
2000-02-22 22:10:28 +00:00
7a9b291ab5
Import of XFree86 3.9.18
2000-02-22 15:43:59 +00:00
9fcbf05c44
Fixed freelist_put bug
2000-01-28 02:11:01 +00:00
d545384a2b
Try a more complex (and more correct?) method for finding kernel inlcude
...
files
2000-01-17 10:27:29 +00:00
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
9a838857e1
Add new code to do SMP/MODVERSIONS detection for more distributions
2000-01-13 15:03:41 +00:00
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
1c33c69095
Import of XFree86 3.9.17
2000-01-06 12:55:00 +00:00
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
b03b238dfc
Sync with Linux 2.3.30
1999-12-08 19:20:20 +00:00
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
b6a28bfe98
First DRI release of 3dfx driver.
1999-12-05 23:10:37 +00:00
David Dawes
Kevin E Martin
Alan Hourihane
Gareth Hughes
Rik Faith
Jeff Hartmann
Keith Whitwell
Nathan Hand
Brian Paul
Doug Rabson
Daryll Strauss