Commit Graph

205 Commits (6ac48cddd0a074c77de0ab3dfc1661352b6f0c26)

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