Commit Graph

139 Commits (b90028231c5c73783ee45124903794970f244978)

Author SHA1 Message Date
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