Commit graph

63 commits

Author SHA1 Message Date
Brian Paul
683fe4276a merge from trunk 2002-11-15 01:59:39 +00:00
Brian Paul
878c8869ab Added support for cube mapping registers/packets. Bumped version number to
1.7. In radeon_emit_packets() added packet[id] array bounds check,
    return EINVAL it's out of bounds.
2002-10-25 15:59:44 +00:00
Brian Paul
97bee70a1a merge from trunk 2002-10-15 19:01:22 +00:00
Keith Whitwell
381e0fe7f8 Free correct block in free_block (K. Rasche) 2002-10-02 07:55:27 +00:00
Michel Daenzer
8c14585fc3 fix wait condition for vertical blank IRQs 2002-10-01 17:31:20 +00:00
Keith Whitwell
899df4f530 Turn boxes off again 2002-09-29 21:22:01 +00:00
Keith Whitwell
9243e642da Move os-dependent stuff out of radeon_irq.c 2002-09-29 21:19:01 +00:00
Eric Anholt
e6901cad69 Fix up BSD irq handling. 2002-09-29 20:48:18 +00:00
Michel Daenzer
a33d42e2ba make SW interrupts more robust: write sequence number to scratch register,
acknowledge any lost interrupts before waiting
2002-09-27 21:47:52 +00:00
Michel Daenzer
cc9a169d08 DRM(vblank_wait) is driver specific 2002-09-26 12:49:18 +00:00
Eric Anholt
97961e2c65 BSD vblank framework. 2002-09-26 07:45:07 +00:00
Michel Daenzer
f40674ea9f change RADEON_PARAM_IRQ_ACTIVE to RADEON_PARAM_IRQ_NR 2002-09-25 19:48:51 +00:00
Michel Daenzer
55acd0d5a6 common ioctl to wait for vertical blank IRQs 2002-09-25 17:18:19 +00:00
Keith Whitwell
f1c8fe9557 merged r200-0-2-branch to trunk 2002-09-23 17:26:43 +00:00
Keith Whitwell
4fcde1efc1 standardize use of __FUNCTION__ (Linus) 2002-08-29 07:34:49 +00:00
Keith Whitwell
22c1ca1fd5 Turn boxes off. 2002-08-28 08:47:39 +00:00
Keith Whitwell
48cc350e21 merged r200-0-1-branch 2002-08-26 22:16:18 +00:00
Michel Daenzer
3165128fc4 TRUE and FALSE don't seem to be defined everywhere... 2002-08-21 00:09:32 +00:00
Keith Whitwell
33d57137da zero-cliprect case patch from Jacek 2002-08-12 07:26:00 +00:00
Michel Daenzer
d0ac4e5ad0 test scratch register writeback before using it 2002-08-11 15:56:44 +00:00
Rik Faith
977b420d5d Updates from Rusty Russell to:
1) Remove redundant header inclusion
2) Silence bitop on non-long argument warnings (change int to long)
3) Move to ISO C (gcc 2.6) initializers (accepted by older gccs also) All
    of these are syntax changes that should not impact functionality.
2002-08-06 18:00:57 +00:00
Michel Daenzer
881a9b214d fix off-by-one error for right bottom corner in radeon_emit_clip_rect()
(Jacek Rosik)
2002-07-18 23:17:13 +00:00
Tim Smith
8fa8db126a Workaround for Radeon lockups on fast machines 2002-07-17 08:30:36 +00:00
Michel Daenzer
fd86ac9561 Don't read scratch registers directly, obtain the values via the GET_PARAM
ioctl. The DRM reads them from memory addresses the chip writes to on
    updates. Fall back to reading the registers directly with an old DRM.
(Tim Smith, cleanups by myself)
2002-07-11 20:31:12 +00:00
Alan Hourihane
74ef13fd00 merged bsd-3-0-0-branch 2002-07-05 08:31:11 +00:00
Keith Whitwell
2dcada361d merged tcl-0-0-branch 2002-06-12 15:50:28 +00:00
Jens Owen
3903e5ac94 Merged drmcommand-0-0-1 2002-04-09 21:54:56 +00:00
David Dawes
ab87c5d0d1 First pass of mesa-4-0 branch merge into trunk. 2002-02-14 02:00:26 +00:00
David Dawes
44aa4d6297 First pass merge of XFree86 4.2.0 import. 2002-01-27 20:05:42 +00:00
Jeff Hartmann
4eafeec960 Add module version name at a lower layer of the code, allows things to be
more flexible and allow older module versions to still work. Might not
    be final code if we move over to DRI kernel module version, but will be
    if we use XFree86 version. + Only build tdfx.o instead of tdfx-4_1_0.o
    since tdfx.o has never changed its API.
2001-07-18 21:02:58 +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
Gareth Hughes
7ccc528911 Fix typo in XFREE86_VERSION(). 2001-07-13 01:42:48 +00:00
David Dawes
d87c873df0 First pass of 4.1.0 merge. 2001-06-14 22:23:44 +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
Alan Hourihane
94c6d951a2 Make SiS driver compile with the new templated format. Not tested. minor
cleanups
2001-05-03 14:51:01 +00:00
Kevin E Martin
5d6ddbca26 Merged ati-pcigart-1-0-0 2001-04-05 22:16:12 +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
Kevin E Martin
74e19a4018 Merged sarea-1-0-0 2001-03-14 22:22:50 +00:00
Gareth Hughes
3a74d3a371 Merge tdfx-3-1-0 branch. 2001-03-06 04:37:37 +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
Gareth Hughes
360475376c Merge mga-1-0-0-branch into trunk. 2001-02-15 08:12:14 +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
e15a24e154 Merged ati-4-1-1-branch into trunk. 2000-12-02 06:14:18 +00:00
David Dawes
94071289a4 merge with 4.0.1d 2000-11-08 00:07:17 +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
Alan Hourihane
c7558d8fa4 commit xfree86 4.0.1d-pre update 2000-09-24 09:34:10 +00:00
Brian Paul
7b888f87fa applied Jeff's xf86cvs-I810copy.patch 2000-07-13 18:47:48 +00:00